init

docs/db/phase2/init-phase2.sql

@@ -780,6 +780,7 @@ CREATE TABLE IF NOT EXISTS `qual_on_site_review` (
                                        `review_date_start` datetime NOT NULL COMMENT '现场审查开始时间',
                                        `review_location` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '审查地点',
                                        `review_members` varchar(512) DEFAULT NULL COMMENT '审查组成员名单',
+                                       `review_leader` varchar(64) DEFAULT NULL COMMENT '审查组长',
                                        `material_requirements` text COMMENT '材料准备要求',
                                        `supervisor_contact` varchar(64) DEFAULT NULL COMMENT '监管联系人姓名',
                                        `contact_phone` varchar(32) DEFAULT NULL COMMENT '监管联系电话',

safety-eval-app/src/main/java/org/qinan/safetyeval/app/review/executor/command/QualOnSiteReviewUpdateCmdExe.java

@@ -97,6 +97,7 @@ public class QualOnSiteReviewUpdateCmdExe {
         reviewE.setId(cmd.getId());
         reviewE.setStatus(status);
         reviewE.setReviewOpinion(cmd.getReviewOpinion());
+        reviewE.setReviewLeader(cmd.getReviewLeader());
         Boolean updateRes = reviewE.update();
         if (!updateRes) {
             throw new BizException("数据已被更新，请刷新重试");

safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/request/QualOnSiteReviewAddCmd.java

@@ -54,6 +54,12 @@ public class QualOnSiteReviewAddCmd implements Serializable {
     @ApiModelProperty(value = "审查组成员名单")
     @Size(max = 512, message = "审查组成员名单不能超过512个字符")
     private String reviewMembers;
+    /**
+     * 审查组长
+     */
+    @ApiModelProperty(value = "审查组长")
+    @Size(max = 64, message = "审查组长不能超过64个字符")
+    private String reviewLeader;
     /**
      * 材料准备要求
      */

safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/request/QualOnSiteReviewResultUploadCmd.java

@@ -27,6 +27,10 @@ public class QualOnSiteReviewResultUploadCmd implements Serializable {
     @ApiModelProperty(value = "资质现场核查id", required = true)
     private Long id;
 
+    @ApiModelProperty(value = "审查组长")
+    @Size(max = 64, message = "审查组长不能超过64个字符")
+    private String reviewLeader;
+
     @NotBlank(message = "审查结论不能为空")
     @ApiModelProperty(value = "审查结论:true通过/false不通过", required = true)
     @NotNull

safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/request/QualOnSiteReviewUpdateCmd.java

@@ -22,6 +22,14 @@ public class QualOnSiteReviewUpdateCmd implements Serializable {
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     @NotNull(message = "id不能为空")
     private Long id;
+
+    /**
+     * 受审查机构ID (关联机构表)
+     */
+    @ApiModelProperty(value = "受审查机构ID (关联机构表)", required = true)
+    @NotNull(message = "受审查机构ID不能为空")
+    private Long orgId;
+
     /**
      * 资质类型:add 新增 ，change:变更
      */
@@ -52,6 +60,12 @@ public class QualOnSiteReviewUpdateCmd implements Serializable {
     @ApiModelProperty(value = "审查组成员名单")
     @Size(max = 512, message = "审查组成员名单不能超过512个字符")
     private String reviewMembers;
+    /**
+     * 审查组长
+     */
+    @ApiModelProperty(value = "审查组长")
+    @Size(max = 64, message = "审查组长不能超过64个字符")
+    private String reviewLeader;
     /**
      * 材料准备要求
      */

safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/response/QualOnSiteReviewCo.java

@@ -50,6 +50,11 @@ public class QualOnSiteReviewCo extends ClientObject {
      */
     @ApiModelProperty(value = "审查组成员名单")
     private String reviewMembers;
+    /**
+     * 审查组长
+     */
+    @ApiModelProperty(value = "审查组长")
+    private String reviewLeader;
     /**
      * 材料准备要求
      */

safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/response/QualOnSiteReviewMonitorCo.java

@@ -47,6 +47,11 @@ public class QualOnSiteReviewMonitorCo extends ClientObject {
      */
     @ApiModelProperty(value = "审查组成员名单")
     private String reviewMembers;
+    /**
+     * 审查组长
+     */
+    @ApiModelProperty(value = "审查组长")
+    private String reviewLeader;
     /**
      * 材料准备要求
      */

safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/response/QualOnSiteReviewOrgCo.java

@@ -46,6 +46,11 @@ public class QualOnSiteReviewOrgCo extends ClientObject {
      */
     @ApiModelProperty(value = "审查组成员名单")
     private String reviewMembers;
+    /**
+     * 审查组长
+     */
+    @ApiModelProperty(value = "审查组长")
+    private String reviewLeader;
     /**
      * 材料准备要求
      */

safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/review/model/QualOnSiteReviewE.java

@@ -42,6 +42,10 @@ public class QualOnSiteReviewE extends BaseE {
      * 审查组成员名单
      */
     private String reviewMembers;
+    /**
+     * 审查组长
+     */
+    private String reviewLeader;
     /**
      * 材料准备要求
      */

safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualOnSiteReviewDO.java

@@ -41,6 +41,10 @@ public class QualOnSiteReviewDO extends BaseDO {
      * 审查组成员名单
      */
     private String reviewMembers;
+    /**
+     * 审查组长
+     */
+    private String reviewLeader;
     /**
      * 材料准备要求
      */

safety-eval-infrastructure/src/main/resources/mapper/QualOnSiteReviewMapper.xml

@@ -38,6 +38,7 @@
                review_date_start,
                review_location,
                review_members,
+               review_leader,
                material_requirements,
                supervisor_contact,
                contact_phone,