Browse Source

fit: 新增特殊延期

master
wxc 12 months ago
parent
commit
786389c9db
  1. 18
      mailbox-lan/src/main/java/com/biutag/lan/controller/MailController.java
  2. 2
      mailbox-lan/src/main/java/com/biutag/lan/domain/vo/LedgerExcel.java
  3. 2
      mailbox-lan/src/main/java/com/biutag/lan/service/WorkService.java

18
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 cn.dev33.satoken.annotation.SaCheckPermission;
import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.biutag.aop.NotPower; import com.biutag.aop.NotPower;
import com.biutag.core.AjaxResult; import com.biutag.core.AjaxResult;
import com.biutag.lan.aop.Log; 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.MailMark;
import com.biutag.lan.domain.MailSource; import com.biutag.lan.domain.MailSource;
import com.biutag.lan.domain.bo.*; 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.DetermineMail;
import com.biutag.lan.domain.vo.MailFlowDetail; import com.biutag.lan.domain.vo.MailFlowDetail;
import com.biutag.lan.domain.vo.MailTimeoutInfo; import com.biutag.lan.domain.vo.MailTimeoutInfo;
import com.biutag.lan.service.MailMarkService; import com.biutag.lan.service.MailMarkService;
import com.biutag.lan.service.MailService; import com.biutag.lan.service.MailService;
import com.biutag.lan.service.MailSourceService; 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.Operation;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid; import jakarta.validation.Valid;
@ -170,4 +171,19 @@ public class MailController {
return AjaxResult.success(timeoutInfo); 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();
}
} }

2
mailbox-lan/src/main/java/com/biutag/lan/domain/vo/LedgerExcel.java

@ -57,7 +57,7 @@ public class LedgerExcel {
@ExcelProperty({"局长信箱即接即办工作汇总台账", "签收超时时长\n(二级机构专班)"}) @ExcelProperty({"局长信箱即接即办工作汇总台账", "签收超时时长\n(二级机构专班)"})
private String secondSignTimeoutDuration; private String secondSignTimeoutDuration;
@ExcelProperty({"局长信箱即接即办工作汇总台账", "签收超时时长\n(级机构专班)"}) @ExcelProperty({"局长信箱即接即办工作汇总台账", "签收超时时长\n(级机构专班)"})
private String threeTimeoutDuration; private String threeTimeoutDuration;
@ExcelProperty({"局长信箱即接即办工作汇总台账", "是否三十分钟内回访"}) @ExcelProperty({"局长信箱即接即办工作汇总台账", "是否三十分钟内回访"})

2
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())); 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; String secondSignFlag = secondSignTimeoutDuration <= 0 ? AppConstants.YES : AppConstants.NO;
ledgerExcel.setSecondSignTimoutFlag(secondSignFlag); ledgerExcel.setSecondSignTimoutFlag(secondSignFlag);
ledgerExcel.setSecondSignTimeoutDuration(parseTimeStr(secondSignTimeoutDuration)); ledgerExcel.setSecondSignTimeoutDuration(parseTimeStr(secondSignTimeoutDuration));

Loading…
Cancel
Save