wang..123
2022-03-25 f3ed1f9e98e13b9fb631e2fab851be15b7dde206
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));
    }
@@ -305,6 +295,12 @@
            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());
            itemsDTO.setType(item.getType());
            List<ProjectPlan> allPlans = projectPlanService.selectList(new EntityWrapper<ProjectPlan>()
                    .eq("item_id", item.getId()));
            for (ProjectPlan projectPlan : allPlans) {
@@ -322,6 +318,20 @@
        return R.ok().add(itemsDTOs);
    }
    /**
     * 项目汇总数据
     */
    @RequestMapping("/projectPlan/dataSummary")
    public R dataSummary(){
        dataSummary data = new dataSummary();
        Wrapper<Item> wrapper = new EntityWrapper<>();
        data.setTotalQuantity(itemService.selectCount(wrapper));//项目总共数量
        data.setIntoSum(itemService.selectCount(wrapper.eq("type","10")));//集成项目数
        data.setWrongInto(itemService.selectCount(wrapper.ne("type","10")));//非集成项目数
        data.setInspected(itemService.selectCount(wrapper.eq("realLADate","").and().eq("realLADate",null)));//已验收项目数量
        data.setWrongInspected(itemService.selectCount(wrapper.ne("realLADate",null)));//未验收项目数量
        data.setFinished(itemService.selectCount(wrapper.ne("realinDate", null).eq("realLADate", null)));//已完工未验收数量
        return R.ok().add(data);
    }
}