From 93e34126e79cd1ecb70b581760631a90f9237eb4 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 2 Feb 2024 19:43:40 +0800
Subject: [PATCH] =?UTF-8?q?fix=2081319=20=E6=B3=95=E8=A7=84=E5=90=88?=
 =?UTF-8?q?=E8=A7=84=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B-=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1=E5=B7=A5=E7=A8=8B=E5=B8=88=E8=A1=A5=E5=85=85=E7=AB=8B?=
 =?UTF-8?q?=E9=A1=B9=E9=A1=B9=E7=9B=AE=E5=8F=B7=EF=BC=8C=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E6=95=B0=E6=8D=AE=E6=B2=A1=E6=9C=89=E6=AD=A3?=
 =?UTF-8?q?=E5=B8=B8=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/ProcessProjectStandardTerm.java        | 15 +++++++--------
 .../xml/ProcessProjectStandardTermMapper.xml      |  1 +
 .../service/ProcessProjectStandardService.java    | 11 +++++++++--
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTerm.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTerm.java
index 5e9d7f4c..2e3910c5 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTerm.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTerm.java
@@ -125,6 +125,13 @@ public class ProcessProjectStandardTerm {
     @ApiModelProperty(value="拆分单id")
     private String splitInfoId;
 
+    @ApiModelProperty(value="评估结果")
+    private String assessResults;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value="评估结果")
+    private String assessResults_dictText;
+
     /**
      * 是否立项
      */
@@ -213,14 +220,6 @@ public class ProcessProjectStandardTerm {
     @ApiModelProperty(value="")
     private String termUserId;
 
-    @TableField(exist = false)
-    @ApiModelProperty(value="评估结果")
-    private String assessResults;
-
-    @TableField(exist = false)
-    @ApiModelProperty(value="评估结果")
-    private String assessResults_dictText;
-
     /**工作令编号*/
     @TableField(exist = false)
     @ApiModelProperty(value = "工作令编号")
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml
index 8de5f2e4..5be28086 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml
@@ -179,6 +179,7 @@
 
   <select id="getByTermDesignEngineer" resultMap="BaseResultMap">
     select
+    ppst.assess_results,
     <include refid="Base_Column_List">
       <property name="alias" value="ppst"/>
     </include>
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java
index 7d740de4..addff2c9 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java
@@ -282,7 +282,11 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
                         }
                     }
                 }
-            }else if (AssessCommon.NOT_COMPLIANT.equals(assessResults)) {
+            }
+            else if (ProcessProjectStandardCommon.SJGCSBCGZLBH.equals(taskDefinitionKey)){
+                projectApprovalFlag = term.getProjectApprovalFlag();
+            }
+            else if (AssessCommon.NOT_COMPLIANT.equals(assessResults)) {
                 projectApprovalFlag = YesOrNoEnum.YES.getValue();
             }else {
                 projectApprovalFlag = YesOrNoEnum.NO.getValue();
@@ -676,12 +680,15 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
             ProcessProjectStandardTerm term1 = new ProcessProjectStandardTerm();
             String termId = term.getId();
             String assessResults = term.getAssessResults();
+            String projectApprovalFlag = term.getProjectApprovalFlag();
             String designEngineer = term.getDesignEngineer();
             if (!pass){
                 continue;
             }
             term1.setId(termId);
             term1.setDesignEngineer(designEngineer);
+            term1.setAssessResults(assessResults);
+            term1.setProjectApprovalFlag(projectApprovalFlag);
             updateTermList.add(term1);
 
             LawsSpecialProjectLibrary projectLibrary = new LawsSpecialProjectLibrary();
@@ -717,7 +724,7 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
                     ProcessProjectStandardTermUser updateTermUser = new ProcessProjectStandardTermUser();
                     updateTermUser.setId(termUser.getId());
                     String designEngineer1 = termUser.getDesignEngineer();
-                    term1.setAssessResults(assessResults);
+                    updateTermUser.setAssessResults(assessResults);
                     if(StringUtils.isBlank(designEngineer1)){
                         designEngineer1 = termUser.getModuleOwner();
                         updateTermUser.setDescription(termUser.getNotInvolved());