whycq0520
2022-03-24 228baf7c1c851ee8eba6d4da1e3f459f4d6a98e0
src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
@@ -64,16 +64,6 @@
        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");
        return R.ok(projectPlanService.selectPage(new Page<>(curr, limit), wrapper));
    }
@@ -305,6 +295,11 @@
            itemsDTO.setId(item.getName());
            itemsDTO.setStartDay(item.getStartTime$());
            itemsDTO.setEndDay(item.getEndTime$());
            itemsDTO.setPresaleAmt(item.getPresaleAmt());
            itemsDTO.setPlandeAmt(item.getPlandeAmt());
            itemsDTO.setRealdeAmt(item.getRealdeAmt());
            itemsDTO.setPlaninAmt(item.getPlaninAmt());
            itemsDTO.setRealinAmt(item.getRealinAmt());
            List<ProjectPlan> allPlans = projectPlanService.selectList(new EntityWrapper<ProjectPlan>()
                    .eq("item_id", item.getId()));
            for (ProjectPlan projectPlan : allPlans) {