From 6b111e16a52e2b9a47839255bc607e662a9d75cd Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Mon, 18 Apr 2022 10:36:51 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E8=A1=A8studio+=E8=AE=A4=E8=AF=81=E5=B7=A5=E7=A8=8B=E5=B8=88?= =?UTF-8?q?=E4=B8=AD=E8=8B=B1=E5=90=8D=E6=8B=BC=E6=8E=A5=E6=98=BE=E7=A4=BA?= =?UTF-8?q?,=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E7=B1=BB=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/enums/FixedFieldEnum.java | 1 - .../com/jero/modules/enums/IsTagDict.java | 31 +++++++++++++++++++ .../system/controller/SysDictController.java | 3 +- .../impl/ProjectLibraryBaseServiceImpl.java | 18 ++++++----- 4 files changed, 44 insertions(+), 9 deletions(-) create mode 100644 jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/enums/IsTagDict.java diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/enums/FixedFieldEnum.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/enums/FixedFieldEnum.java index 8d746a693..2081276a4 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/enums/FixedFieldEnum.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/enums/FixedFieldEnum.java @@ -5,7 +5,6 @@ public enum FixedFieldEnum { NON_FIXED_FIELD_ENUM("非固定字段","0"), FIXED_FIELD_ENUM("固定字段","1"), CONFIGURABLE_FIELD("字段固定，内部可配","2"), - SYS_DICT_SYSTEM("系统数据字典标志值","0"), ; String name; String value; diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/enums/IsTagDict.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/enums/IsTagDict.java new file mode 100644 index 000000000..0641a6ff7 --- /dev/null +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/enums/IsTagDict.java @@ -0,0 +1,31 @@ +package com.jero.modules.enums; + + +public enum IsTagDict { + + SYS_DICT_SYSTEM("系统数据字典标志值","0"), + ; + String name; + String value; + + private IsTagDict(String name, String value) { + this.name = name; + this.value = value; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } +} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java index eec451fd8..98bcd2860 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java @@ -17,6 +17,7 @@ import com.jero.common.util.ImportExcelUtil; import com.jero.common.util.SqlInjectionUtil; import com.jero.common.util.oConvertUtils; import com.jero.modules.enums.FixedFieldEnum; +import com.jero.modules.enums.IsTagDict; import com.jero.modules.system.entity.SysDict; import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.entity.SysUser; @@ -81,7 +82,7 @@ public class SysDictController { Result> result = new Result>(); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sysDict, req.getParameterMap()); queryWrapper.eq("del_flag",CommonConstant.DEL_FLAG_0); - queryWrapper.eq("is_tag_dict",FixedFieldEnum.SYS_DICT_SYSTEM.getValue()); + queryWrapper.eq("is_tag_dict", IsTagDict.SYS_DICT_SYSTEM.getValue()); Page page = new Page(pageNo, pageSize); IPage pageList = sysDictService.page(page, queryWrapper); log.debug("查询当前页："+pageList.getCurrent()); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index 42883532d..48b2554a1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -148,8 +148,8 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl data.equals(e.getId())) @@ -158,13 +158,17 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl sysUser.getUsername()).collect(Collectors.joining(",")); } - name.append(certificationEngineerName).append(" "); - enName.append(certificationEngineerEnName).append(" "); + certificationName.append(certificationEngineerName).append("(").append(certificationEngineerEnName).append(")").append(" "); + } - projectLibraryBase.setCertificationEngineerName(name.toString()); - projectLibraryBase.setCertificationEngineerEnName(enName.toString()); + projectLibraryBase.setCertificationEngineerName(certificationName.toString()); + } - } + StringBuilder studioCnName= new StringBuilder(projectLibraryBase.getStudioEngineerName()); + StringBuilder studioEnName= new StringBuilder(projectLibraryBase.getStudioEngineerEnName()); + String studioName = studioCnName.append("(").append(studioEnName).append(")").toString(); + projectLibraryBase.setStudioEngineerName(studioName); + } }