Merge branch 'master' of http://bore.pub:10439/r/ERP_override

guoyujie

2025-07-18 6661232f32135d943c76197afba2baac81e171f4

 north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java

@@ -581,9 +581,14 @@
        return reportMapper.exportTeamOutputMp(date,process,laminating);
    }

    public Map<String, Object> workInProgressCombinationSv(Integer pageNum, Integer pageSize, String selectProcesses, String optionVal, WorkInProgressDTO workInProgressDTO) {
    public Map<String, Object> workInProgressCombinationSv(Integer pageNum, Integer pageSize,String orderId, String inputProject, String selectProcesses, String optionVal, WorkInProgressDTO workInProgressDTO) {
        Integer offset = (pageNum - 1) * pageSize;

        if ("null".equals(orderId)) {
            orderId = "";
        }
        if ("null".equals(inputProject)) {
            inputProject = "";
        }
        if ("null".equals(optionVal)) {
            optionVal = ("");
        }
@@ -591,16 +596,12 @@
            selectProcesses="";
        }
        Map<String, Object> map = new HashMap<>();
        List<WorkInProgressDTO> dataList2  =reportMapper.workInProgressCombinationMpdataList2(offset, pageSize, selectProcesses, workInProgressDTO);

            //没有选择分组
            //map.put("data", reportMapper.workInProgressMp(offset, pageSize, orderId, inputProject, selectProcesses, workInProgressDTO));
            List<WorkInProgressDTO> dataList1  =reportMapper.workInProgressCombinationMpdataList1(offset, pageSize,  selectProcesses, workInProgressDTO);
        List<WorkInProgressDTO> dataList2  =reportMapper.workInProgressMpdataList2(offset, pageSize,orderId, inputProject, selectProcesses, workInProgressDTO);
            List<WorkInProgressDTO> dataList1  =reportMapper.workInProgressMpdataList1(offset, pageSize,orderId, inputProject,  selectProcesses, workInProgressDTO);
            mergeTeamsGroupsName(dataList1, dataList2);
            map.put("data",dataList1);
            //map.put("total", reportMapper.workInProgressTotal(offset, pageSize, orderId, inputProject, selectProcesses, workInProgressDTO));
            map.put("total" ,reportMapper.workInProgressCombinationOrderFootSum(offset, pageSize, selectProcesses, workInProgressDTO));

           // map.put("total" ,reportMapper.workInProgressCombinationOrderFootSum(offset, pageSize,orderId, inputProject, selectProcesses, workInProgressDTO));
        map.put("total" ,reportMapper.workInProgressOrderFootSum(offset, pageSize,orderId, inputProject, selectProcesses, workInProgressDTO));

        map.put("process", productionSchedulingMapper.selectProcess());
        return map;