Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyujie

2025-08-06 c18fecddd8c9a165c6a1026c5573f864e1713718

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

@@ -20,6 +20,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;

import java.lang.reflect.Field;
import java.math.BigDecimal;
import java.sql.Date;
import java.time.LocalDate;
@@ -222,6 +223,7 @@
                Map<String, String> data = JSON.parseObject(dataList.get(i).get("reportWorkQuantity"),
                        new TypeReference<Map<String, String>>() {
                        });

                for (String key : clos.keySet()) {
                    if(data.get(key) != null){
                       Integer max = orderGlassDetailMapper
@@ -297,6 +299,7 @@
        if (selectProcesses.equals("全部")){
            selectProcesses="";
        }
        String laminating = reportMapper.getLaminating(selectProcesses);
        Map<String, Object> map = new HashMap<>();
        List<WorkInProgressDTO> dataList2  =reportMapper.workInProgressMpdataList2(offset, pageSize, orderId, inputProject, selectProcesses, workInProgressDTO);
        if (optionVal.equals("1")){
@@ -321,7 +324,7 @@
        } else {
            //没有选择分组
            //map.put("data", reportMapper.workInProgressMp(offset, pageSize, orderId, inputProject, selectProcesses, workInProgressDTO));
            List<WorkInProgressDTO> dataList1  =reportMapper.workInProgressMpdataList1(offset, pageSize, orderId, inputProject, selectProcesses, workInProgressDTO);
            List<WorkInProgressDTO> dataList1  =reportMapper.workInProgressMpdataList1(offset, pageSize, orderId, inputProject, selectProcesses,laminating, workInProgressDTO);
            mergeTeamsGroupsName(dataList1, dataList2);
            map.put("data",dataList1);
            //map.put("total", reportMapper.workInProgressTotal(offset, pageSize, orderId, inputProject, selectProcesses, workInProgressDTO));
@@ -647,7 +650,25 @@
            process="";
        }
        String laminating = reportMapper.getLaminating(process);
        return reportMapper.exportTeamOutputMp(date,process,laminating);
        List<TeamOutputDTO> list = reportMapper.exportTeamOutputMp(date, process, laminating);

        // 清洗每个 TeamOutputDTO 实例的 String 字段（去除前后空格）
        for (TeamOutputDTO dto : list) {
            for (Field field : dto.getClass().getDeclaredFields()) {
                field.setAccessible(true);
                try {
                    Object value = field.get(dto);
                    if (value instanceof String) {
                        String trimmed = ((String) value).trim();
                        field.set(dto, trimmed);
                    }
                } catch (IllegalAccessException e) {
                    e.printStackTrace();
                }
            }
        }

        return list;
    }

    public Map<String, Object> workInProgressCombinationSv(
@@ -788,4 +809,11 @@

        return resultList;
    }

    public Object processCardProgressCollectSv(String orderId, List<Integer> columns) {
        Map<String, Object> map = new HashMap<>();
        //获取表格内容数据
        List<Map<String, String>> dataList = reportMapper.processCardProgressCollectMp(orderId);
        return  null;
    }
}