blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
guoyujie
2025-08-08 9cf6783836fcee8afd5519b7bde82e10eadec4df 
 north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java


@@ -165,15 +165,15 @@


        }






        List<Map<String, Integer>> getRowCount = orderProcessDetailMapper.getGlassLRow(orderId);


        List<Map<String, Object>> getRowCount = orderProcessDetailMapper.getGlassLRow(orderId);


        List<Map<String, Integer>> rowCount = new ArrayList<>();


        columns.forEach(col -> {


            getRowCount.forEach(row -> {


                Map<String, Integer> getRow = new HashMap<>();


                // { row: 0, col: 1, rowspan: 3, colspan: 0},


                getRow.put("row",  row.get("RowNum"));


                getRow.put("row", ((Number) row.get("RowNum")).intValue());


                getRow.put("col", col);


                getRow.put("rowspan", row.get("rowCount"));


                getRow.put("rowspan", ((Number) row.get("rowCount")).intValue());


                getRow.put("colspan", 0);


                rowCount.add(getRow);


            });


@@ -389,15 +389,15 @@


        map.put("title", uniqueList);






        List<Map<String, Integer>> getRowCount = orderProcessDetailMapper.getGlassLRow(orderId);


        List<Map<String, Object>> getRowCount = orderProcessDetailMapper.getGlassLRow(orderId);


        List<Map<String, Integer>> rowCount = new ArrayList<>();


        columns.forEach(col -> {


            getRowCount.forEach(row -> {


                Map<String, Integer> getRow = new HashMap<>();


                // { row: 0, col: 1, rowspan: 3, colspan: 0},


                getRow.put("row", row.get("RowNum"));


                getRow.put("row", ((Number) row.get("RowNum")).intValue());


                getRow.put("col", col);


                getRow.put("rowspan", row.get("rowCount"));


                getRow.put("rowspan", ((Number) row.get("rowCount")).intValue());


                getRow.put("colspan", 0);


                rowCount.add(getRow);


            });


@@ -775,6 +775,10 @@


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


        //获取表格内容数据


        List<Map<String, String>> dataList = reportMapper.processCardProgressCollectMp(orderId);


        //获取表头工序筛选数据


        List<Map<String, String>> uniqueList = orderProcessDetailMapper.filterOrderProcess(orderId);




        map.put("title", uniqueList);


        return  null;


    }


}