From 318e257ad993436ab01ceacc159827fb3fd1c21e Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 25 Dec 2023 16:50:15 +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=E4=B8=8D=E6=B6=89?=
 =?UTF-8?q?=E5=8F=8A=E6=97=B6=EF=BC=8C=E7=BB=99=E8=AF=84=E4=BC=B0=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E4=B9=9F=E8=B5=8B=E5=80=BC=E4=B8=8D=E6=B6=89=E5=8F=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ProcessProjectAssessService.java           | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

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 39ce56de..77f7661c 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
@@ -590,13 +590,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
             lawsAssessResults.setDescription(assessTerm.getDescription());
             lawsAssessResults.setNonConformance(assessTerm.getNonConformance());
             lawsAssessResults.setCountermeasures(assessTerm.getCountermeasures());
-            //不涉及原因，根据是否是设计工程师评估反馈区分
-            if (StringUtils.isBlank(evaluationFeedback)){
-                lawsAssessResults.setAssessResults(AssessCommon.NOT_COMPLIANT);
-                lawsAssessResults.setReason(assessTerm.getNotInvolved());
-            }else {
-                lawsAssessResults.setReason(assessTerm.getDescription());
-            }
+            lawsAssessResults.setReason(assessTerm.getDescription());
             lawsAssessResultsList.add(lawsAssessResults);
         }
 
@@ -713,6 +707,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
                 newTermUser.setResponsibleUnitLeader(originUserId);
                 newTermUser.setParentExecutionId(executionId);
                 newTermUser.setNotInvolved(notInvolved);
+                newTermUser.setDescription(notInvolved);
                 newTermUser.setEvaluationFeedback(AssessCommon.NOT_INVOLVED);
                 allTermUserList.add(newTermUser);
                 continue;
@@ -787,6 +782,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
                 newTermUser.setModuleOwner(originUserId);
                 newTermUser.setParentExecutionId(executionId);
                 newTermUser.setNotInvolved(notInvolved);
+                newTermUser.setDescription(notInvolved);
                 newTermUser.setEvaluationFeedback(AssessCommon.NOT_INVOLVED);
                 newTermUser.setAssessTime(date);
                 allTermUserList.add(newTermUser);