From f26479cce163cbd313a3c045016fcacbb7ac158a Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 8 Mar 2023 09:33:05 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-=E5=A4=84?= =?UTF-8?q?=E7=90=86=E8=AE=A4=E8=AF=81=E8=BF=9B=E5=BA=A6=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=8C=E5=A2=9E=E5=8A=A0=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E5=A4=87=E6=B3=A8=E5=AD=97=E6=AE=B5=E3=80=82?= =?UTF-8?q?=E5=A4=84=E7=90=86SQL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_2nd_period.sql | 8 +++++- .../enums/EvaluationTypeEnum.java | 8 +++--- .../ProjectCertificationInventoryEO.java | 8 ++++++ ...ctCertificationInventoryEOServiceImpl.java | 26 +++++++++++++++++++ 4 files changed, 45 insertions(+), 5 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index de2244b1d..167801aa3 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -293,4 +293,10 @@ ALTER TABLE `project_library_role_rel` ADD COLUMN `model_type` varchar(64) NULL COMMENT '模块类型，对应系统中枚举类 RoleRelModelTypeEnum ' AFTER `role_code`; -- 初始化历史数据 -update project_library_role_rel set model_type = 'Laws inventory' +update project_library_role_rel set model_type = 'Laws inventory'; + +-- 项目库-认证清单表-增加认证进度备注 2023-03-08 未同步生产环境 +ALTER TABLE `project_certification_inventory` + ADD COLUMN `certification_progress_remark` varchar(2000) NULL COMMENT '认证进度备注' AFTER `certification_progress`; +-- 将之前的任务清单-认证进度，修改为 认证清单-认证进度 2023-03-08 未同步生产环境 +UPDATE `sys_dict` SET `dict_name` = '认证清单-认证进度', `description` = '认证清单-认证进度' WHERE `id` = '1524311122804346881'; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/enums/EvaluationTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/enums/EvaluationTypeEnum.java index 06d9043c6..e2e40a670 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/enums/EvaluationTypeEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/enums/EvaluationTypeEnum.java @@ -37,12 +37,12 @@ public enum EvaluationTypeEnum { public static String getTextByValue(String value,String cut) { EvaluationTypeEnum[] values = values(); - for (EvaluationTypeEnum certificationProgressEnum : values) { - if (certificationProgressEnum.value.equals(value)) { + for (EvaluationTypeEnum evaluationTypeEnum : values) { + if (evaluationTypeEnum.value.equals(value)) { if(StringUtils.equals(cut, CutEnum.CN.getValue())){ - return certificationProgressEnum.name; + return evaluationTypeEnum.name; }else { - return certificationProgressEnum.value; + return evaluationTypeEnum.value; } } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java index 2a34dc9c2..9242934e8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java @@ -174,6 +174,14 @@ public class ProjectCertificationInventoryEO implements Serializable { @ApiModelProperty(value = "认证进度") private java.lang.String certificationProgress; + /**认证进度展示名称**/ + @TableField(exist = false) + private String certificationProgress_dictText; + + @Excel(name = "认证进度备注", width = 15) + @ApiModelProperty(value = "认证进度备注") + private String certificationProgressRemark; + /**项目库id*/ @ApiModelProperty(value = "项目库id") private String projectLibraryId; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index 76c7e1e0d..8d8323785 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -209,6 +209,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl categoryList = this.sysCategoryService.list(); List sysDictItems = this.sysDictItemServiceImpl.getBaseMapper().selectItemsAll(); + List certificationProgress = this.sysDictItemServiceImpl.selectItemsByDictCode("certification_progress"); List userIdList = new ArrayList<>(); @@ -248,6 +249,20 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl collect = certificationProgress.stream() + .filter(dict -> StringUtils.equals(dict.getItemValue(), data.getCertificationProgress())) + .collect(Collectors.toList()); + if(CollectionUtils.isNotEmpty(collect)){ + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + certificationProgress_dictText = collect.get(0).getItemText(); + }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + certificationProgress_dictText = collect.get(0).getEnName(); + } + } + data.setCertificationProgress_dictText(certificationProgress_dictText); + } } } } @@ -619,6 +634,10 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl submitTask(JSONObject json) { + if (!json.containsKey("nodeKey")) { + throw new JeroBootException("nodeKey不能为空，请联系管理员！"); + } + String nodeKey = json.getString("nodeKey"); CertificationFlowNodeEnum flowNodeEnum = CertificationFlowNodeEnum.getEnumByKey(nodeKey); @@ -626,6 +645,13 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl