From b0f7cb9a1e08e62f360892bea611a4a3954ef3f7 Mon Sep 17 00:00:00 2001 From: gaosong Date: Sun, 22 Oct 2023 18:31:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=B7=BB=E5=8A=A0=E4=BC=98=E5=85=88=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 2 +- .../com/jero/modules/system/enums/DicCodeEnum.java | 1 + .../modules/project/entity/ProblemManagementEO.java | 7 +++++++ .../project/service/impl/NcrTrackServiceImpl.java | 10 +++++++++- .../java/com/jero/modules/project/vo/NcrTrackVO.java | 7 +++++++ 5 files changed, 25 insertions(+), 2 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 2f2873c04..3a3a67932 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -1323,7 +1323,7 @@ ADD COLUMN `save_state` varchar(10) NULL COMMENT '保存状态（0->暂存，1-> -- 问题管理添加问题优先级字段 2023-10-20 已同步生产环境 ALTER TABLE `problem_management` -ADD COLUMN `problem_priority` varchar(10) NULL COMMENT '问题优先级' AFTER `approval_evidence_link`; +ADD COLUMN `problem_priority` varchar(36) NULL COMMENT '问题优先级' AFTER `approval_evidence_link`; -- OTA添加主键 2023-10-20 已同步生产环境 ALTER TABLE `ota_manage_apply` 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 6f878d1aa..f0f6d460a 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 @@ -7,6 +7,7 @@ public enum DicCodeEnum { REGION("适用地区","1493782108399820801","region"), DUTY_TERRITORY("责任领域","1513417672023441409","duty_territory"), PROBLEM_TYPE("问题类型","1697066042058821634","wen4_ti2_lei4_xing2"), + PROBLEM_PRIORITY("问题优先级","1716030928484503553","wen4_ti2_you1_xian1_ji2"), CERTIFICATION_PROGRESS("认证清单-认证进度","1524311122804346881","certification_progress"), ; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProblemManagementEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProblemManagementEO.java index cb741c931..ecbe9c7dc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProblemManagementEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProblemManagementEO.java @@ -99,6 +99,13 @@ public class ProblemManagementEO implements Serializable { @ApiModelProperty(value = "问题状态") private java.lang.String problemState; + /**问题优先级*/ + @Excel(name = "*问题优先级", width = 15,dicCode ="wen4_ti2_you1_xian1_ji2") + @ApiModelProperty(value = "问题优先级") + private java.lang.String problemPriority; + @TableField(exist = false) + private String problemPriority_dictText; + /**描述和分析*/ @Excel(name = "描述和分析", width = 15) @ApiModelProperty(value = "描述和分析") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java index 2684cea03..e18ac1d78 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java @@ -201,7 +201,6 @@ public class NcrTrackServiceImpl extends ServiceImpl trackVO.setProjectName(projectName+"-"+yearName+"-"+market); } } - //责任领域中英文切换 if(StringUtils.isNotBlank(trackVO.getDutyTerritory())){ String dutyTerritory = pull(dictItemList, trackVO.getDutyTerritory(), "duty_territory", ncrTrackVO.getCut()); @@ -683,10 +682,12 @@ public class NcrTrackServiceImpl extends ServiceImpl } //wen4_ti2_lei4_xing2 问题类型 List problemTypeList = sysDictService.queryDictItemsByCode(DicCodeEnum.PROBLEM_TYPE.getCode()); + List problemPriorityList = sysDictService.queryDictItemsByCode(DicCodeEnum.PROBLEM_PRIORITY.getCode()); List ncrTrackVOList = new ArrayList<>(); for (ProblemManagementEO problemManagementEO : managementEOList) { //问题类型 List dictModelList = problemTypeList.stream().filter(e -> e.getValue().equals(problemManagementEO.getProblemType())).collect(Collectors.toList()); + List dictModelListPp = problemPriorityList.stream().filter(e -> e.getValue().equals(problemManagementEO.getProblemPriority())).collect(Collectors.toList()); if(!dictModelList.isEmpty()){ if(CutEnum.CN.getValue().equals(cut)){ @@ -695,6 +696,13 @@ public class NcrTrackServiceImpl extends ServiceImpl problemManagementEO.setProblemType_dictText(dictModelList.get(0).getTextEn()); } } + if(!dictModelListPp.isEmpty()){ + if(CutEnum.CN.getValue().equals(cut)){ + problemManagementEO.setProblemPriority_dictText(dictModelListPp.get(0).getText()); + }else{ + problemManagementEO.setProblemPriority_dictText(dictModelListPp.get(0).getTextEn()); + } + } //相关法规 if(StringUtils.isNotBlank(problemManagementEO.getLawsId())){ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java index fd3b3a862..b435ab068 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java @@ -92,6 +92,13 @@ public class NcrTrackVO implements Serializable { @Excel(name = "问题状态", width = 20) private java.lang.String problemState; + /**问题优先级*/ + @Excel(name = "*问题优先级", width = 15,dicCode ="wen4_ti2_you1_xian1_ji2") + @ApiModelProperty(value = "问题优先级") + private java.lang.String problemPriority; + + + private java.lang.String problemPriority_dictText; /**描述和分析*/ @ApiModelProperty(value = "描述和分析") @Excel(name = "描述和分析", width = 20)