楚江ERP:规格变更-打印模板修改

@@ -29,6 +29,8 @@ import com.lframework.starter.common.utils.CollectionUtil;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -41,8 +43,7 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.time.format.DateTimeFormatter;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -160,76 +161,244 @@ public class OrderChangeRecordController extends DefaultBaseController {
     public void printOrderSpecChangeRecord(@NotBlank(message = "id不能为空") String id, HttpServletResponse response) {
         OrderInfoChangeRecord data = orderChangeRecordService.findById(id);
         if (data == null) {
-           throw new DefaultClientException("规格变更记录不存在！");
+            throw new DefaultClientException("规格变更记录不存在！");
         }
-        // 加载模板文件
+
         ClassPathResource templateResource = new ClassPathResource("templates/orderSpecChangeTemplate.xlsx");
         try (InputStream inputStream = templateResource.getStream();
-                Workbook workbook = new XSSFWorkbook(inputStream)) {
-            // 设置响应头
-            ResponseUtil.setExcelResponseHead(response, data.getOrderNo() + "-订货单变更记录.xlsx");
+             Workbook workbook = new XSSFWorkbook(inputStream)) {
 
+            ResponseUtil.setExcelResponseHead(response, data.getOrderNo() + "-订货单变更记录.xlsx");
             Sheet sheet = workbook.getSheetAt(0);
-            // 规格变更开始行
-            int startRow = 5;
+
             DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+
+            // 获取变更前后数据
             List<PurchaseOrderLine> beforeChangeSpecList = data.getBeforeChangeSpecList();
             List<PurchaseOrderLine> afterChangeSpecList = data.getAfterChangeSpecList();
-            // 取最大数据行
-            int dataLine = Math.max(beforeChangeSpecList.size(), afterChangeSpecList.size());
-            for (int i = startRow + 1; i < startRow + dataLine; i++) {
-                ExcelUtil.copyRow(workbook, sheet, startRow, i);
+
+            updateWithChangeInfo(beforeChangeSpecList, afterChangeSpecList);
+
+            // 过滤需要显示的变更前记录（DELETE 或 UPDATE 且有变化）
+            List<PurchaseOrderLine> beforeLines = beforeChangeSpecList.stream()
+                    .filter(line -> "DELETE".equals(line.getType()) ||
+                            ("UPDATE".equals(line.getType()) &&
+                                    (line.getBrandChange() || line.getLengthChange() || line.getWidthChange() ||
+                                            line.getThicknessChange() || line.getStatusChange() ||
+                                            line.getQuantityChange() || line.getSalesPriceChange())))
+                    .collect(Collectors.toList());
+
+            // 过滤需要显示的变更后记录（ADD 或 UPDATE 且有变化）
+            List<PurchaseOrderLine> afterLines = afterChangeSpecList.stream()
+                    .filter(line -> "ADD".equals(line.getType()) ||
+                            ("UPDATE".equals(line.getType()) &&
+                                    (line.getBrandChange() || line.getLengthChange() || line.getWidthChange() ||
+                                            line.getThicknessChange() || line.getStatusChange() ||
+                                            line.getQuantityChange() || line.getSalesPriceChange())))
+                    .collect(Collectors.toList());
+
+            // ========== 填充变更前区域（起始行：6）==========
+            // ========== 填充变更前区域 ==========
+            int beforeStartRow = 5;
+            int beforeRowCount = Math.max(beforeLines.size(), 1);
+            for (int i = beforeStartRow + 1; i < beforeStartRow + beforeRowCount; i++) {
+                ExcelUtil.copyRow(workbook, sheet, beforeStartRow, i);
             }
-            for (int i = 0; i < dataLine; i++) {
-                PurchaseOrderLine beforeOrderLine = (i + 1) <= beforeChangeSpecList.size() ? beforeChangeSpecList.get(i) : null;
-                PurchaseOrderLine afterOrderLine = (i + 1) <= afterChangeSpecList.size() ? afterChangeSpecList.get(i) : null;
-                // 变更前数据填充
-                if (beforeOrderLine != null ) {
-                    ExcelUtil.setCellValue(sheet, startRow, 0, beforeOrderLine.getBrand());
-                    ExcelUtil.setCellValue(sheet, startRow, 1, beforeOrderLine.getThickness());
-                    ExcelUtil.setCellValue(sheet, startRow, 2, beforeOrderLine.getWidth());
-                    ExcelUtil.setCellValue(sheet, startRow, 3, beforeOrderLine.getLength());
-                    ExcelUtil.setCellValue(sheet, startRow, 4, beforeOrderLine.getStatus());
-                    ExcelUtil.setCellValue(sheet, startRow, 5, beforeOrderLine.getQuantity());
-                    ExcelUtil.setCellValue(sheet, startRow, 6, beforeOrderLine.getSalesPrice());
+            for (int i = 0; i < beforeRowCount; i++) {
+                PurchaseOrderLine line = i < beforeLines.size() ? beforeLines.get(i) : null;
+                int rowIdx = beforeStartRow + i;
+                if (line != null) {
+                    ExcelUtil.setCellValue(sheet, rowIdx, 0, line.getBrand());
+                    ExcelUtil.setCellValue(sheet, rowIdx, 1, line.getThickness());
+                    ExcelUtil.setCellValue(sheet, rowIdx, 2, line.getWidth());
+                    ExcelUtil.setCellValue(sheet, rowIdx, 3, line.getLength());
+                    ExcelUtil.setCellValue(sheet, rowIdx, 4, line.getStatus());
+                    ExcelUtil.setCellValue(sheet, rowIdx, 5, line.getQuantity());
+                    ExcelUtil.setCellValue(sheet, rowIdx, 6, line.getSalesPrice());
+                    ExcelUtil.setCellValue(sheet, rowIdx, 7,
+                            line.getDeliveryDate() == null ? "" : line.getDeliveryDate().format(dateFormatter));
+                } else {
+                    for (int col = 0; col <= 7; col++) {
+                        ExcelUtil.setCellValue(sheet, rowIdx, col, "");
+                    }
                 }
-                // 变更后数据填充
-                if (afterOrderLine != null) {
-                    ExcelUtil.setCellValue(sheet, startRow, 7, afterOrderLine.getBrand());
-                    ExcelUtil.setCellValue(sheet, startRow, 8, afterOrderLine.getThickness());
-                    ExcelUtil.setCellValue(sheet, startRow, 9, afterOrderLine.getWidth());
-                    ExcelUtil.setCellValue(sheet, startRow, 10, afterOrderLine.getLength());
-                    ExcelUtil.setCellValue(sheet, startRow, 11, afterOrderLine.getStatus());
-                    ExcelUtil.setCellValue(sheet, startRow, 12, afterOrderLine.getQuantity());
-                    ExcelUtil.setCellValue(sheet, startRow, 13, afterOrderLine.getSalesPrice());
+            }
+
+            // ========== 填充变更后区域 ==========
+            int afterStartRow = 9 + (beforeRowCount - 1);  //（默认第10行起始行，需要加上复制的行）
+            int afterRowCount = Math.max(afterLines.size(), 1);
+            for (int i = afterStartRow + 1; i < afterStartRow + afterRowCount; i++) {
+                ExcelUtil.copyRow(workbook, sheet, afterStartRow, i);
+            }
+            for (int i = 0; i < afterRowCount; i++) {
+                PurchaseOrderLine line = i < afterLines.size() ? afterLines.get(i) : null;
+                int rowIdx = afterStartRow + i;
+                if (line != null) {
+                    ExcelUtil.setCellValue(sheet, rowIdx, 0, line.getBrand());
+                    ExcelUtil.setCellValue(sheet, rowIdx, 1, line.getThickness());
+                    ExcelUtil.setCellValue(sheet, rowIdx, 2, line.getWidth());
+                    ExcelUtil.setCellValue(sheet, rowIdx, 3, line.getLength());
+                    ExcelUtil.setCellValue(sheet, rowIdx, 4, line.getStatus());
+                    ExcelUtil.setCellValue(sheet, rowIdx, 5, line.getQuantity());
+                    ExcelUtil.setCellValue(sheet, rowIdx, 6, line.getSalesPrice());
+                    ExcelUtil.setCellValue(sheet, rowIdx, 7,
+                            line.getDeliveryDate() == null ? "" : line.getDeliveryDate().format(dateFormatter));
+                } else {
+                    for (int col = 0; col <= 7; col++) {
+                        ExcelUtil.setCellValue(sheet, rowIdx, col, "");
+                    }
                 }
-                startRow++;
             }
-            Map<String, Object> dataMap = JsonUtil.parseMap(JsonUtil.toJsonString(data), String.class, Object.class);
+
+            // ========== 填充顶部固定字段 ==========
+            Map<String, Object> dataMap = new HashMap<>();
+            dataMap.put("orderingUnitName", StringUtils.defaultString(data.getOrderingUnitName()));
+            dataMap.put("orderNo", StringUtils.defaultString(data.getOrderNo()));
             dataMap.put("orderDate", data.getOrderDate() == null ? "" : data.getOrderDate().format(dateFormatter));
-            dataMap.put("createTime", data.getCreateTime().format(dateFormatter));
-            // 供货单位
+            dataMap.put("createTime", data.getCreateTime() == null ? "" : data.getCreateTime().format(dateFormatter));
+            dataMap.put("createBy", StringUtils.defaultString(data.getCreateBy()));
+            dataMap.put("changeDescription", StringUtils.defaultString(data.getChangeDescription()));
+
             String supplyUnit = data.getSupplyUnit();
-            if (StringUtils.isNotBlank(supplyUnit)) {
-                if ("GJ".equals(supplyUnit)) {
-                    dataMap.put("supplyUnit", "安徽楚江高精铜带有限公司");
-                } else if ("XC".equals(supplyUnit)) {
-                    dataMap.put("supplyUnit", "安徽楚江科技新材料股份有限公司");
-                }
+            if ("GJ".equals(supplyUnit)) {
+                dataMap.put("supplyUnit", "安徽楚江高精铜带有限公司");
+            } else if ("XC".equals(supplyUnit)) {
+                dataMap.put("supplyUnit", "安徽楚江科技新材料股份有限公司");
+            } else {
+                dataMap.put("supplyUnit", StringUtils.defaultString(supplyUnit));
             }
+
             ExcelUtil.processTemplate(workbook, dataMap);
-            // 写入响应流
+
+            // 输出
             workbook.write(response.getOutputStream());
             response.getOutputStream().flush();
-        } catch (FileNotFoundException e) {
-            log.error("订货单变更模版打印失败: ", e);
-            throw new DefaultClientException("模板文件不存在: templates/orderSpecChangeTemplate.xlsx");
-        } catch (IOException e) {
-            log.error("订货单变更模版打印失败: ", e);
-            throw new DefaultClientException("无法读取模板文件: templates/orderSpecChangeTemplate.xlsx");
+
         } catch (Exception e) {
-            log.error("订货单变更模版打印失败: ", e);
-            throw new DefaultClientException(e.getMessage());
+            log.error("规格变更打印失败", e);
+            throw new DefaultClientException("打印失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 完善两个核心人员列表中的 type 和 xxxChange 字段
+     * 不增删对象，仅完善字段
+     *
+     * @param beforeChangeSpecList 变更前列表（会被完善字段）
+     * @param afterChangeSpecList  变更后列表（会被完善字段）
+     */
+    public void updateWithChangeInfo(
+            List<PurchaseOrderLine> beforeChangeSpecList,
+            List<PurchaseOrderLine> afterChangeSpecList) {
+
+        // 允许 null 输入
+        if (beforeChangeSpecList == null) beforeChangeSpecList = new ArrayList<>();
+        if (afterChangeSpecList == null) afterChangeSpecList = new ArrayList<>();
+
+        // 构建 Map<id, obj> 便于快速查找
+        Map<String, PurchaseOrderLine> beforeMap = toMapBefore(beforeChangeSpecList);
+        Map<String, PurchaseOrderLine> afterMap = toMapAfter(afterChangeSpecList);
+
+        // === 1. 处理变更前列表：判断是 DELETE 还是 UPDATE ===
+        for (PurchaseOrderLine beforeItem : beforeChangeSpecList) {
+            String id = beforeItem.getId();
+            PurchaseOrderLine afterItem = afterMap.get(id);
+
+            if (afterItem == null) {
+                // 只在 before 中存在 → 删除
+                beforeItem.setType("DELETE");
+                setAllChangeFields(beforeItem, false); // 删除时字段无变化
+            } else {
+                // 在前后都存在 → 修改
+                beforeItem.setType("UPDATE");
+                // 比较字段，设置 change 标志
+                compareAndSetChanges(beforeItem, beforeItem, afterItem);
+            }
+        }
+
+        // === 2. 处理变更后列表：判断是 ADD 还是 UPDATE ===
+        for (PurchaseOrderLine afterItem : afterChangeSpecList) {
+            String id = afterItem.getAfterId();
+            PurchaseOrderLine beforeItem = beforeMap.get(id);
+
+            if (beforeItem == null) {
+                // 只在 after 中存在 → 新增
+                afterItem.setType("ADD");
+                setAllChangeFields(afterItem, false); // 新增时字段视为“未变”（或可设 true）
+            } else {
+                // 在前后都存在 → 修改
+                afterItem.setType("UPDATE");
+                // 比较字段，设置 change 标志
+                compareAndSetChanges(afterItem, beforeItem, afterItem);
+            }
         }
     }
+
+    // 辅助方法：转为 Map<id, entity>
+    private Map<String, PurchaseOrderLine> toMapBefore(List<PurchaseOrderLine> list) {
+        Map<String, PurchaseOrderLine> map = new HashMap<>();
+        for (PurchaseOrderLine obj : list) {
+            if (obj != null && obj.getId() != null) {
+                map.put(obj.getId(), obj);
+            }
+        }
+        return map;
+    }
+
+    // 辅助方法：转为 Map<id, entity>
+    private Map<String, PurchaseOrderLine> toMapAfter(List<PurchaseOrderLine> list) {
+        Map<String, PurchaseOrderLine> map = new HashMap<>();
+        for (PurchaseOrderLine obj : list) {
+            if (obj != null) {
+                if (obj.getAfterId() != null) {
+                    map.put(obj.getAfterId(), obj);
+                } else {
+                    map.put(obj.getId(), obj);
+                }
+            }
+        }
+        return map;
+    }
+
+    // 辅助方法：设置所有 change 字段
+    private void setAllChangeFields(PurchaseOrderLine item, boolean value) {
+        if (item == null) return;
+        item.setBrandChange(value);
+        item.setThicknessChange(value);
+        item.setWidthChange(value);
+        item.setLengthChange(value);
+        item.setStatusChange(value);
+        item.setQuantityChange(value);
+        item.setSalesPriceChange(value);
+    }
+
+    /**
+     * 比较 before 和 after，将变化的字段在 target 上设为 true
+     */
+    private void compareAndSetChanges(
+            PurchaseOrderLine target,
+            PurchaseOrderLine before,
+            PurchaseOrderLine after) {
+
+        if (target == null || before == null || after == null) return;
+
+        target.setBrandChange(!Objects.equals(before.getBrand(), after.getBrand()));
+        target.setThicknessChange(before.getThickness() != null && after.getThickness() != null
+                ? before.getThickness().compareTo(after.getThickness()) != 0
+                : !Objects.equals(before.getThickness(), after.getThickness()));
+        target.setWidthChange(before.getWidth() != null && after.getWidth() != null
+                ? before.getWidth().compareTo(after.getWidth()) != 0
+                : !Objects.equals(before.getWidth(), after.getWidth()));
+        target.setLengthChange(before.getLength() != null && after.getLength() != null
+                ? before.getLength().compareTo(after.getLength()) != 0
+                : !Objects.equals(before.getLength(), after.getLength()));
+        target.setStatusChange(!Objects.equals(before.getStatus(), after.getStatus()));
+        target.setQuantityChange(before.getQuantity() != null && after.getQuantity() != null
+                ? before.getQuantity().compareTo(after.getQuantity()) != 0
+                : !Objects.equals(before.getQuantity(), after.getQuantity()));
+        target.setSalesPriceChange(before.getSalesPrice() != null && after.getSalesPrice() != null
+                ? before.getSalesPrice().compareTo(after.getSalesPrice()) != 0
+                : !Objects.equals(before.getSalesPrice(), after.getSalesPrice()));
+    }
+
 }