From 434c8868df7882e667124afd296c14334dd07e8d Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 25 Dec 2023 17:23:21 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E9=A1=B9=E7=9B=AE=E5=90=88=E8=A7=84?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=20=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=AE=9A=E4=B9=89=E5=92=8C=E5=AE=9E=E4=BE=8B?=
 =?UTF-8?q?id=E5=88=B0=E6=A0=87=E5=87=86=E8=AF=84=E4=BC=B0=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ProcessProjectAssessService.java         |  4 ++++
 .../projectLibrary/entity/LawsAssessResults.java     | 12 ++++++++++++
 .../service/impl/LawsAssessResultsServiceImpl.java   |  2 ++
 3 files changed, 18 insertions(+)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java
index 12f6b5fc..6bcbd737 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java
@@ -600,6 +600,8 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
             lawsAssessResults.setNonConformance(assessTerm.getNonConformance());
             lawsAssessResults.setCountermeasures(assessTerm.getCountermeasures());
             lawsAssessResults.setReason(assessTerm.getDescription());
+            lawsAssessResults.setProcessDefinitionId(processDTO.getProcessDefinitionId());
+            lawsAssessResults.setProcessInstanceId(processDTO.getProcessInstanceId());
             lawsAssessResultsList.add(lawsAssessResults);
         }
 
@@ -702,6 +704,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
         List<ProcessProjectAssessTerm> processProjectAssessTermList = businessInfoDTO.getProcessProjectAssessTermList();
         List<ProcessProjectAssessTermUser> allTermUserList = new ArrayList<>();
         List<String> moduleOwnerIds = new ArrayList<>();
+        Date date = new Date();
         for (ProcessProjectAssessTerm processProjectAssessTerm : processProjectAssessTermList) {
             String termId = processProjectAssessTerm.getId();
             Integer canAssignFlag = processProjectAssessTerm.getCanAssignFlag();
@@ -718,6 +721,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
                 newTermUser.setNotInvolved(notInvolved);
                 newTermUser.setDescription(notInvolved);
                 newTermUser.setEvaluationFeedback(AssessCommon.NOT_INVOLVED);
+                newTermUser.setAssessTime(date);
                 allTermUserList.add(newTermUser);
                 continue;
             }
diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsAssessResults.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsAssessResults.java
index 9a6bbc16..c2f44540 100644
--- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsAssessResults.java
+++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsAssessResults.java
@@ -184,4 +184,16 @@ public class LawsAssessResults implements Serializable {
     @ApiModelProperty(value = "标准状态")
     @Dict(dicCode = "standard_state")
     private String standardState;
+
+    /**
+     * 流程定义id
+     */
+    @ApiModelProperty(value="流程定义id")
+    private String processDefinitionId;
+
+    /**
+     * 流程实例id
+     */
+    @ApiModelProperty(value="流程实例id")
+    private String processInstanceId;
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessResultsServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessResultsServiceImpl.java
index 5c0b2794..7206efc7 100644
--- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessResultsServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessResultsServiceImpl.java
@@ -119,6 +119,8 @@ public class LawsAssessResultsServiceImpl extends ServiceImpl<LawsAssessResultsM
 			assessResults.setStandardEnglishName(standardEnglishName);
 			assessResults.setStandardState(standardState);
 			assessResults.setSource(source);
+			assessResults.setProcessStatus(processStatus);
+			assessResults.setSource(source);
 		}
 		return pageList;
     }