whycq
2022-09-06 bd6095e7af86faf7ed0a5ca188775aeac7b031f2
src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
@@ -270,8 +270,17 @@
     * @return
     */
    @RequestMapping("/projectPlan/flowStatus")
    public R flowStatus(){
    public R flowStatus(
            @RequestParam(defaultValue = "1") Integer curr,
            @RequestParam(defaultValue = "10") Integer limit,
            @RequestParam(required = false) String orderByField,
            @RequestParam(required = false) String orderByType,
            @RequestParam Map<String, Object> param
    ){
        EntityWrapper<FlowStatus> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        wrapper.orderBy("weight_num");
        List<FlowStatus> flowStatuses = flowStatusService.selectList(wrapper);
@@ -283,8 +292,17 @@
     * @return
     */
    @RequestMapping("/projectPlan/toFront")
    public R toFront(){
        List<Item> items = itemService.selectList(new EntityWrapper<Item>()
    public R toFront(
            @RequestParam(defaultValue = "1") Integer curr,
            @RequestParam(defaultValue = "10") Integer limit,
            @RequestParam(required = false) String orderByField,
            @RequestParam(required = false) String orderByType,
            @RequestParam Map<String, Object> param
    ){
        EntityWrapper<Item> itemEntityWrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, itemEntityWrapper);
        List<Item> items = itemService.selectList(itemEntityWrapper
                .eq("status","1"));
        List<ItemsDTO> itemsDTOs = new ArrayList<>();
@@ -373,10 +391,12 @@
        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)));//已完工未验收数量
        data.setWrongInto(data.getTotalQuantity()-data.getIntoSum());//非集成项目数
        List<Item> list =  itemService.inspected();
        data.setInspected(list.size());//已验收项目数量
        data.setWrongInspected(data.getTotalQuantity()-data.getInspected());//未验收项目数量
        List<Item> lists =  itemService.finished();
        data.setFinished(lists.size());//已完工未验收数量
        return R.ok().add(data);
    }