From ca0886f59d593821ac6b12ef0e8fd8cf3ff29549 Mon Sep 17 00:00:00 2001 From: mrzhssss <pro6@qq.com> Date: 星期二, 06 九月 2022 09:32:14 +0800 Subject: [PATCH] # --- src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java | 24 +++++++++++++++++++++--- 1 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java b/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java index f292bf4..d108b45 100644 --- a/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java +++ b/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java @@ -270,8 +270,17 @@ * @return */ @RequestMapping("/projectPlan/flowStatus") - public R flowStatus(){ + public R flowStatus( + @RequestParam(defaultValue = "1") Integer curr, + @RequestParam(defaultValue = "10") Integer limit, + @RequestParam(required = false) String orderByField, + @RequestParam(required = false) String orderByType, + @RequestParam Map<String, Object> param + ){ + EntityWrapper<FlowStatus> wrapper = new EntityWrapper<>(); + excludeTrash(param); + convert(param, wrapper); wrapper.orderBy("weight_num"); List<FlowStatus> flowStatuses = flowStatusService.selectList(wrapper); @@ -283,8 +292,17 @@ * @return */ @RequestMapping("/projectPlan/toFront") - public R toFront(){ - List<Item> items = itemService.selectList(new EntityWrapper<Item>() + public R toFront( + @RequestParam(defaultValue = "1") Integer curr, + @RequestParam(defaultValue = "10") Integer limit, + @RequestParam(required = false) String orderByField, + @RequestParam(required = false) String orderByType, + @RequestParam Map<String, Object> param + ){ + EntityWrapper<Item> itemEntityWrapper = new EntityWrapper<>(); + excludeTrash(param); + convert(param, itemEntityWrapper); + List<Item> items = itemService.selectList(itemEntityWrapper .eq("status","1")); List<ItemsDTO> itemsDTOs = new ArrayList<>(); -- Gitblit v1.9.1