blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
廖井涛
2025-07-03 ec37ee18e2467fbde0eeb1539dcdb846f48ad59f 
 north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java


@@ -9,11 +9,18 @@


import com.example.erp.mapper.pp.ProductionSchedulingMapper;


import com.example.erp.mapper.pp.ReportMapper;


import com.example.erp.mapper.sd.OrderProcessDetailMapper;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.context.annotation.Bean;


import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;


import org.springframework.stereotype.Service;


import org.springframework.util.StringUtils;




import java.sql.Date;


import java.time.LocalDate;


import java.util.*;


import java.util.concurrent.Executor;


import java.util.function.Function;


import java.util.stream.Collectors;




@Service


@DS("pp")


@@ -22,6 +29,34 @@




    private final OrderProcessDetailMapper orderProcessDetailMapper;


    private final ProductionSchedulingMapper productionSchedulingMapper;






    private void mergeTeamsGroupsName(


            List<WorkInProgressDTO> dataList1,


            List<WorkInProgressDTO> dataList2


    ) {


        Function<WorkInProgressDTO, String> keyFn = dto ->


                dto.getProcessId() + "|" +


                        dto.getOrderNumber() + "|" +


                        dto.getTechnologyNumber();




        Map<String, WorkInProgressDTO> map2 = dataList2.stream()


                .collect(Collectors.toMap(


                        keyFn,


                        Function.identity(),


                        (existing, replacement) -> existing


                ));




        for (WorkInProgressDTO dto1 : dataList1) {


            WorkInProgressDTO dto2 = map2.get(keyFn.apply(dto1));


            if (dto2 != null) {


                String tgn = dto2.getTeamsGroupsName();


                if (StringUtils.hasText(tgn)) {


                    dto1.setTeamsGroupsName(tgn);


                }


            }


        }


    }






    public ReportService(ReportMapper reportMapper, OrderProcessDetailMapper orderProcessDetailMapper, ProductionSchedulingMapper productionSchedulingMapper) {


@@ -140,22 +175,33 @@


        }




        Map<String, Object> map = new HashMap<>();


        List<WorkInProgressDTO> dataList2  =reportMapper.workInProgressMpdataList2(offset, pageSize, orderId, inputProject, selectProcesses, workInProgressDTO);




        if (optionVal.equals("1")){


            /* 根据销售单号汇总*/


            map.put("data", reportMapper.workInProgressOrderMp(offset, pageSize, orderId, inputProject, selectProcesses, workInProgressDTO));


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


            //map.put("data", reportMapper.workInProgressOrderMp(offset, pageSize, orderId, inputProject, selectProcesses, workInProgressDTO));


            List<WorkInProgressDTO> dataList1  =reportMapper.workInProgressOrderMpList1(offset, pageSize, orderId, inputProject, selectProcesses, workInProgressDTO);


            mergeTeamsGroupsName(dataList1, dataList2);


            map.put("data",dataList1);


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


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


        }else if(optionVal.equals("2")){


            /* 根流程卡号汇总*/


            map.put("data", reportMapper.workInProgressProcessMp(offset, pageSize, orderId, inputProject, selectProcesses, workInProgressDTO));


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


            /* 根据流程卡号汇总*/


            //map.put("data", reportMapper.workInProgressProcessMp(offset, pageSize, orderId, inputProject, selectProcesses, workInProgressDTO));


            List<WorkInProgressDTO> dataList1  =reportMapper.workInProgressProcessMpList1(offset, pageSize, orderId, inputProject, selectProcesses, workInProgressDTO);


            mergeTeamsGroupsName(dataList1, dataList2);


            map.put("data",dataList1);


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


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




        } else if (optionVal.equals("3")) {




        } else {


            //没有选择分组


            map.put("data", reportMapper.workInProgressMp(offset, pageSize, orderId, inputProject, selectProcesses, workInProgressDTO));


            //map.put("data", reportMapper.workInProgressMp(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.workInProgressOrderFootSum(offset, pageSize,orderId, inputProject, selectProcesses, workInProgressDTO));