信件查询和不满意信件流程节点显示修改

mailbox-lan/src/main/java/com/biutag/lan/controller/system/MailLabelController.java

@@ -30,6 +30,14 @@ public class MailLabelController {
         return AjaxResult.success(mailLabelVOList);
     }
 
+    @NotPower
+    @GetMapping("/detail")
+    @ApiOperation(value="已选信件标签")
+    public AjaxResult<List<MailLabelVO>> checked(@RequestBody String mailId) {
+        List<MailLabelVO> mailLabelVOList = iMailLabelService.checkedLabels(mailId);
+        return AjaxResult.success(mailLabelVOList);
+    }
+
     @NotPower
     @PostMapping("/add")
     @ApiOperation(value="信件标签新增")

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

@@ -78,7 +78,7 @@ public class QueryMailVo {
      * 信件当前流程节点
      */
     @ExcelProperty("流程节点")
-    private String flowBeforeName;
+    private String flowName;
 
     /**
      * 当前流程剩余多少时间（秒）

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

@@ -13,4 +13,6 @@ public interface IMailLabelService {
     AjaxResult<Void> addLabel(MailLabelValidate mailLabel);
 
     void insertLabel(MailLabelInsertValidate mailLabel);
+
+    List<MailLabelVO> checkedLabels(String mailId);
 }

mailbox-lan/src/main/java/com/biutag/lan/service/impl/MailLabelServiceImpl.java

@@ -66,4 +66,19 @@ public class MailLabelServiceImpl implements IMailLabelService {
         mail.setMailLabels(mailLabel.getLabelName());
         mailMapper.updateById(mail);
     }
+
+    @Override
+    public List<MailLabelVO> checkedLabels(String mailId) {
+        Mail mail = mailMapper.selectById(mailId);
+        String[] labels = mail.getMailLabels().split(",");
+        List<MailLabelVO> result = new ArrayList<>();
+        for (String label : labels) {
+            MailLabel mailLabel = mailLabelMapper.selectOne(new QueryWrapper<MailLabel>().eq("id", label));
+            MailLabelVO mailLabelVO = new MailLabelVO();
+            mailLabelVO.setId(mailLabel.getId());
+            mailLabelVO.setLabelName(mailLabel.getLabelName());
+            result.add(mailLabelVO);
+        }
+        return result;
+    }
 }

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

@@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectQueryPage" resultType="com.biutag.lan.domain.vo.QueryMailVo">
         select distinct m.contact_name,m.contact_phone,m.contact_id_card,m.contact_sex,m.content,m.source,m.mail_time,m.id,m.mail_state,
-               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.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,
                f.limited_time - ROUND(EXTRACT(EPOCH FROM (CURRENT_TIMESTAMP - m.flow_limited_last_handler_time))) flow_limited_remaining_time
         from mail m
             left join work w on m.id = w.mail_id