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

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;
+
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProblemManagementEOServiceImpl.java

@@ -1,11 +1,19 @@
 package com.jero.modules.project.service.impl;
 
+import com.jero.modules.oss.entity.OSSFile;
+import com.jero.modules.oss.service.IOSSFileService;
 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.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Date;
+import java.util.UUID;
+
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 /**
@@ -17,6 +25,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class ProblemManagementEOServiceImpl extends ServiceImpl<ProblemManagementEOMapper, ProblemManagementEO> implements IProblemManagementEOService {
 
+
+	@Autowired
+	private IOSSFileService iOSSFileService;
+
 	/**
 	 * 保存
 	 *
@@ -25,12 +37,59 @@ public class ProblemManagementEOServiceImpl extends ServiceImpl<ProblemManagemen
 	 */
 	@Override
     public void add(ProblemManagementEO problemManagementEO) {
-        Date now = new Date();
+		//相关文件地址链接，进度追踪，审批证据链接
+		setParam(problemManagementEO);
+
+		//处理相关文件和审批证据
+		fileAndApprovalEvidence(problemManagementEO);
+
+		Date now = new Date();
         problemManagementEO.setCreateTime(now);
         problemManagementEO.setUpdateTime(now);
         save(problemManagementEO);
     }
 
+	private void fileAndApprovalEvidence(ProblemManagementEO problemManagementEO) {
+		//处理相关文件
+		if(StringUtils.isNotBlank(problemManagementEO.getFile())){
+			String connectId = UUID.randomUUID().toString().replace("-", "");
+			String fileIds = problemManagementEO.getFile();
+			List<OSSFile> oSSFileList = new ArrayList<>();
+			updateFileInfo(fileIds, oSSFileList,connectId);
+			problemManagementEO.setFile(connectId);
+		}
+		//处理审批证据
+		if(StringUtils.isNotBlank(problemManagementEO.getApprovalEvidence())){
+			String connectId = UUID.randomUUID().toString().replace("-", "");
+			String fileIds = problemManagementEO.getApprovalEvidence();
+			List<OSSFile> oSSFileList = new ArrayList<>();
+			updateFileInfo(fileIds, oSSFileList,connectId);
+			problemManagementEO.setApprovalEvidence(connectId);
+		}
+	}
+
+	private void updateFileInfo(String fileIds, List<OSSFile> oSSFileList,String connectId) {
+		for (String fileId : fileIds.split(",")) {
+			OSSFile ossFile = new OSSFile();
+			ossFile.setId(fileId);
+			ossFile.setConnectId(connectId);
+			oSSFileList.add(ossFile);
+		}
+		iOSSFileService.updateFileInfo(oSSFileList);
+	}
+
+	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 +98,12 @@ public class ProblemManagementEOServiceImpl extends ServiceImpl<ProblemManagemen
 	 */
 	@Override
     public void editById(ProblemManagementEO problemManagementEO) {
+		//相关文件地址链接，进度追踪，审批证据链接
+		setParam(problemManagementEO);
+
+		//处理相关文件和审批证据
+		fileAndApprovalEvidence(problemManagementEO);
+
     	Date now = new Date();
         problemManagementEO.setUpdateTime(now);
     	saveOrUpdate(problemManagementEO);

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;
+