From 9152c9927efc41565575e702554f1aaf27fc07a6 Mon Sep 17 00:00:00 2001 From: luotaiqian <1147642922@qq.com> Date: Tue, 21 Jul 2026 10:24:31 +0800 Subject: [PATCH] init --- docs/db/phase2/init-phase2.sql | 1 + .../command/QualOnSiteReviewUpdateCmdExe.java | 1 + .../review/request/QualOnSiteReviewAddCmd.java | 6 ++++++ .../request/QualOnSiteReviewResultUploadCmd.java | 4 ++++ .../review/request/QualOnSiteReviewUpdateCmd.java | 14 ++++++++++++++ .../client/review/response/QualOnSiteReviewCo.java | 5 +++++ .../review/response/QualOnSiteReviewMonitorCo.java | 5 +++++ .../review/response/QualOnSiteReviewOrgCo.java | 5 +++++ .../domain/review/model/QualOnSiteReviewE.java | 4 ++++ .../domainobject/QualOnSiteReviewDO.java | 4 ++++ .../resources/mapper/QualOnSiteReviewMapper.xml | 1 + 11 files changed, 50 insertions(+) diff --git a/docs/db/phase2/init-phase2.sql b/docs/db/phase2/init-phase2.sql index 168d8e4..87b2fde 100644 --- a/docs/db/phase2/init-phase2.sql +++ b/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 '监管联系电话', diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/review/executor/command/QualOnSiteReviewUpdateCmdExe.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/review/executor/command/QualOnSiteReviewUpdateCmdExe.java index 2fcb682..2be2080 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/review/executor/command/QualOnSiteReviewUpdateCmdExe.java +++ b/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("数据已被更新，请刷新重试"); diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/request/QualOnSiteReviewAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/request/QualOnSiteReviewAddCmd.java index 2f40f70..f4b9a94 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/request/QualOnSiteReviewAddCmd.java +++ b/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; /** * 材料准备要求 */ diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/request/QualOnSiteReviewResultUploadCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/request/QualOnSiteReviewResultUploadCmd.java index dcf0345..5ae76b6 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/request/QualOnSiteReviewResultUploadCmd.java +++ b/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 diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/request/QualOnSiteReviewUpdateCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/request/QualOnSiteReviewUpdateCmd.java index ae55cc9..cf46312 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/request/QualOnSiteReviewUpdateCmd.java +++ b/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; /** * 材料准备要求 */ diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/response/QualOnSiteReviewCo.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/response/QualOnSiteReviewCo.java index f1c6611..6224c88 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/response/QualOnSiteReviewCo.java +++ b/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; /** * 材料准备要求 */ diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/response/QualOnSiteReviewMonitorCo.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/response/QualOnSiteReviewMonitorCo.java index 5716836..a9b0e90 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/response/QualOnSiteReviewMonitorCo.java +++ b/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; /** * 材料准备要求 */ diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/response/QualOnSiteReviewOrgCo.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/response/QualOnSiteReviewOrgCo.java index 9c2c31a..c32c249 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/response/QualOnSiteReviewOrgCo.java +++ b/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; /** * 材料准备要求 */ diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/review/model/QualOnSiteReviewE.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/review/model/QualOnSiteReviewE.java index 4501a40..78b6444 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/review/model/QualOnSiteReviewE.java +++ b/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; /** * 材料准备要求 */ diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualOnSiteReviewDO.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualOnSiteReviewDO.java index 310c587..6deb02e 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualOnSiteReviewDO.java +++ b/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; /** * 材料准备要求 */ diff --git a/safety-eval-infrastructure/src/main/resources/mapper/QualOnSiteReviewMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/QualOnSiteReviewMapper.xml index 5088a51..649a8df 100644 --- a/safety-eval-infrastructure/src/main/resources/mapper/QualOnSiteReviewMapper.xml +++ b/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,