feat: 企标评审会记录增加评审人列

laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java

@@ -127,7 +127,6 @@ public class ProcessEsRevision implements Serializable {
     /**
      * 评审人
      */
-    @TableField(exist = false)
     @ApiModelProperty(value = "评审人")
     private String reviewUser;
 

laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java

@@ -116,6 +116,7 @@ public class ProcessESRevisionEndListener implements ExecutionListener {
         esRmr.setStandardId(standardId);
         esRmr.setPlanId(esp.getId());
         esRmr.setReviewDate(data.getReviewDate());
+        esRmr.setReviewUser(data.getReviewUser());
         rmrService.save(esRmr);
         // 保存评审会评审结果
         List<ReviewMeetingDetailVO> reviewMeetingDetailVOS = data.parseReviewMeetingDetails();

laws-modules/src/main/java/com/jero/modules/laws/bindPart/mapper/xml/LawsBindPartMapper.xml

@@ -44,9 +44,10 @@
             select id, standard_number, standard_name from laws_enterprise_standard where del_flag = 0
             UNION ALL
             select id, standard_number, standard_name from laws_domestic_standard where del_flag = 0
+            UNION ALL
+            select id, standard_number, standard_name from laws_overseas_standard where del_flag = 0
         ) AS standard ON sfsi.standard_id = standard.id
-        LEFT JOIN
-            laws_bind_part_doc AS lbpd ON lbpd.bind_id = bp.id
+        LEFT JOIN laws_bind_part_doc AS lbpd ON lbpd.bind_id = bp.id
         LEFT JOIN laws_document_split AS split ON split.id = lbpd.clause_id
         <where>
             <!--零部件号-->

laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardReviewMeetingRecord.java

@@ -71,4 +71,8 @@ public class EnterpriseStandardReviewMeetingRecord implements Serializable {
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "评审日期")
     private Date reviewDate;
+
+    /**评审人*/
+    @ApiModelProperty(value = "评审人")
+    private String reviewUser;
 }

laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardReviewMeetingVo.java

@@ -43,10 +43,14 @@ public class EnterpriseStandardReviewMeetingVo {
     @ApiModelProperty(value = "评审日期")
     private Date reviewDate;
 
+    @Dict(dicCode = "id", dictTable = "sys_user", dicText = "realname")
     @ApiModelProperty(value = "评审人")
     private String reviewUsers;
 
-    @ApiModelProperty(value = "评审人")
+    @ApiModelProperty(value = "评分人")
+    private String rateUsers;
+
+    @ApiModelProperty(value = "平均分")
     private String avgScore;
 
     /**是否为优质标准*/

laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardReviewMeetingRecordMapper.xml

@@ -13,6 +13,7 @@
             <result property="orgCode" column="org_code" jdbcType="VARCHAR"/>
             <result property="standardId" column="standard_id" jdbcType="VARCHAR"/>
             <result property="planId" column="plan_id" jdbcType="VARCHAR"/>
+            <result property="reviewUser" column="review_user" jdbcType="VARCHAR"/>
             <result property="reviewDate" column="review_date" jdbcType="TIMESTAMP"/>
     </resultMap>
 
@@ -24,10 +25,11 @@
             es.main_drafting_user AS mainDraftUser,
             es.main_drafting_unit AS mainDraftUnit,
             rmr.review_date AS reviewDate,
+            rmr.review_user AS reviewUsers,
             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 rateUsers
         FROM
             `laws_enterprise_standard_review_meeting_record` AS rmr
                 LEFT JOIN