From b3c2f3f355780d5743589b8b1147e05dfd3a8160 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 28 Dec 2023 16:48:20 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=B6=E4=BF=AE=E8=AE=A2=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E7=BB=93=E6=9D=9F=20=E7=94=9F=E6=88=90=E8=AF=84?=
 =?UTF-8?q?=E5=AE=A1=E4=BC=9A=E8=AE=B0=E5=BD=95BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProcessESRevisionEndListener.java         |  4 +--
 .../service/impl/EsRevisionServiceImpl.java   |  7 ++++-
 ...EnterpriseStandardReviewMeetingRecord.java |  4 +--
 .../vo/EnterpriseStandardReviewMeetingVo.java |  2 ++
 ...priseStandardReviewMeetingRecordMapper.xml | 31 +++++++++----------
 5 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java
index b8a6a112..bb00edd3 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java
@@ -102,8 +102,8 @@ public class ProcessESRevisionEndListener implements ExecutionListener {
         LawsEnterpriseStandard es = esService.getOne(esWrapper);
         // 保存评审会记录
         EnterpriseStandardReviewMeetingRecord esRmr = new EnterpriseStandardReviewMeetingRecord();
-        esRmr.setStandardId(es.getId());
-        esRmr.setStandardNo(es.getStandardNumber());
+        esRmr.setStandardId(esp.getId());
+        esRmr.setPlanId(esp.getId());
         esRmr.setReviewDate(data.getReviewDate());
         rmrService.save(esRmr);
         // 保存评审会评审结果
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
index 1470d047..7072db63 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
@@ -245,6 +245,7 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
         List<OtherDraftUserVO> otherDraftUserVOS = data.parseOtherDraftUserVOS();
         List<InspectContentVO> inspectContentVOS = data.parseInspectContents();
         String xmlNodeId = record.getNodeId();
+        boolean pass = (boolean) taskService.getVariable(taskId, "pass");
         // 某些节点需要对数据进行特殊处理
         switch (xmlNodeId) {
             case OTHER_DRAFT_USER_UPLOAD:
@@ -262,7 +263,11 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
                 }
                 break;
             case CONTACT_USER_DISTRIBUTE:
-                data.setWorkGroup(null);
+                if (pass) {
+                    data.setWorkGroup(null);
+                    data.setAuthDept(null);
+                    data.setReviewUser(null);
+                }
             case CONTACT_USER_COLLECT:
                 String contactUserLeader = (String) runtimeService.getVariable(executionId, executionId + "-ContactUserLeader");
                 data.setContactUserLeader(contactUserLeader);
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardReviewMeetingRecord.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardReviewMeetingRecord.java
index e4927bad..d78c928e 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardReviewMeetingRecord.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardReviewMeetingRecord.java
@@ -63,8 +63,8 @@ public class EnterpriseStandardReviewMeetingRecord implements Serializable {
     private String standardId;
 
     /**企标编号*/
-    @ApiModelProperty(value = "企标编号")
-    private String standardNo;
+    @ApiModelProperty(value = "企标计划Id")
+    private String planId;
 
     /**评审日期*/
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardReviewMeetingVo.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardReviewMeetingVo.java
index f316a448..8ed2e6a1 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardReviewMeetingVo.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardReviewMeetingVo.java
@@ -29,9 +29,11 @@ public class EnterpriseStandardReviewMeetingVo {
     @ApiModelProperty(value = "企标编号")
     private String standardName;
 
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty(value = "主起草人")
     private String mainDraftingUser;
 
+    @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
     @ApiModelProperty(value = "主起草单位")
     private String mainDraftingUnit;
 
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardReviewMeetingRecordMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardReviewMeetingRecordMapper.xml
index 272e2b3b..af5cc060 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardReviewMeetingRecordMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardReviewMeetingRecordMapper.xml
@@ -12,38 +12,34 @@
             <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
             <result property="orgCode" column="org_code" jdbcType="VARCHAR"/>
             <result property="standardId" column="standard_id" jdbcType="VARCHAR"/>
-            <result property="standardNo" column="standard_no" jdbcType="VARCHAR"/>
+            <result property="planId" column="plan_id" jdbcType="VARCHAR"/>
             <result property="reviewDate" column="review_date" jdbcType="TIMESTAMP"/>
     </resultMap>
 
     <select id="page" resultType="com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardReviewMeetingVo">
         SELECT
             rmr.id,
-            esp.standardNo,
-            esp.standardName,
-            esp.mainDraftingUser,
-            esp.mainDraftingUnit,
+            es.standard_number AS standardNo,
+            es.standard_name AS standardName,
+            es.main_drafting_user AS mainDraftUser,
+            es.main_drafting_unit AS mainDraftUnit,
             rmr.review_date AS reviewDate,
             esp.qualityFlag,
             (score.avg_score_item1 + score.avg_score_item2 + score.avg_score_item3 +
              score.avg_score_item4 + score.avg_score_item5 + score.avg_score_item6) AS avgScore,
-            GROUP_CONCAT(DISTINCT CONCAT(u.realname, '（', u.username, '）') ORDER BY u.username ASC SEPARATOR '，') AS reviewUsers
+            GROUP_CONCAT(DISTINCT CONCAT(u.realname, '(', u.username, ')') ORDER BY u.username ASC SEPARATOR ',') AS reviewUsers
         FROM
             `laws_enterprise_standard_review_meeting_record` AS rmr
                 LEFT JOIN
+            `laws_enterprise_standard` AS es ON es.id = rmr.standard_id
+                LEFT JOIN
             (
                 SELECT
                     esp.id,
-                    esp.new_en_standard_no AS standardNo,
-                    esp.new_en_standard_name AS standardName,
-                    esp.quality_flag AS qualityFlag,
-                    u.username AS mainDraftingUser,
-                    d.depart_name AS mainDraftingUnit
+                    esp.quality_flag AS qualityFlag
                 FROM
                     laws_enterprise_standard_plan AS esp
-                        LEFT JOIN sys_user AS u ON u.id = esp.main_drafting_user
-                        LEFT JOIN sys_depart AS d ON d.id = esp.main_drafting_unit
-            ) AS esp ON esp.id = rmr.standard_id
+            ) AS esp ON esp.id = rmr.plan_id
                 LEFT JOIN
             (
                 SELECT
@@ -66,17 +62,18 @@
         Where 1 = 1
         <!--企标编号判断-->
         <if test="param.standardNo != null and param.standardNo != ''">
-            AND esp.standardNo LIKE CONCAT('%',#{param.standardNo},'%')
+            AND es.standard_number LIKE CONCAT('%',#{param.standardNo},'%')
         </if>
         <!--企标名称判断-->
         <if test="param.standardName != null and param.standardName != ''">
-            AND esp.standardName LIKE CONCAT('%',#{param.standardName},'%')
+            AND es.standard_name LIKE CONCAT('%',#{param.standardName},'%')
         </if>
         <!--评审日期判断-->
         <if test="param.reviewStartDate != null and param.reviewEndDate != null">
             AND rmr.review_date BETWEEN #{param.reviewStartDate} AND #{param.reviewEndDate}
         </if>
-        GROUP BY rmr.id, esp.standardNo, esp.standardName, esp.mainDraftingUser, esp.mainDraftingUnit, rmr.review_date, esp.qualityFlag, score.avg_score_item1, score.avg_score_item2, score.avg_score_item3, score.avg_score_item4, score.avg_score_item5, score.avg_score_item6
+        GROUP BY rmr.id,
+                 rmr.review_date, esp.qualityFlag, score.avg_score_item1, score.avg_score_item2, score.avg_score_item3, score.avg_score_item4, score.avg_score_item5, score.avg_score_item6
         ORDER BY
             avgScore DESC,
             score.avg_score_item2 DESC,