From c5c1d3cf4e095acdbb1496d0794c91bb310ee72a Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 6 Sep 2023 11:16:47 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/project/enums/ColourEnum.java | 4 +- .../service/impl/NcrTrackServiceImpl.java | 61 ++++++++++--------- 2 files changed, 33 insertions(+), 32 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ColourEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ColourEnum.java index 3261a49a9..952af50dc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ColourEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ColourEnum.java @@ -5,8 +5,8 @@ package com.jero.modules.project.enums; */ public enum ColourEnum { - RED("红色","1"), // 未完成 - YELLOW("黄色","2"), // 已完成 + RED("红","1"), // 未完成 + YELLOW("黄","2"), // 已完成 GREEN("绿色","3"), // 展示数据 BLUE("蓝色","4") // 展示数据 ; 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 96d04a51d..77018c99f 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 @@ -323,35 +323,14 @@ public class NcrTrackServiceImpl extends ServiceImpl if(trackVOListTemp.size() != 0){ //旧数据处理 - for (NcrTrackVO trackVO : trackVOListTemp) { - String problemType = trackVO.getProblemType(); - trackVO.setTitle(trackVO.getFlowType()+problemType); - trackVO.setCreateBy(trackVO.getDuty()); - if(ComplianceFlowStatusEnum.INCONFORMITY.getCnName().equals(problemType) - || ComplianceFlowStatusEnum.INCONFORMITY.getEnName().equals(problemType)){ - if(CutEnum.CN.getValue().equals(ncrTrackVO.getCut())){ - trackVO.setProblemType(ComplianceFlowStatusEnum.LAWS_INCONFORMITY.getCnName()); - }else{ - trackVO.setProblemType(ComplianceFlowStatusEnum.LAWS_INCONFORMITY.getEnName()); - } - trackVO.setProblemType(ColourEnum.RED.getName()); - } - if(ComplianceFlowStatusEnum.TO_TRACK.getCnName().equals(problemType) - ||ComplianceFlowStatusEnum.TO_TRACK.getEnName().equals(problemType)){ - if(CutEnum.CN.getValue().equals(ncrTrackVO.getCut())){ - trackVO.setProblemType(ComplianceFlowStatusEnum.LAWS_TO_TRACK.getCnName()); - }else{ - trackVO.setProblemType(ComplianceFlowStatusEnum.LAWS_TO_TRACK.getEnName()); - } - trackVO.setProblemType(ColourEnum.YELLOW.getName()); - } - } - + oldData(ncrTrackVO, trackVOListTemp); if(!ncrTrackVOList.isEmpty()){ trackVOListTemp.addAll(ncrTrackVOList); } return trackVOListTemp; }else{ + //旧数据处理 + oldData(ncrTrackVO, trackVOList); if(!ncrTrackVOList.isEmpty()){ trackVOList.addAll(ncrTrackVOList); } @@ -359,6 +338,33 @@ public class NcrTrackServiceImpl extends ServiceImpl } } + private void oldData(NcrTrackVO ncrTrackVO, List trackVOListTemp) { + for (NcrTrackVO trackVO : trackVOListTemp) { + String problemType = trackVO.getProblemType(); + trackVO.setTitle(trackVO.getTitle()+problemType); + trackVO.setCreateBy(trackVO.getDuty()); + trackVO.setLawsName(trackVO.getSerialNumber()); + if(ComplianceFlowStatusEnum.INCONFORMITY.getCnName().equals(problemType) + || ComplianceFlowStatusEnum.INCONFORMITY.getEnName().equals(problemType)){ + if(CutEnum.CN.getValue().equals(ncrTrackVO.getCut())){ + trackVO.setProblemType_dictText(ComplianceFlowStatusEnum.LAWS_INCONFORMITY.getCnName()); + }else{ + trackVO.setProblemType_dictText(ComplianceFlowStatusEnum.LAWS_INCONFORMITY.getEnName()); + } + trackVO.setProblemState(ColourEnum.RED.getName()); + } + if(ComplianceFlowStatusEnum.TO_TRACK.getCnName().equals(problemType) + ||ComplianceFlowStatusEnum.TO_TRACK.getEnName().equals(problemType)){ + if(CutEnum.CN.getValue().equals(ncrTrackVO.getCut())){ + trackVO.setProblemType_dictText(ComplianceFlowStatusEnum.LAWS_TO_TRACK.getCnName()); + }else{ + trackVO.setProblemType_dictText(ComplianceFlowStatusEnum.LAWS_TO_TRACK.getEnName()); + } + trackVO.setProblemState(ColourEnum.YELLOW.getName()); + } + } + } + @NotNull private List getProblemManagementData(List ncrTrackVOListTemp,String cut) { List idList = new ArrayList<>(); @@ -451,18 +457,13 @@ public class NcrTrackServiceImpl extends ServiceImpl }else{ projectVersion = projectLibraryBase.getProjectVersion(); } - if(com.jero.modules.system.util.StringUtils.isNotBlank(projectLibraryBase.getYearName())){ - projectLibraryBase.setProjectName(projectLibraryBase.getProjectName() - + "-" + projectLibraryBase.getYearName() - + "-" + targetMarket); - } projectNameList.add(projectLibraryBase.getProjectName() + "-" + projectLibraryBase.getYearName() + "-" + targetMarket +"-"+projectVersion); } if(!projectNameList.isEmpty()){ - problemManagementEO.setProjectName(com.jero.modules.system.util.StringUtils.join(projectNameList,",")); + problemManagementEO.setProjectName(StringUtils.join(projectNameList,",")); } } From 33acabdb773232f1ec1c094e32c66c32fa86ac2b Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 6 Sep 2023 11:20:50 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/project/service/impl/NcrTrackServiceImpl.java | 8 ++++---- .../main/java/com/jero/modules/project/vo/NcrTrackVO.java | 5 +++++ 2 files changed, 9 insertions(+), 4 deletions(-) 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 77018c99f..1d696f64a 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 @@ -347,18 +347,18 @@ public class NcrTrackServiceImpl extends ServiceImpl if(ComplianceFlowStatusEnum.INCONFORMITY.getCnName().equals(problemType) || ComplianceFlowStatusEnum.INCONFORMITY.getEnName().equals(problemType)){ if(CutEnum.CN.getValue().equals(ncrTrackVO.getCut())){ - trackVO.setProblemType_dictText(ComplianceFlowStatusEnum.LAWS_INCONFORMITY.getCnName()); + trackVO.setProblemType(ComplianceFlowStatusEnum.LAWS_INCONFORMITY.getCnName()); }else{ - trackVO.setProblemType_dictText(ComplianceFlowStatusEnum.LAWS_INCONFORMITY.getEnName()); + trackVO.setProblemType(ComplianceFlowStatusEnum.LAWS_INCONFORMITY.getEnName()); } trackVO.setProblemState(ColourEnum.RED.getName()); } if(ComplianceFlowStatusEnum.TO_TRACK.getCnName().equals(problemType) ||ComplianceFlowStatusEnum.TO_TRACK.getEnName().equals(problemType)){ if(CutEnum.CN.getValue().equals(ncrTrackVO.getCut())){ - trackVO.setProblemType_dictText(ComplianceFlowStatusEnum.LAWS_TO_TRACK.getCnName()); + trackVO.setProblemType(ComplianceFlowStatusEnum.LAWS_TO_TRACK.getCnName()); }else{ - trackVO.setProblemType_dictText(ComplianceFlowStatusEnum.LAWS_TO_TRACK.getEnName()); + trackVO.setProblemType(ComplianceFlowStatusEnum.LAWS_TO_TRACK.getEnName()); } trackVO.setProblemState(ColourEnum.YELLOW.getName()); } 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 e52292cde..c2ccb89f7 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 @@ -40,6 +40,11 @@ public class NcrTrackVO implements Serializable { @ApiModelProperty(value = "创建日期") private java.util.Date createTime; + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "修改日期") + private java.util.Date updateTime; + //中英文切换 private String cut; From bfaa8387cd45621202b80ebab17b79651805f33f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 6 Sep 2023 11:28:46 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectManagement/components/addModelconformance.vue | 9 +++++++++ .../projectManagement/projectNonConformance/index.vue | 8 ++++++-- .../projectNonConformance/moudles/addModel.vue | 9 +++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/addModelconformance.vue b/jero-web/src/views/projectManagement/components/addModelconformance.vue index 395162929..5aeaa814d 100644 --- a/jero-web/src/views/projectManagement/components/addModelconformance.vue +++ b/jero-web/src/views/projectManagement/components/addModelconformance.vue @@ -519,6 +519,15 @@ export default { if(this.formInline.problemState == null){ this.formInline.problemState = undefined } + if(this.formInline.progressTrackingList == null){ + this.formInline.progressTrackingList = [{}] + } + if(this.formInline.approvalEvidenceLinkList == null){ + this.formInline.approvalEvidenceLinkList = [{}] + } + if(this.formInline.fileLinkList == null){ + this.formInline.fileLinkList = [{}] + } if(this.formInline.projectId != null){ this.formInline.projectId = this.formInline.projectId.split(',') }else{ diff --git a/jero-web/src/views/projectManagement/projectNonConformance/index.vue b/jero-web/src/views/projectManagement/projectNonConformance/index.vue index fc0db405a..6d27e7639 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/index.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/index.vue @@ -152,6 +152,9 @@ {{result.problemState ? result.problemState : ''}} + + {{result.flag== 'NEW'?result.problemType_dictText:result.problemType}} + @@ -249,7 +252,8 @@ dataIndex: 'problemType_dictText', width: 170, sorter:true, - ellipsis: true + ellipsis: true, + scopedSlots: { customRender: 'problemType' } }, { title: this.$t('statisticalNodes'), @@ -262,7 +266,7 @@ { title: this.$t('creator'), align: 'left', - dataIndex: 'creator', + dataIndex: 'createBy', width: 100, sorter:true, ellipsis: true diff --git a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue index 395162929..5aeaa814d 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue @@ -519,6 +519,15 @@ export default { if(this.formInline.problemState == null){ this.formInline.problemState = undefined } + if(this.formInline.progressTrackingList == null){ + this.formInline.progressTrackingList = [{}] + } + if(this.formInline.approvalEvidenceLinkList == null){ + this.formInline.approvalEvidenceLinkList = [{}] + } + if(this.formInline.fileLinkList == null){ + this.formInline.fileLinkList = [{}] + } if(this.formInline.projectId != null){ this.formInline.projectId = this.formInline.projectId.split(',') }else{