Merge branch 'zypms' of http://47.97.1.152:5880/r/wms_saas into zypms

wang..123

2022-03-25 f3ed1f9e98e13b9fb631e2fab851be15b7dde206

 src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java

@@ -46,9 +46,12 @@
                  @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.equals("0")){
        if (target != null && !target.equals("0")){
            wrapper.eq("item_id",target);
        }else{
            List<Item> items = itemService.selectList(new EntityWrapper<Item>()
@@ -62,11 +65,6 @@
        convert(param, wrapper);

        wrapper.orderBy("item_id");


//        if (!Cools.isEmpty(orderByField)) {
//            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
//        }
        return R.ok(projectPlanService.selectPage(new Page<>(curr, limit), wrapper));
    }

@@ -94,6 +92,7 @@
        if (!Cools.isEmpty(checkExist)) {
            throw new CoolException("权重值冲突,请检查");
        }

        FlowStatus id = flowStatusService.selectOne(new EntityWrapper<FlowStatus>()
                .eq("id", projectPlan.getFlowId()));
        if (!Cools.isEmpty(id)) {
@@ -113,6 +112,10 @@

        if (Cools.isEmpty(projectPlan) || null == projectPlan.getId()) {
            return R.error();
        }

        if (projectPlan.getDelay() < 0){
            throw new CoolException("延期天数不可为负数");
        }

        projectPlan.setModifyTime(new Date());
@@ -284,24 +287,51 @@
        List<Item> items = itemService.selectList(new EntityWrapper<Item>()
                .eq("status","1"));
        List<ItemsDTO> itemsDTOs = new ArrayList<>();
        for (Item item : items) {
            ItemsDTO itemsDTO = new ItemsDTO();

        for (Item item : items) {

            ItemsDTO itemsDTO = new ItemsDTO();
            List<FlowsDTO> flows = new ArrayList<>();
            itemsDTO.setId(item.getName());
            itemsDTO.setStartDay(item.getStartTime());
            itemsDTO.setEndDay(item.getEndTime());
            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) {
                projectPlan.setFlowName(projectPlan.getFlowId$());
                FlowsDTO flowsDTO = new FlowsDTO();
                flowsDTO.setName(projectPlan.getFlowId$());
                flowsDTO.setStartTime(projectPlan.getStartTime$());
                flowsDTO.setEndTime$(projectPlan.getEndTime$());
                flowsDTO.setRealStartTime$(projectPlan.getRealStartTime$());
                flowsDTO.setRealEndTime$(projectPlan.getRealEndTime$());
                flows.add(flowsDTO);
            }

            itemsDTO.setNodes(allPlans);
            itemsDTO.setNodes(flows);
            itemsDTOs.add(itemsDTO);
        }
        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);
    }

}