# ycq

whycq0520

2022-03-24 03b41fa7164bb7dc5a8bd17a06cfceed43e65617

 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));
    }

@@ -317,6 +307,7 @@
                flows.add(flowsDTO);
            }
            itemsDTO.setNodes(flows);
            itemsDTO.setItems(items);
            itemsDTOs.add(itemsDTO);
        }
        return R.ok().add(itemsDTOs);