From 61f62adcfdee885867454693820f6be304fbe1bc Mon Sep 17 00:00:00 2001 From: luotaiqian <1147642922@qq.com> Date: Thu, 23 Jul 2026 10:52:43 +0800 Subject: [PATCH] waring --- docs/db/phase2/init-phase2.sql | 2 ++ docs/db/todo.sql | 7 +++++++ .../executor/institution/EvalProcessControlExecutor.java | 5 ++--- .../client/co/institution/EvalProcessControlCO.java | 4 ++++ .../client/dto/institution/EvalProcessControlSaveCmd.java | 4 ++++ .../safetyeval/domain/entity/EvalProcessControlEntity.java | 4 ++++ .../infrastructure/dataobject/EvalProcessControlDO.java | 4 ++++ 7 files changed, 27 insertions(+), 3 deletions(-) diff --git a/docs/db/phase2/init-phase2.sql b/docs/db/phase2/init-phase2.sql index a4a41c2..221757d 100644 --- a/docs/db/phase2/init-phase2.sql +++ b/docs/db/phase2/init-phase2.sql @@ -677,6 +677,8 @@ create table `eval_process_control` ( `project_id` bigint not null comment '项目id', `controller_personnel_id` bigint default null comment '过程控制负责人人员id', `controller_name` varchar(50) default null comment '过程控制负责人姓名', + `reviewer_signature_url` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '内审人独立签字', + `reviewer_signature_task_status` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT 'non_dispatched' COMMENT '审核签字任务状态 dispatched 下发，non_dispatched 未下发 , completed 已完成', `precheck_pass_flag` tinyint default 2 comment '前7节点是否全部完成(1是2否)', `result_code` int default null comment '过程控制结论(1通过2退回)', `result_name` varchar(50) default null comment '结论名称', diff --git a/docs/db/todo.sql b/docs/db/todo.sql index 3475f99..0c31028 100644 --- a/docs/db/todo.sql +++ b/docs/db/todo.sql @@ -62,6 +62,13 @@ ALTER TABLE `eval_process_control` ALTER TABLE `eval_process_control` ADD COLUMN `handover_form_status` varchar(32) DEFAULT 'not_create' COMMENT '归档交接单状态(not_create未生成,created已生成)' AFTER `handover_form_url`; +-- eval_process_control 表添加内审人签字字段 +ALTER TABLE `eval_process_control` + ADD COLUMN `reviewer_signature_url` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '内审人独立签字' AFTER `controller_name`; + +ALTER TABLE `eval_process_control` + ADD COLUMN `reviewer_signature_task_status` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT 'non_dispatched' COMMENT '审核签字任务状态 dispatched 下发，non_dispatched 未下发 , completed 已完成' AFTER `reviewer_signature_url`; + -- 2. qual_filing_personnel_cert 表添加行业专业标准ID字段 ALTER TABLE `qual_filing_personnel_cert` ADD COLUMN `industry_professional_standards_id` BIGINT DEFAULT NULL COMMENT '行业专业标准ID' diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalProcessControlExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalProcessControlExecutor.java index 77a5c5b..52fb4f5 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalProcessControlExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalProcessControlExecutor.java @@ -349,11 +349,10 @@ public class EvalProcessControlExecutor implements EvalProcessControlApi { private EvalProjectFileCO buildFile(Long id, String processName, String itemName, String name, String url) { EvalProjectFileCO co = new EvalProjectFileCO(); - co.setId(id != null ? String.valueOf(id) : null); co.setProcessName(processName); co.setItemName(itemName); - co.setName(name); - co.setUrl(url); + co.set(name); + co.setProjectDocUrl(url); return co; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/institution/EvalProcessControlCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/institution/EvalProcessControlCO.java index 7f22056..4e5b2a7 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/institution/EvalProcessControlCO.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/institution/EvalProcessControlCO.java @@ -150,6 +150,10 @@ public class EvalProcessControlCO { private String draftId; private String reviewerPersonnelId; private String reviewerName; + @ApiModelProperty(value = "内审人独立签字") + private String reviewerSignatureUrl; + @ApiModelProperty(value = "审核签字任务状态 dispatched 下发，non_dispatched 未下发 , completed 已完成", example = "non_dispatched") + private String reviewerSignatureTaskStatus; @ApiModelProperty(value = "过程控制结论编码：1通过 2退回", example = "1") private Integer resultCode; @ApiModelProperty(value = "过程控制结论名称：通过/退回", example = "通过") diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalProcessControlSaveCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalProcessControlSaveCmd.java index f8ce7d6..72ced17 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalProcessControlSaveCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalProcessControlSaveCmd.java @@ -140,6 +140,10 @@ public class EvalProcessControlSaveCmd { private String draftId; private String reviewerPersonnelId; private String reviewerName; + @ApiModelProperty(value = "内审人独立签字") + private String reviewerSignatureUrl; + @ApiModelProperty(value = "审核签字任务状态 dispatched 下发，non_dispatched 未下发 , completed 已完成", example = "non_dispatched") + private String reviewerSignatureTaskStatus; @ApiModelProperty(value = "过程控制结论编码：1通过 2退回", example = "1") private Integer resultCode; @ApiModelProperty(value = "过程控制结论名称：通过/退回", example = "通过") diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/EvalProcessControlEntity.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/EvalProcessControlEntity.java index 6a7899c..37f4547 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/EvalProcessControlEntity.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/EvalProcessControlEntity.java @@ -12,6 +12,10 @@ public class EvalProcessControlEntity { private Long projectId; private Long controllerPersonnelId; private String controllerName; + /** 内审人独立签字 */ + private String reviewerSignatureUrl; + /** 审核签字任务状态 dispatched 下发，non_dispatched 未下发 , completed 已完成 */ + private String reviewerSignatureTaskStatus; private Integer precheckPassFlag; private Integer resultCode; private String resultName; diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/EvalProcessControlDO.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/EvalProcessControlDO.java index 2b8ee02..9c2304b 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/EvalProcessControlDO.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/EvalProcessControlDO.java @@ -13,6 +13,10 @@ public class EvalProcessControlDO { private Long projectId; private Long controllerPersonnelId; private String controllerName; + /** 内审人独立签字 */ + private String reviewerSignatureUrl; + /** 审核签字任务状态 dispatched 下发，non_dispatched 未下发 , completed 已完成 */ + private String reviewerSignatureTaskStatus; /** 前7节点是否全部完成：1是 2否，示例：2 */ private Integer precheckPassFlag; /** 过程控制结论编码：1通过 2退回，示例：1 */