feat: plan type query

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysImplementPlanController.java

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.tree.Tree;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qunzhixinxi.hnqz.admin.api.constant.UpmsState;
+import com.qunzhixinxi.hnqz.admin.api.constant.UpmsType;
 import com.qunzhixinxi.hnqz.admin.api.dto.SysImplementPlanDTO;
 import com.qunzhixinxi.hnqz.admin.api.dto.SysImplementPlanDetailsDTO;
 import com.qunzhixinxi.hnqz.admin.api.vo.SysImplementPlanVO;
@@ -104,8 +105,9 @@ public class SysImplementPlanController {
     }
 
     @GetMapping(value = "/plan/list")
-    public R<List<SysImplementPlanVO.ToList>> listPlans(@RequestParam(value = "planState", required = false, defaultValue = "PASSED") UpmsState.ImplementPlanState planState) {
-        return R.ok(implementPlanManager.listPlans(planState, SecurityUtils.getUser()));
+    public R<List<SysImplementPlanVO.ToList>> listPlans(@RequestParam(value = "planType", required = false) UpmsType.ImplementPlanType planType,
+                                                        @RequestParam(value = "planState", required = false, defaultValue = "PASSED") UpmsState.ImplementPlanState planState) {
+        return R.ok(implementPlanManager.listPlans(planState, planType, SecurityUtils.getUser()));
     }
 
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/SysImplementPlanManager.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qunzhixinxi.hnqz.admin.api.constant.UpmsState;
+import com.qunzhixinxi.hnqz.admin.api.constant.UpmsType;
 import com.qunzhixinxi.hnqz.admin.api.dto.SysImplementPlanDTO;
 import com.qunzhixinxi.hnqz.admin.api.dto.SysImplementPlanDetailsDTO;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
@@ -426,11 +427,12 @@ public class SysImplementPlanManager {
         return detailsMap;
     }
 
-    public List<SysImplementPlanVO.ToList> listPlans(UpmsState.ImplementPlanState planState, HnqzUser user) {
+    public List<SysImplementPlanVO.ToList> listPlans(UpmsState.ImplementPlanState planState, UpmsType.ImplementPlanType planType, HnqzUser user) {
 
         Integer entId = user.getDeptId();
         List<SysImplementPlan> plans = implementPlanService.list(Wrappers.<SysImplementPlan>lambdaQuery()
                 .eq(SysImplementPlan::getConsignorId, entId)
+                .eq(Objects.nonNull(planType), SysImplementPlan::getPlanType, planType)
                 .eq(SysImplementPlan::getPlanState, planState));