市局专班签收 查看历史信件

mailbox-lan/src/main/java/com/biutag/lan/domain/bo/MailQuery.java

@@ -76,6 +76,14 @@ public class MailQuery {
 
     private String timeout;
 
+    private String contactName;
+
+    private String contactPhone;
+
+    private String contactIdCard;
+
+    private String flowName;
+
 
     /**
      * 办结时间

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

@@ -1,8 +1,6 @@
 package com.biutag.lan.domain.vo;
 
-import com.biutag.lan.domain.FlowNode;
-import com.biutag.lan.domain.MailFlow;
-import com.biutag.lan.domain.MailReturn;
+import com.biutag.lan.domain.*;
 import com.biutag.lan.flow.Action;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
@@ -34,6 +32,11 @@ public class MailFlowDetail {
 
     private List<MailReturn> mailReturns = new ArrayList<>();
 
+    /**
+     * 历史件
+     */
+    private List<Mail> historys = new ArrayList<>();
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime now = LocalDateTime.now();
 

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

@@ -92,6 +92,8 @@ public class MailService extends ServiceImpl<MailMapper, Mail> {
         if (!mailSource.getSignFlag()) {
             flow = SpringUtil.getBean(FirstSignFlow.class);
             mail = mailSource.toMail();
+            LambdaQueryWrapper<Mail> queryWrapper = new LambdaQueryWrapper<Mail>().eq(Mail::getContactPhone, mail.getContactPhone()).eq(Mail::getContactName, mail.getContactName());
+            flowDetail.setHistorys(list(queryWrapper));
         } else {
             mail = getById(mailId);
             flow = flowNodes.stream()

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

@@ -248,6 +248,10 @@ public class WorkService extends ServiceImpl<WorkMapper, Work> {
                 .eq(StrUtil.isNotBlank(todoQuery.getMailState()), "m.mail_state", todoQuery.getMailState())
                 .like(StrUtil.isNotBlank(todoQuery.getThreeDeptName()), "m.three_dept_name", todoQuery.getThreeDeptName())
                 .eq(StrUtil.isNotBlank(todoQuery.getFlowKey()), "m.flow_key", todoQuery.getFlowKey())
+                .like(StrUtil.isNotBlank(todoQuery.getContactName()), "w.contact_name", todoQuery.getContactName())
+                .like(StrUtil.isNotBlank(todoQuery.getContactIdCard()), "w.contact_id_card", todoQuery.getContactIdCard())
+                .like(StrUtil.isNotBlank(todoQuery.getContactPhone()), "w.contact_phone", todoQuery.getContactPhone())
+                .eq(StrUtil.isNotBlank(todoQuery.getFlowName()), "w.flow_name", todoQuery.getFlowName())
                 .and(query -> {
                     query.isNull("m.flow_key").or().ne("m.flow_key", FlowNodeEnum.COMPLETION.getKey());
                 });