From 786389c9db019cdb9ff7be4180dd079954dcafe2 Mon Sep 17 00:00:00 2001
From: wxc <191104855@qq.com>
Date: Fri, 6 Dec 2024 11:12:21 +0800
Subject: [PATCH] =?UTF-8?q?fit:=20=E6=96=B0=E5=A2=9E=E7=89=B9=E6=AE=8A?=
 =?UTF-8?q?=E5=BB=B6=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biutag/lan/controller/MailController.java  | 18 +++++++++++++++++-
 .../com/biutag/lan/domain/vo/LedgerExcel.java  |  2 +-
 .../com/biutag/lan/service/WorkService.java    |  2 +-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/mailbox-lan/src/main/java/com/biutag/lan/controller/MailController.java b/mailbox-lan/src/main/java/com/biutag/lan/controller/MailController.java
index f0acc69..1a677df 100644
--- a/mailbox-lan/src/main/java/com/biutag/lan/controller/MailController.java
+++ b/mailbox-lan/src/main/java/com/biutag/lan/controller/MailController.java
@@ -2,6 +2,7 @@ package com.biutag.lan.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.biutag.aop.NotPower;
 import com.biutag.core.AjaxResult;
 import com.biutag.lan.aop.Log;
@@ -9,13 +10,13 @@ import com.biutag.lan.domain.Mail;
 import com.biutag.lan.domain.MailMark;
 import com.biutag.lan.domain.MailSource;
 import com.biutag.lan.domain.bo.*;
+import com.biutag.lan.domain.validate.commons.MailIdValidate;
 import com.biutag.lan.domain.vo.DetermineMail;
 import com.biutag.lan.domain.vo.MailFlowDetail;
 import com.biutag.lan.domain.vo.MailTimeoutInfo;
 import com.biutag.lan.service.MailMarkService;
 import com.biutag.lan.service.MailService;
 import com.biutag.lan.service.MailSourceService;
-import com.biutag.lan.domain.validate.commons.MailIdValidate;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
@@ -170,4 +171,19 @@ public class MailController {
         return AjaxResult.success(timeoutInfo);
     }
 
+    @Operation(summary = "信件特殊延期")
+    @Log(title="信件特殊延期")
+    @NotPower
+    @PostMapping("{id}/extensionDays/{day}")
+    public  AjaxResult<Void> updateExtensionDays(@PathVariable("id") String id, @PathVariable("day") Integer day) {
+        Mail mail = mailService.getById(id);
+        if (!mail.getExtensionFlag()) {
+            throw new RuntimeException("该件尚未申请延期，请先申请延期才允许特殊延期");
+        }
+        mailService.update(new LambdaUpdateWrapper<Mail>()
+                .eq(Mail::getId, id)
+                .set(Mail::getExtensionDays, mail.getExtensionDays() + day));
+        return AjaxResult.success();
+    }
+
 }
diff --git a/mailbox-lan/src/main/java/com/biutag/lan/domain/vo/LedgerExcel.java b/mailbox-lan/src/main/java/com/biutag/lan/domain/vo/LedgerExcel.java
index 181c79a..ce698f2 100644
--- a/mailbox-lan/src/main/java/com/biutag/lan/domain/vo/LedgerExcel.java
+++ b/mailbox-lan/src/main/java/com/biutag/lan/domain/vo/LedgerExcel.java
@@ -57,7 +57,7 @@ public class LedgerExcel {
     @ExcelProperty({"局长信箱即接即办工作汇总台账", "签收超时时长\n（二级机构专班）"})
     private String secondSignTimeoutDuration;
 
-    @ExcelProperty({"局长信箱即接即办工作汇总台账", "签收超时时长\n（二级机构专班）"})
+    @ExcelProperty({"局长信箱即接即办工作汇总台账", "签收超时时长\n（三级机构专班）"})
     private String threeTimeoutDuration;
 
     @ExcelProperty({"局长信箱即接即办工作汇总台账", "是否三十分钟内回访"})
diff --git a/mailbox-lan/src/main/java/com/biutag/lan/service/WorkService.java b/mailbox-lan/src/main/java/com/biutag/lan/service/WorkService.java
index c3cab34..d3d7ab5 100644
--- a/mailbox-lan/src/main/java/com/biutag/lan/service/WorkService.java
+++ b/mailbox-lan/src/main/java/com/biutag/lan/service/WorkService.java
@@ -803,7 +803,7 @@ public class WorkService extends ServiceImpl<WorkMapper, Work> {
             ledgerExcel.setContent(nullToEmpty(q.getContent()));
 
             // 超时时长
-            Long secondSignTimeoutDuration = Optional.ofNullable(mailMark).map(MailMark::getThreeTimeoutDuration).orElse(0L);
+            Long secondSignTimeoutDuration = Optional.ofNullable(mailMark).map(MailMark::getSignTimeoutDuration).orElse(0L);
             String secondSignFlag = secondSignTimeoutDuration  <= 0 ? AppConstants.YES : AppConstants.NO;
             ledgerExcel.setSecondSignTimoutFlag(secondSignFlag);
             ledgerExcel.setSecondSignTimeoutDuration(parseTimeStr(secondSignTimeoutDuration));