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

@@ -1,6 +1,8 @@

package com.example.erp.service.pp;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.TypeReference;
import com.baomidou.dynamic.datasource.annotation.DS;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -18,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;
@@ -136,7 +139,8 @@
    public Map<String, Object> processCardProgressSv(String orderId, List<Integer> columns) {
        Map<String, Object> map = new HashMap<>();
        //获取表格内容数据
        map.put("data", reportMapper.processCardProgressMp(orderId));
        List<Map<String, String>> dataList = reportMapper.processCardProgressMp(orderId);


        //获取表头工序筛选数据
        List<Map<String, String>> processFilterList = orderProcessDetailMapper.filterOrderProcess(orderId);
@@ -180,14 +184,21 @@
            }
        }
        map.put("title", uniqueList);
        Map<String,Integer> clos = new HashMap<>();
        for (int i=0;i<uniqueList.size();i++){
            //根据流程查询基础数据
            BasicData basicData =  basicDataMapper.selectOne(
                    new QueryWrapper<BasicData>()
                            .eq("basic_category","process")
                            .eq("basic_name",uniqueList.get(i).get("process"))
                            .last("limit 1")
            );
            if(basicData!=null && (Objects.equals(basicData.getNickname(), "stepB") || (Objects.equals(basicData.getNickname(), "stepD")))){
            //判断磨边和磨边后工序
            if(Objects.equals(basicData.getNickname(), "stepA") || Objects.equals(basicData.getNickname(), "stepC")){
                clos.put(uniqueList.get(i).get("process"), 15+i);
            }
            //判断中空和中空后工序
            if(Objects.equals(basicData.getNickname(), "stepB") || Objects.equals(basicData.getNickname(), "stepD")){
                columns.add(15+i);
            }
        }
@@ -206,8 +217,47 @@
                rowCount.add(getRow);
            });
        });
        if(!clos.isEmpty()){
            //循环结果
            for (int i=0;i<dataList.size();i++ ) {
                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
                               .getMaxTechnologyNumberByGroup(dataList.get(i).get("order_id"),
                                       String.valueOf(dataList.get(i).get("order_number")),
                                       String.valueOf(dataList.get(i).get("group"))
                                       );
                       Integer min = orderGlassDetailMapper
                            .getMinTechnologyNumberByGroup(dataList.get(i).get("order_id"),
                                    String.valueOf(dataList.get(i).get("order_number")),
                                    String.valueOf(dataList.get(i).get("group"))
                       );
                       if(min == Integer.parseInt(String.valueOf(dataList.get(i).get("technology_number")))  ){
                            Map<String, Integer> getRow = new HashMap<>();
                            // { row: 0, col: 1, rowspan: 3, colspan: 0},
                            getRow.put("row", i );
                            getRow.put("col", clos.get(key));
                            getRow.put("rowspan", max-min+1);
                            getRow.put("colspan", 0);
                            rowCount.add(getRow);
                        }else{
                           data.put(key,"0");
                       }

                    }
                }
                dataList.get(i).put("reportWorkQuantity",JSON.toJSONString(data));

            }
        }



        map.put("data",dataList );
        map.put("mergeCells", rowCount);

        return map;
@@ -249,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")){
@@ -273,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));
@@ -599,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(
@@ -740,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;
    }
}