From 22060187c8756ec0c7501dc400331965e7c3f5f9 Mon Sep 17 00:00:00 2001 From: lSun <15893999301@qq.com> Date: Sat, 11 Jan 2025 22:06:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=95=B0=E6=8D=AE=E9=9A=94?= =?UTF-8?q?=E7=A6=BB=EF=BC=8Cbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lSun <15893999301@qq.com> --- .../basic/controller/SysDictDataController.java | 15 +++++++++++++++ .../system/basic/dao/SysDictDataMapper.java | 2 ++ .../basic/service/ISysDictTypeService.java | 2 ++ .../service/impl/SysDictTypeServiceImpl.java | 16 ++++++++++++++++ .../LeaveReporting/LeaveReportingMapper.xml | 6 +++--- .../resources/mapper/basic/SysDictDataMapper.xml | 8 ++++++-- 6 files changed, 44 insertions(+), 5 deletions(-) diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/controller/SysDictDataController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/controller/SysDictDataController.java index beab55c..f5e3c01 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/controller/SysDictDataController.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/controller/SysDictDataController.java @@ -95,6 +95,21 @@ public class SysDictDataController extends BaseController } + @GetMapping(value = "/type/leaveReporting") + public AjaxResult leaveReporting() { + try{ + List data = dictTypeService.leaveReporting(""); + if (StringUtils.isNull(data)) { + data = new ArrayList(); + } + return success(data); + }catch (Exception e){ + log.error(e.toString(),e); + } + return error("系统错误"); + + } + /** * 新增字典类型 */ diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/dao/SysDictDataMapper.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/dao/SysDictDataMapper.java index d62258b..9ccc67a 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/dao/SysDictDataMapper.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/dao/SysDictDataMapper.java @@ -93,4 +93,6 @@ public interface SysDictDataMapper * @return 结果 */ public int updateDictDataType(@Param("oldDictType") String oldDictType, @Param("newDictType") String newDictType); + + List leaveReporting(String dictType); } diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/ISysDictTypeService.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/ISysDictTypeService.java index 6f75bf2..19881e3 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/ISysDictTypeService.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/ISysDictTypeService.java @@ -96,4 +96,6 @@ public interface ISysDictTypeService * @return 结果 */ public boolean checkDictTypeUnique(SysDictType dictType); + + List leaveReporting(String dictType); } diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/impl/SysDictTypeServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/impl/SysDictTypeServiceImpl.java index 815dc2c..96d8d31 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/impl/SysDictTypeServiceImpl.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/impl/SysDictTypeServiceImpl.java @@ -221,4 +221,20 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService } return UserConstants.UNIQUE; } + + @Override + public List leaveReporting(String dictType) { + List dictDatas = DictUtils.getDictCache(dictType); + if (StringUtils.isNotEmpty(dictDatas)) + { + return dictDatas; + } + dictDatas = dictDataMapper.leaveReporting(dictType); + if (StringUtils.isNotEmpty(dictDatas)) + { + DictUtils.setDictCache(dictType, dictDatas); + return dictDatas; + } + return null; + } } diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/LeaveReporting/LeaveReportingMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/LeaveReporting/LeaveReportingMapper.xml index 49831dc..5714d13 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/LeaveReporting/LeaveReportingMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/LeaveReporting/LeaveReportingMapper.xml @@ -15,7 +15,7 @@ leave_end_interval, leave_duration, source, create_user_id, is_agree, location, host_user_id,host_user_name, remark,examine_status) - VALUES (#{userId}, #{userName}, #{orgId}, #{orgName}, #{type} , '请假', #{leaveReason}, + VALUES (#{userId}, #{userName}, #{orgId}, #{orgName}, #{leaveType} , '请假', #{leaveReason}, #{leaveStartDate}, #{leaveStartInterval}, @@ -43,8 +43,8 @@ org_name = #{orgName}, - - leave_type = #{type}, + + leave_type = #{leaveType}, host_user_id = #{hostUserId}, diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/basic/SysDictDataMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/basic/SysDictDataMapper.xml index 1ffcfce..a5e6b1b 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/basic/SysDictDataMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/basic/SysDictDataMapper.xml @@ -59,8 +59,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - + + + delete from sys_dict_data where dict_code = #{dictCode}