update 项目合规评估流程 推送流程定义和实例id到标准评估结果

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

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

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