diff --git a/mailbox-lan/src/main/java/com/biutag/lan/domain/MailSource.java b/mailbox-lan/src/main/java/com/biutag/lan/domain/MailSource.java index 0f07ffb..61928e4 100644 --- a/mailbox-lan/src/main/java/com/biutag/lan/domain/MailSource.java +++ b/mailbox-lan/src/main/java/com/biutag/lan/domain/MailSource.java @@ -103,6 +103,8 @@ public class MailSource { // 局长信箱 MAILBOX("mailbox", "XXWW", "局长信箱"), + + TZXX("厅长信箱", "TZXX", "厅长信箱"), // 110举报投诉 REPORT_COMPLAINTS("110_report_complaints", "JBTS", "110举报投诉"), // 12345市长热线 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 6fadfcc..11dc3f8 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 @@ -43,6 +43,7 @@ public class ThreeVerifyFlow extends Flow { private final IHolidayService holidayService; private final MailBlameService mailBlameService; private final MailExtensionMapper mailExtensionMapper; + private final IDictDataService dictDataService; @Override public Flow next(String nextActionKey, String mailId, JSONObject data) { @@ -232,7 +233,7 @@ public class ThreeVerifyFlow extends Flow { if (!MailSource.Source.JWPYAJDSRBMYYB.getValue().equals(mail.getSource())) { String content = String.format("您于%s通过“%s”投诉/反映的问题已办理。请您及时进行满意度评价,非常满意请回复 1 ,基本满意请回复 2 ,不满意请回复 3 。谢谢您的支持!", DatePattern.CHINESE_DATE_FORMATTER.format(mail.getMailTime()), - MailSource.Source.get(mail.getSource()).getName()); + dictDataService.getByDateTypeAndValue("mail_source", mail.getSource()).getName()); // 发送通知短信 smsService.sendNotification(mail.getContactPhone(), mail.getId(), content); } diff --git a/mailbox-lan/src/main/java/com/biutag/lan/service/impl/HolidayServiceImpl.java b/mailbox-lan/src/main/java/com/biutag/lan/service/impl/HolidayServiceImpl.java index 9658cc0..ffa725b 100644 --- a/mailbox-lan/src/main/java/com/biutag/lan/service/impl/HolidayServiceImpl.java +++ b/mailbox-lan/src/main/java/com/biutag/lan/service/impl/HolidayServiceImpl.java @@ -165,7 +165,7 @@ public class HolidayServiceImpl implements IHolidayService { return limitedTime - Duration.between(beginTime, LocalDateTime.now()).getSeconds(); } if (extensionFlag) { - return limitedTime + (extensionDays * 86400) - Duration.between(beginTime, LocalDateTime.now()).getSeconds(); + return getFlowRemainingTime(beginTime, endTime, limitedTime) + (extensionDays * 86400); } else { return getFlowRemainingTime(beginTime, endTime, limitedTime); }