ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 项目合规评估流程 不涉及时，给评估结果也赋值不涉及

Browse Source
This commit is contained in:
lijiarao
2023-12-25 16:50:15 +08:00
parent 449982c5aa
commit 318e257ad9
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java
+3 -7
View File
@@ -590,13 +590,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
lawsAssessResults.setDescription(assessTerm.getDescription()); lawsAssessResults.setDescription(assessTerm.getDescription());
lawsAssessResults.setNonConformance(assessTerm.getNonConformance()); lawsAssessResults.setNonConformance(assessTerm.getNonConformance());
lawsAssessResults.setCountermeasures(assessTerm.getCountermeasures()); lawsAssessResults.setCountermeasures(assessTerm.getCountermeasures());
//不涉及原因，根据是否是设计工程师评估反馈区分 lawsAssessResults.setReason(assessTerm.getDescription());
if (StringUtils.isBlank(evaluationFeedback)){
lawsAssessResults.setAssessResults(AssessCommon.NOT_COMPLIANT);
lawsAssessResults.setReason(assessTerm.getNotInvolved());
}else {
lawsAssessResults.setReason(assessTerm.getDescription());
}
lawsAssessResultsList.add(lawsAssessResults); lawsAssessResultsList.add(lawsAssessResults);
} }
@@ -713,6 +707,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
newTermUser.setResponsibleUnitLeader(originUserId); newTermUser.setResponsibleUnitLeader(originUserId);
newTermUser.setParentExecutionId(executionId); newTermUser.setParentExecutionId(executionId);
newTermUser.setNotInvolved(notInvolved); newTermUser.setNotInvolved(notInvolved);
newTermUser.setDescription(notInvolved);
newTermUser.setEvaluationFeedback(AssessCommon.NOT_INVOLVED); newTermUser.setEvaluationFeedback(AssessCommon.NOT_INVOLVED);
allTermUserList.add(newTermUser); allTermUserList.add(newTermUser);
continue; continue;
@@ -787,6 +782,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
newTermUser.setModuleOwner(originUserId); newTermUser.setModuleOwner(originUserId);
newTermUser.setParentExecutionId(executionId); newTermUser.setParentExecutionId(executionId);
newTermUser.setNotInvolved(notInvolved); newTermUser.setNotInvolved(notInvolved);
newTermUser.setDescription(notInvolved);
newTermUser.setEvaluationFeedback(AssessCommon.NOT_INVOLVED); newTermUser.setEvaluationFeedback(AssessCommon.NOT_INVOLVED);
newTermUser.setAssessTime(date); newTermUser.setAssessTime(date);
allTermUserList.add(newTermUser); allTermUserList.add(newTermUser);