diff --git a/mailbox-lan/src/main/java/com/biutag/lan/controller/work/WorkController.java b/mailbox-lan/src/main/java/com/biutag/lan/controller/work/WorkController.java index 8e4062d..b209ebc 100644 --- a/mailbox-lan/src/main/java/com/biutag/lan/controller/work/WorkController.java +++ b/mailbox-lan/src/main/java/com/biutag/lan/controller/work/WorkController.java @@ -60,8 +60,7 @@ public class WorkController { @Log(title="信件:台账导出") @NotPower @PostMapping("exportLedger") - public void exportLedger(HttpServletResponse response, @RequestBody String data) throws IOException { - MailQuery mailQuery = JSON.parseObject(data,MailQuery.class); + public void exportLedger(HttpServletResponse response, @RequestBody MailQuery mailQuery) { workService.exportLedger(response, mailQuery); } diff --git a/mailbox-lan/src/main/java/com/biutag/lan/domain/bo/MailQuery.java b/mailbox-lan/src/main/java/com/biutag/lan/domain/bo/MailQuery.java index 44bea5c..01299c8 100644 --- a/mailbox-lan/src/main/java/com/biutag/lan/domain/bo/MailQuery.java +++ b/mailbox-lan/src/main/java/com/biutag/lan/domain/bo/MailQuery.java @@ -111,6 +111,9 @@ public class MailQuery { */ private String returnReason; + // 责任追责 + private String verifyPunish; + public List handleMailLabels() { if (mailLabels == null) { return null; 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 ce698f2..22c2995 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 @@ -78,6 +78,12 @@ public class LedgerExcel { @ExcelProperty({"局长信箱即接即办工作汇总台账", "是否属实"}) private String isTrue; + @ExcelProperty({"局长信箱即接即办工作汇总台账", "是否需要问责"}) + private String verifyNeedAccountability; + + @ExcelProperty({"局长信箱即接即办工作汇总台账", "责任追责"}) + private String verifyPunish; + @ExcelProperty({"局长信箱即接即办工作汇总台账", "办理反馈情况"}) private String verifyFeedback; 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 a808368..7dc5d71 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 @@ -404,6 +404,7 @@ public class WorkService extends ServiceImpl { .eq(Objects.nonNull(mailQuery.getSignRoleId()), "w.sign_role_id", mailQuery.getSignRoleId()) .eq(Objects.nonNull(mailQuery.getSignDeptId()), "w.sign_dept_id", mailQuery.getSignDeptId()) .eq(StrUtil.isNotBlank(mailQuery.getVerifyIsTrue()), "m.verify_is_true", mailQuery.getVerifyIsTrue()) + .like(StrUtil.isNotBlank(mailQuery.getVerifyPunish()), "m.verify_punish", mailQuery.getVerifyPunish()) .eq(Objects.nonNull(mailQuery.getVerifyNeedAccountability()), "m.verify_need_accountability", mailQuery.getVerifyNeedAccountability()) .eq(Objects.nonNull(mailQuery.getSimpleFlowFlag()), "m.simple_flow_flag", mailQuery.getSimpleFlowFlag()) .eq(Objects.nonNull(mailQuery.getExtensionFlag()), "m.extension_flag", mailQuery.getExtensionFlag()) @@ -836,6 +837,12 @@ public class WorkService extends ServiceImpl { ledgerExcel.setAppealResult(appealResult); } ledgerExcel.setIsQualify(nullToEmpty(m.getQualifiedProcessingStatus())); + if (Objects.nonNull(m.getVerifyNeedAccountability())) { + ledgerExcel.setVerifyNeedAccountability(m.getVerifyNeedAccountability() ? "是" : "否"); + } + if (StrUtil.isNotBlank(m.getVerifyPunish())) { + ledgerExcel.setVerifyPunish(String.join("、", JSON.parseArray(m.getVerifyPunish(), String.class))); + } list.add(ledgerExcel); } response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); diff --git a/mailbox-lan/src/main/resources/mapper/WorkMapper.xml b/mailbox-lan/src/main/resources/mapper/WorkMapper.xml index 7b108f9..b16bc12 100644 --- a/mailbox-lan/src/main/resources/mapper/WorkMapper.xml +++ b/mailbox-lan/src/main/resources/mapper/WorkMapper.xml @@ -72,6 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.completion_comment, ms.create_time, a.verify_is_true, + a.verify_punish, a.verify_need_accountability, a.simple_flow_flag, a.interview_is_leader,