From 6117c26979b0df82ffa45d9ad43f67a11e2aeaae Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 5 Sep 2023 10:36:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=82=E6=95=B0=EF=BC=8C?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=8C=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/entity/ProblemManagementEO.java   |  8 ++++++++
 .../impl/ProblemManagementEOServiceImpl.java  | 19 ++++++++++++++++++-
 .../jero/modules/project/vo/NcrTrackVO.java   |  3 +++
 3 files changed, 29 insertions(+), 1 deletion(-)

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 a71279c6a..409882869 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
@@ -143,4 +143,12 @@ public class ProblemManagementEO implements Serializable {
     @ApiModelProperty(value = "审批证据链接（前端传参）")
 	private List<String> approvalEvidenceLinkList;
 
+	@TableField(exist = false)
+    @ApiModelProperty(value = "相关法规中文名")
+	private String lawsName;
+
+	@TableField(exist = false)
+    @ApiModelProperty(value = "相关项目中文名")
+	private String projectName;
+
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProblemManagementEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProblemManagementEOServiceImpl.java
index 065e7af6a..dba2367c3 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProblemManagementEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProblemManagementEOServiceImpl.java
@@ -3,6 +3,7 @@ package com.jero.modules.project.service.impl;
 import com.jero.modules.project.entity.ProblemManagementEO;
 import com.jero.modules.project.mapper.ProblemManagementEOMapper;
 import com.jero.modules.project.service.IProblemManagementEOService;
+import com.jero.modules.system.util.StringUtils;
 import org.springframework.stereotype.Service;
 import java.util.List;
 import java.util.Date;
@@ -25,12 +26,26 @@ public class ProblemManagementEOServiceImpl extends ServiceImpl<ProblemManagemen
 	 */
 	@Override
     public void add(ProblemManagementEO problemManagementEO) {
-        Date now = new Date();
+		//相关文件地址链接，进度追踪，审批证据链接
+		setParam(problemManagementEO);
+		Date now = new Date();
         problemManagementEO.setCreateTime(now);
         problemManagementEO.setUpdateTime(now);
         save(problemManagementEO);
     }
 
+	private void setParam(ProblemManagementEO problemManagementEO) {
+		if(!problemManagementEO.getFileLinkList().isEmpty()){
+			problemManagementEO.setFileLink(StringUtils.join(problemManagementEO.getFileLinkList(),","));
+		}
+		if(!problemManagementEO.getProgressTrackingList().isEmpty()){
+			problemManagementEO.setProgressTracking(StringUtils.join(problemManagementEO.getProgressTrackingList(),","));
+		}
+		if(!problemManagementEO.getApprovalEvidenceLinkList().isEmpty()){
+			problemManagementEO.setApprovalEvidenceLink(StringUtils.join(problemManagementEO.getApprovalEvidenceLinkList(),","));
+		}
+	}
+
 	/**
 	 * 更新
 	 *
@@ -39,6 +54,8 @@ public class ProblemManagementEOServiceImpl extends ServiceImpl<ProblemManagemen
 	 */
 	@Override
     public void editById(ProblemManagementEO problemManagementEO) {
+		//相关文件地址链接，进度追踪，审批证据链接
+		setParam(problemManagementEO);
     	Date now = new Date();
         problemManagementEO.setUpdateTime(now);
     	saveOrUpdate(problemManagementEO);
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 4482a77b7..04e5b6298 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
@@ -158,6 +158,9 @@ public class NcrTrackVO implements Serializable {
 
     private String flowStatus;
 
+    //用于区分旧数据和新数据（旧数据->old,新数据->new）
+    private String flag;
+