Merge remote-tracking branch 'origin/dev_20230831_problem' into dev_20230831_problem

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"), // 未完成
+    RED("红","1"), // 未完成
-    YELLOW("黄色","2"), // 已完成
+    YELLOW("黄","2"), // 已完成
     GREEN("绿色","3"), // 展示数据
     BLUE("蓝色","4") // 展示数据
     ;

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<NcrTrackMapper, NcrTrackVO>
 
         if(trackVOListTemp.size() != 0){
             //旧数据处理
-            for (NcrTrackVO trackVO : trackVOListTemp) {
+            oldData(ncrTrackVO, 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());
-                }
-            }
-
             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<NcrTrackMapper, NcrTrackVO>
         }
     }
 
+    private void oldData(NcrTrackVO ncrTrackVO, List<NcrTrackVO> 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(ComplianceFlowStatusEnum.LAWS_INCONFORMITY.getCnName());
+                }else{
+                    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(ComplianceFlowStatusEnum.LAWS_TO_TRACK.getCnName());
+                }else{
+                    trackVO.setProblemType(ComplianceFlowStatusEnum.LAWS_TO_TRACK.getEnName());
+                }
+                trackVO.setProblemState(ColourEnum.YELLOW.getName());
+            }
+        }
+    }
+
     @NotNull
     private List<NcrTrackVO> getProblemManagementData(List<NcrTrackVO> ncrTrackVOListTemp,String cut) {
         List<String> idList = new ArrayList<>();
@@ -451,18 +457,13 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
                     }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,","));
                 }
             }
 

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;
 

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{

jero-web/src/views/projectManagement/projectNonConformance/index.vue

@@ -152,6 +152,9 @@
               {{result.problemState ? result.problemState : ''}}
              </span>
         </div>
+                <span slot="problemType" slot-scope="text,result">
+                   <span>{{result.flag== 'NEW'?result.problemType_dictText:result.problemType}}</span>
+                </span>
         <span slot="operation" slot-scope="text,record">
           <a class="text-operation"
              @click="detil(record)">
@@ -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

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{