From 81fe799c38b8e6b435d623ff927c7fed46c14d61 Mon Sep 17 00:00:00 2001 From: luotaiqian <1147642922@qq.com> Date: Thu, 13 Aug 2026 17:43:05 +0800 Subject: [PATCH] job --- docs/db/init.sql | 2 +- .../db/sync/20260729_prod_update_part1_create_tables.sql | 2 +- .../20260813_eval_process_control_rename_status_name.sql | 9 +++++++++ .../app/executor/institution/EvalSignTaskExecutor.java | 3 +++ .../domain/entity/EvalProcessControlEntity.java | 3 ++- .../infrastructure/dataobject/EvalProcessControlDO.java | 4 ++-- 6 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 docs/sql/20260813_eval_process_control_rename_status_name.sql diff --git a/docs/db/init.sql b/docs/db/init.sql index 2430d144..c89a127b 100644 --- a/docs/db/init.sql +++ b/docs/db/init.sql @@ -229,7 +229,7 @@ create table eval_process_control handover_form_status varchar(32) default 'not_create' null comment '归档交接单状态(not_create未生成,created已生成)', control_time datetime null comment '办理时间', status_code int null comment '节点状态(1未开始2进行中3已完成4退回)', - status_name varchar(50) null comment '节点状态名称', + controller_personnel_sign_time datetime null comment '过控负责人签字时间', delete_enum varchar(32) null comment '删除标识true false', remarks varchar(255) null comment '备注', create_name varchar(50) null comment '创建人姓名', diff --git a/docs/db/sync/20260729_prod_update_part1_create_tables.sql b/docs/db/sync/20260729_prod_update_part1_create_tables.sql index cdfca79c..2d078f04 100644 --- a/docs/db/sync/20260729_prod_update_part1_create_tables.sql +++ b/docs/db/sync/20260729_prod_update_part1_create_tables.sql @@ -495,7 +495,7 @@ CREATE TABLE IF NOT EXISTS `eval_process_control` ( `handover_form_status` varchar(32) DEFAULT 'not_create' COMMENT '归档交接单状态(not_create未生成,created已生成)', `control_time` datetime DEFAULT NULL COMMENT '办理时间', `status_code` int DEFAULT NULL COMMENT '节点状态(1未开始2进行中3已完成4退回)', - `status_name` varchar(50) DEFAULT NULL COMMENT '节点状态名称', + `controller_personnel_sign_time` datetime DEFAULT NULL COMMENT '过控负责人签字时间', `delete_enum` varchar(32) DEFAULT NULL COMMENT '删除标识true false', `remarks` varchar(255) DEFAULT NULL COMMENT '备注', `create_name` varchar(50) DEFAULT NULL COMMENT '创建人姓名', diff --git a/docs/sql/20260813_eval_process_control_rename_status_name.sql b/docs/sql/20260813_eval_process_control_rename_status_name.sql new file mode 100644 index 00000000..cd7f905e --- /dev/null +++ b/docs/sql/20260813_eval_process_control_rename_status_name.sql @@ -0,0 +1,9 @@ +-- ===================================================================== +-- 变更说明: +-- eval_process_control 表将 status_name(节点状态名称, varchar(50)) +-- 修改为 controller_personnel_sign_time(过控负责人签字时间, datetime) +-- 变更时间: 2026-08-13 +-- ===================================================================== + +ALTER TABLE `eval_process_control` + CHANGE COLUMN `status_name` `controller_personnel_sign_time` datetime NULL COMMENT '过控负责人签字时间'; diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalSignTaskExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalSignTaskExecutor.java index 5f63db11..f333e397 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalSignTaskExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalSignTaskExecutor.java @@ -34,6 +34,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; +import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; import java.util.Objects; @@ -188,6 +189,7 @@ public class EvalSignTaskExecutor implements EvalSignTaskApi { .eq(EvalProcessControlDO::getId, evalSignTaskDO.getBizRefId()) .eq(EvalProcessControlDO::getProjectId, evalSignTaskDO.getProjectId()) .set(EvalProcessControlDO::getReviewerSignatureUrl, cmd.getSignerUrl()) + .set(EvalProcessControlDO::getControllerPersonnelSignTime, LocalDateTime.now()) .set(EvalProcessControlDO::getReviewerSignatureTaskStatus, SignatureTaskStatusEnum.COMPLETED.getCode())); } if (evalProcessControlDO.getReviewerSignatureTaskStatus().equals(code) @@ -196,6 +198,7 @@ public class EvalSignTaskExecutor implements EvalSignTaskApi { .eq(EvalProcessControlDO::getId, evalSignTaskDO.getBizRefId()) .eq(EvalProcessControlDO::getProjectId, evalSignTaskDO.getProjectId()) .set(EvalProcessControlDO::getOrgHeadSignatureUrl, cmd.getSignerUrl()) + .set(EvalProcessControlDO::getControlTime, LocalDateTime.now()) .set(EvalProcessControlDO::getOrgHeadSignatureTaskStatus, SignatureTaskStatusEnum.COMPLETED.getCode())); projectStageSyncService.onNodeCompleted(evalSignTaskDO.getProjectId(), ProjectStageEnum.PROCESS_CONTROL.getNode()); 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 226398ff..32f0d054 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 @@ -33,7 +33,8 @@ public class EvalProcessControlEntity { private String handoverFormStatus; private LocalDateTime controlTime; private Integer statusCode; - private String statusName; + /** 过控负责人签字时间 */ + private LocalDateTime controllerPersonnelSignTime; private String deleteEnum; private String remarks; private String createName; 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 4f714d86..2a3c07c7 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 @@ -39,8 +39,8 @@ public class EvalProcessControlDO { private LocalDateTime controlTime; /** 节点状态编码：1未开始 2进行中 3已完成 4退回，示例：2 */ private Integer statusCode; - /** 节点状态名称：未开始/进行中/已完成/退回，示例：进行中 */ - private String statusName; + /** 过控负责人签字时间 */ + private LocalDateTime controllerPersonnelSignTime; private String deleteEnum; private String remarks; private String createName;