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] =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=AE=A1=E7=90=86-=E5=88=97?=
 =?UTF-8?q?=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<NcrTrackMapper, NcrTrackVO>
 
         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<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_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<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,","));
                 }
             }