From 822e2c1494257c362b11b6507b6de0bb7f9de964 Mon Sep 17 00:00:00 2001 From: whycq <whycq> Date: 星期二, 08 二月 2022 17:18:42 +0800 Subject: [PATCH] # --- src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java | 18 ++++-------------- 1 files changed, 4 insertions(+), 14 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 50d8a0f..e0baa20 100644 --- a/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java +++ b/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java @@ -46,7 +46,10 @@ @RequestParam(required = false) String orderByType, @RequestParam Map<String, Object> param) { String target = (String) param.get("items"); + String search = (String) param.get("id"); param.remove("items"); + param.remove("id"); + EntityWrapper<ProjectPlan> wrapper = new EntityWrapper<>(); if (target != null && !target.equals("0")){ wrapper.eq("item_id",target); @@ -60,21 +63,8 @@ } excludeTrash(param); convert(param, wrapper); -// HashSet<String> excludeItems = new HashSet<>(); -// excludeItems.add("id"); -// excludeItems.add("item_id"); -// excludeItems.add("weight_num"); -// excludeItems.add("create_time"); -// excludeItems.add("create_id"); -// excludeItems.add("modify_time"); -// excludeItems.add("modify_id"); -// -// allLike(ProjectPlan.class,excludeItems,wrapper, (String) param.get("id")); - wrapper.orderBy("item_id"); -// if (!Cools.isEmpty(orderByField)) { -// wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType)); -// } + wrapper.orderBy("item_id"); return R.ok(projectPlanService.selectPage(new Page<>(curr, limit), wrapper)); } -- Gitblit v1.9.1