From a06b589fefe608b3b16d5683d411f64b46461c52 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Mon, 3 Apr 2023 20:42:39 +0800 Subject: [PATCH] =?UTF-8?q?67761=20=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=EF=BC=8C=E8=B4=A3=E4=BB=BB=E9=A2=86=E5=9F=9F?= =?UTF-8?q?=E4=B8=B2=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/entity/SysDictItem.java | 1 + .../modules/system/enums/DicCodeEnum.java | 22 ++++++++++--------- .../system/mapper/SysDictItemMapper.java | 2 +- .../ProjectLawsInventoryEOServiceImpl.java | 11 ++++++++-- 4 files changed, 23 insertions(+), 13 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDictItem.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDictItem.java index 6bd5300c7..5dad3661e 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDictItem.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDictItem.java @@ -101,6 +101,7 @@ public class SysDictItem implements Serializable { private java.lang.String attributeType; /**逻辑删除标识*/ + /**value：0可用，1逻辑删除**/ @TableLogic public Integer delFlag; diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/DicCodeEnum.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/DicCodeEnum.java index d109cf276..c1f571268 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/DicCodeEnum.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/DicCodeEnum.java @@ -4,16 +4,17 @@ package com.jero.modules.system.enums; * 数据字典code枚举类 */ public enum DicCodeEnum { - REGION("适用地区","0","region"), + REGION("适用地区","1493782108399820801","region"), + DUTY_TERRITORY("责任领域","1513417672023441409","duty_territory"), ; String name; - String value; + String id; String code; - private DicCodeEnum(String name, String value, String code) { + private DicCodeEnum(String name, String id, String code) { this.name = name; - this.value = value; + this.id = id; this.code = code; } @@ -25,13 +26,14 @@ public enum DicCodeEnum { this.name = name; } - public String getValue() { - return value; + public String getId() { + return id; } - public void setValue(String value) { - this.value = value; + public void setId(String id) { + this.id = id; } + public String getCode() { return code; } @@ -40,10 +42,10 @@ public enum DicCodeEnum { this.code = code; } - public static String getTextByValue(String value) { + public static String getTextByCode(String code) { DicCodeEnum[] values = values(); for (DicCodeEnum dicCodeEnum : values) { - if (dicCodeEnum.value.equals(value)) { + if (dicCodeEnum.code.equals(code)) { return dicCodeEnum.name; } } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictItemMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictItemMapper.java index e3eade81d..45c415dc5 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictItemMapper.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictItemMapper.java @@ -26,7 +26,7 @@ public interface SysDictItemMapper extends BaseMapper { @Select("SELECT sys_dict_item.* FROM sys_dict_item LEFT JOIN sys_dict ON sys_dict_item.dict_id = sys_dict.id WHERE DICT_CODE = #{dictCode} order by sys_dict_item.item_text asc") public List selectItemsOrderBySortOrder(String dictCode); - @Select("SELECT sys_dict.dict_code,sys_dict_item.* from sys_dict_item LEFT JOIN sys_dict ON sys_dict_item.dict_id = sys_dict.id where status = 1") + @Select("SELECT sys_dict.dict_code,sys_dict_item.* from sys_dict_item LEFT JOIN sys_dict ON sys_dict_item.dict_id = sys_dict.id where status = 1 and sys_dict_item.del_flag = 0") List selectItemsAll(); /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index b0e41b087..fcd39b2d0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -57,12 +57,14 @@ import com.jero.modules.system.entity.SysCategory; import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.entity.SysRole; import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.enums.DicCodeEnum; import com.jero.modules.system.mapper.SysCategoryMapper; import com.jero.modules.system.mapper.SysDictItemMapper; import com.jero.modules.system.mapper.SysRoleMapper; import com.jero.modules.system.mapper.SysUserMapper; import com.jero.modules.system.service.IProjectUserDutyTerritoryService; import com.jero.modules.system.service.ISysAnnouncementService; +import com.jero.modules.system.service.ISysDictItemService; import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.service.impl.SysCategoryServiceImpl; import com.jero.modules.system.service.impl.SysDictItemServiceImpl; @@ -254,6 +256,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl dutyTerritoryDictItemList = this.sysDictItemService.selectItemsByDictCode(DicCodeEnum.DUTY_TERRITORY.getCode()); + List userNameList = new ArrayList<>(); String designDutyIds = dataList.stream().map(ProjectLawsInventoryEO::getDesignDutyId).collect(Collectors.joining(",")); String verifyDutyIds = dataList.stream().map(ProjectLawsInventoryEO::getVerifyDutyId).collect(Collectors.joining(",")); @@ -7008,7 +7015,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl objectMap = iProjectRelatedPersonnelService.queryPersonByProjectId(projectLawsInventoryEOTemp.getProjectLibraryId(), value); @@ -7055,7 +7062,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl