BUG 修复

mailbox-lan/src/main/java/com/biutag/lan/service/MailService.java

@@ -134,11 +134,11 @@ public class MailService extends ServiceImpl<MailMapper, Mail> {
         if (Objects.nonNull(flow)) {
             FlowNode flowNode = flow.getFlowNode();
             int limitedTime = flowNode.getLimitedTime().intValue();
-            if (Objects.nonNull(mail.getExtensionFlag()) && mail.getExtensionFlag()) {
-                limitedTime += mail.getExtensionDays() * 24 * 60 * 60;
-            }
             // 剩余时间
             long flowRemainingTime = holidayService.getFlowRemainingTime(limitedTime, mail.getFlowLimitedLastHandlerTime(), mail.getExtensionFlag(), mail.getExtensionDays());
+            if (Objects.nonNull(mail.getExtensionFlag()) && mail.getExtensionFlag()) {
+                limitedTime += mail.getExtensionDays() * 86400;
+            }
             // 剩余时间百分比
             int flowRemainingTimePercentage = flowRemainingTime <= 0 ? 0 :
                     Long.valueOf(flowRemainingTime * 100 / limitedTime).intValue();

mailbox-lan/src/main/resources/mapper/WorkMapper.xml

@@ -54,7 +54,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     m.mail_category ,m.mail_level,m.three_dept_id,m.three_dept_name,m.flow_key,m.flow_before_name,m.mail_labels,m.flow_name,m.current_operator,
                     m.flow_limited_last_handler_time,m.second_dept_id,m.mail_first_category,m.mail_second_category,m.mail_three_category,
                     f.limited_time,m.flow_limited_last_handler_time,m.extension_flag,
-                    m.extension_days
+                    m.extension_days,
+                    w.create_time
                     from mail m
                 </when>
                 <otherwise>
@@ -68,7 +69,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                         a.mail_state,a.mail_category,a.mail_level,a.three_dept_id,a.three_dept_name,a.flow_key,a.flow_before_name,
                         a.mail_labels,a.flow_name,a.current_operator,a.flow_limited_last_handler_time,a.second_dept_id,a.mail_first_category,
                         a.mail_second_category,a.mail_three_category,a.flow_limited_last_handler_time,a.extension_flag,
-                        a.extension_days
+                        a.extension_days,
+                        ms.create_time
                     FROM
                         mail_source ms
                     LEFT JOIN mail a ON ms.id = a.id
@@ -88,7 +90,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                         ma.appeal_state,ma.handling_dept,ma.step,
                         f.limited_time,m.flow_limited_last_handler_time,
                         m.extension_flag,
-                        m.extension_days
+                        m.extension_days,
+                        w.create_time
         from mail m
                  left join mail_appeal ma on ma.mail_id = m.id
                  left join mail_mark mm on mm.mail_id = m.id