diff --git a/mailbox-lan/sql/20250917.sql b/mailbox-lan/sql/20250917.sql new file mode 100644 index 0000000..fb18367 --- /dev/null +++ b/mailbox-lan/sql/20250917.sql @@ -0,0 +1,7 @@ +ALTER TABLE "mailbox"."mail" + ADD COLUMN "three_sign_time" date, + ADD COLUMN "submit_completion_time" date; + +COMMENT ON COLUMN "mailbox"."mail"."three_sign_time" IS '所队专班签收时间'; + +COMMENT ON COLUMN "mailbox"."mail"."submit_completion_time" IS '提交办理时间'; \ No newline at end of file diff --git a/mailbox-lan/src/main/java/com/biutag/lan/domain/Mail.java b/mailbox-lan/src/main/java/com/biutag/lan/domain/Mail.java index 503bc04..87e7427 100644 --- a/mailbox-lan/src/main/java/com/biutag/lan/domain/Mail.java +++ b/mailbox-lan/src/main/java/com/biutag/lan/domain/Mail.java @@ -425,4 +425,8 @@ public class Mail { private Boolean repeat; + private LocalDateTime threeSignTime; + + private LocalDateTime submitCompletionTime; + } diff --git a/mailbox-lan/src/main/java/com/biutag/lan/flow/node/ThreeSignFlow.java b/mailbox-lan/src/main/java/com/biutag/lan/flow/node/ThreeSignFlow.java index 26a806b..37e7424 100644 --- a/mailbox-lan/src/main/java/com/biutag/lan/flow/node/ThreeSignFlow.java +++ b/mailbox-lan/src/main/java/com/biutag/lan/flow/node/ThreeSignFlow.java @@ -93,6 +93,7 @@ public class ThreeSignFlow extends Flow { .set(Mail::getFlowKey, FlowNodeEnum.SECOND_DISTRIBUTE.getKey()) .set(Mail::getFlowName, FlowNameEnum.MAIL_RETURN.getName()) .set(Mail::getFlowLimitedLastHandlerTime, now) + .set(Mail::getThreeSignTime, now) .set(Mail::getSecondDistributeTime, now); // 如果在申请延期中 if (ExtensionState.applying.name().equals(mail.getExtensionState())) { diff --git a/mailbox-lan/src/main/java/com/biutag/lan/flow/node/ThreeVerifyFlow.java b/mailbox-lan/src/main/java/com/biutag/lan/flow/node/ThreeVerifyFlow.java index 11dc3f8..5a6297d 100644 --- a/mailbox-lan/src/main/java/com/biutag/lan/flow/node/ThreeVerifyFlow.java +++ b/mailbox-lan/src/main/java/com/biutag/lan/flow/node/ThreeVerifyFlow.java @@ -198,6 +198,7 @@ public class ThreeVerifyFlow extends Flow { BeanUtil.copyProperties(source, mail, CopyOptions.create().setIgnoreNullValue(true)); mail.setUpdateTime(now) + .setSubmitCompletionTime(now) // 申请办结 .setCompleteMethod(data.getString("completeMethod")) .setFlowKey(nextNode.getFlowNode().getKey())