111

src/main/java/com/chinaitop/depot/qualityControl/mapper/BusinessQcQualityInspectionMapper.xml

@@ -866,6 +866,7 @@
       bqq.id,
       bqq.jylb,
       bqq.jysj,
+      bbq.zjbgdh,
       bqq.basic_storehouse_id,
       Bs.storehouse_name ,
       bqq.warehouse_id,

src/main/java/com/chinaitop/depot/storage/mapper/GrainSituationCardMapper.xml

@@ -469,6 +469,7 @@
   </select>
   <select id="selectByGrainsituationId"  resultMap="BaseResultMap1">
     SELECT
+      cc.id,
       cc.out_quantity,cc.design_capacity,
       Bs.storehouse_name ,cc.basic_storehouse_id,bua.ajmc,cc.basic_unit_aisle_id,bw.warehouse_name,cc.warehouse_id,
       cc.storehouse_type,cflx.enumname as "storehouseTypeName",

src/main/java/com/chinaitop/depot/storage/service/impl/GrainSituationCardServiceImpl.java

@@ -158,6 +158,7 @@ public class GrainSituationCardServiceImpl implements GrainSituationCardService
         List<BusinessQcQualityInspection> businessQcQualityInspectionList = new ArrayList<>();
         List<BusinessQcQualityInspection> bqqs =new ArrayList<>();
         BusinessQcQualityInspection businessQcQualityInspection=new BusinessQcQualityInspection();
+        Map<Integer, List<String>> date =new HashMap<>();
         if(grainSituationCardVO.getCheckRecordIds()!=null) {
             String[] ids = grainSituationCardVO.getCheckRecordIds().split(",");
             for (int i = 0; i < ids.length; i++) {
@@ -165,17 +166,17 @@ public class GrainSituationCardServiceImpl implements GrainSituationCardService
                 businessQcQualityInspection=  businessQcQualityInspectionMapper.findByqualityId(ids[i]);
                 //查询质检明细
                 List<Map<String,Object>> itm =businessQcQualityInspectionItemMapper.findByqualityId(ids[i]);
-                Map<Integer, List<String>> transformedData =    cat(itm);
+                date =    cat(itm);
 
 
-                businessQcQualityInspection.setMaps(transformedData);
+                businessQcQualityInspection.setMaps(date);
                 businessQcQualityInspectionList.add(businessQcQualityInspection);
             }
         }
         String fileName = "D:\\Temp\\aaa.xlsx";
         List<GrainSituationCardVO> data=new ArrayList<>();
         data.add(grainSituationCardVO);
-        ExcelExporter.exportToExcel(data,grainSituationCardWarehouseRecordList,businessQcQualityInspectionList,fileName);
+        ExcelExporter.exportToExcel(data,grainSituationCardWarehouseRecordList,businessQcQualityInspectionList,date,fileName);
 
 
         return null;

src/main/java/com/chinaitop/depot/storage/utils/ExcelExporter.java

@@ -14,13 +14,12 @@ import java.lang.reflect.Field;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
 
 public class ExcelExporter {
 
 
-        public static void exportToExcel(List<GrainSituationCardVO> data, List<GrainSituationCardWarehouseRecord> records,List<BusinessQcQualityInspection> bq, String fileName) throws IOException{
+        public static void exportToExcel(List<GrainSituationCardVO> data, List<GrainSituationCardWarehouseRecord> records, List<BusinessQcQualityInspection> bq, Map<Integer, List<String>> jsonData, String fileName) throws IOException{
             XSSFWorkbook workbook = new XSSFWorkbook();
             XSSFSheet sheet = workbook.createSheet("原粮专卡");
 
@@ -148,33 +147,42 @@ public class ExcelExporter {
 
 
             rowIndex++; // 新增一行作为质量检验的表头行
+            headerRow.createCell(0).setCellValue("质检报告单号");
+            headerRow.createCell(1).setCellValue("检验时间");
             columnIndex = 0; // 重置列索引
             for (String field : getFieldss()) {
                 Cell cell = sheet.createRow(rowIndex).createCell(columnIndex++);
                 cell.setCellValue(field);
                 cell.setCellStyle(headerCellStyle);
             }
-           // DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+//            // 填充数据
+//            int rowNum = 1;
+//            for (Map<String, Object> record : jsonData) {
+//                Row row = sheet.createRow(rowNum++);
+//                row.createCell(0).setCellValue((String) record.get("zjbgdh"));
+//                row.createCell(1).setCellValue((String) record.get("jysj"));
+//
+//                // 填充动态检验项目值
+//                Map<String, Object> maps = (Map<String, Object>) record.get("maps");
+//                if (maps != null) {
+//                    List<String> items = (List<String>) maps.get(record.get("id").toString());
+//                    if (items != null) {
+//                        int col = 2; // 从第2列开始填充动态数据
+//                        for (String item : allInspectionItems) {
+//                            String value = "";
+//                            for (String checkItem : items) {
+//                                if (checkItem.startsWith(item + ":")) {
+//                                    value = checkItem.split(": ")[1];
+//                                    break;
+//                                }
+//                            }
+//                        }
+//                        row.createCell(col++).setCellValue(value);
+//                    }
+//                }
+//            }
+//        }
 
-            for (BusinessQcQualityInspection bqq : bq) {
-                if (bqq == null) {
-                    continue; // 如果bqq是null，直接跳过当前循环迭代
-                }
-                rowIndex++; // 新增一行作为质量检验的表头行
-                columnIndex = 0;
-                Row row = sheet.createRow(rowIndex++);
-
-                for (String field : getFieldss()) {
-                    Cell cell = row.createCell(columnIndex++);
-                    if ("检验类型".equals(field)){
-                        cell.setCellValue(bqq.getJylb() != null ? bqq.getJylb() : "无");
-                    } else if(("质检报告单号".equals(field))){
-                        cell.setCellValue(bqq.getZbjgpd()!= null ? bqq.getZbjgpd() : "无");
-                    } else if (bqq.getInspectionItemName().equals(field)) {
-                        cell.setCellValue(bqq.getInspectionValue() != null ? bqq.getInspectionValue() : "无");
-                    }
-                }
-            }