流程阶段筛选功能实现

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

@@ -0,0 +1,38 @@
+package com.biutag.lan.controller.system;
+
+import com.biutag.aop.NotPower;
+import com.biutag.core.AjaxResult;
+import com.biutag.lan.domain.FlowNode;
+import com.biutag.lan.domain.vo.FlowNodeVo;
+import com.biutag.lan.service.FlowNodeService;
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RestController
+@RequestMapping("api/system/flowNode")
+@Api(tags = "流程节点获取")
+@RequiredArgsConstructor
+public class FlowNodeController {
+    private final FlowNodeService flowNodeService;
+
+    @NotPower
+    @GetMapping("/list")
+    public AjaxResult<List<FlowNodeVo>> list() {
+        List<FlowNode> list = flowNodeService.list();
+        List<FlowNodeVo> result = new ArrayList<>();
+        for (FlowNode flowNode : list) {
+            FlowNodeVo flowNodeVo = new FlowNodeVo();
+            flowNodeVo.setKey(flowNode.getKey());
+            flowNodeVo.setName(flowNode.getBeforeName());
+            flowNodeVo.setFullName(flowNode.getFullName());
+            result.add(flowNodeVo);
+        }
+        return AjaxResult.success(result);
+    }
+}

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

@@ -0,0 +1,12 @@
+package com.biutag.lan.domain.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class FlowNodeVo {
+    private String key;
+    private String name;
+    private String fullName;
+}

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

@@ -350,8 +350,12 @@ public class WorkService extends ServiceImpl<WorkMapper, Work> {
                 .le(StrUtil.isNotBlank(mailQuery.getMailTimeStartEnd()), "TO_CHAR(m.mail_time, 'YYYY-MM-DD')", mailQuery.getMailTimeStartEnd())
                 .eq(StrUtil.isNotBlank(mailQuery.getSource()), "m.source", mailQuery.getSource())
                 .eq(StrUtil.isNotBlank(mailQuery.getMailLevel()), "m.mail_level", mailQuery.getMailLevel())
-                .eq(StrUtil.isNotBlank(mailQuery.getMailState()), "m.mail_state", mailQuery.getMailState())
-                .eq(StrUtil.isNotBlank(mailQuery.getFlowKey()), "m.flow_key", mailQuery.getFlowKey());
+                .eq(StrUtil.isNotBlank(mailQuery.getMailState()), "m.mail_state", mailQuery.getMailState());
+        if (StrUtil.isNotBlank(mailQuery.getFlowKey())) {
+            // 使用 StrUtil 或其他工具类将字符串拆分为列表
+            List<String> flowKeyList = StrUtil.split(mailQuery.getFlowKey(), ',', true, true);
+            queryWrapper.in("m.flow_key", flowKeyList);
+        }
         mailCategorySearch(mailQuery, queryWrapper);
         deptSearch(mailQuery, queryWrapper);
         if (StrUtil.isNotBlank(mailQuery.getMailLabels())) {
@@ -455,8 +459,8 @@ public class WorkService extends ServiceImpl<WorkMapper, Work> {
                 .eq(StrUtil.isNotBlank(mailQuery.getSource()), "m.source", mailQuery.getSource())
                 .eq(StrUtil.isNotBlank(mailQuery.getMailLevel()), "m.mail_level", mailQuery.getMailLevel())
                 .nested(i ->
-                        i.eq("m.satisfaction_status", "不满意")
-                                .or().eq("m.verify_feedback", "不满意")
+                        i.nested(q -> q.eq("m.satisfaction_status", "不满意")
+                                        .or().eq("m.verify_feedback", "不满意"))
                                 .or().apply("m.id = ma.mail_id")
                 );
         mailCategorySearch(mailQuery, queryWrapper);
@@ -514,19 +518,13 @@ public class WorkService extends ServiceImpl<WorkMapper, Work> {
         } else if (roleId.equals(RoleEnum.SECOND_DEPT_LEADER.getRoleId()) || roleId.equals(RoleEnum.SECOND_DEPT_CLASSES.getRoleId())) {
             //数据,领导只能看到自己管辖的部门
             Integer deptId = AdminThreadLocal.getDeptId();
-            queryWrapper.and(i ->
-                    i.eq("m.second_dept_id", deptId)
-            );
+            queryWrapper.eq("m.second_dept_id", deptId);
         } else if (roleId.equals(RoleEnum.THREE_DEPT_LEADER.getRoleId()) || roleId.equals(RoleEnum.THREE_DEPT_CLASSES.getRoleId())) {
             Integer deptId = AdminThreadLocal.getDeptId();
-            queryWrapper.and(i ->
-                    i.eq("m.three_dept_id", deptId)
-            );
+            queryWrapper.eq("m.three_dept_id", deptId);
         } else {
             String empNo = AdminThreadLocal.getEmpNo();
-            queryWrapper.and(i ->
-                    i.eq("w.police_emp_no", empNo)
-            );
+            queryWrapper.eq("w.police_emp_no", empNo);
         }
     }