diff --git a/src/main/java/com/bonus/gzcar/business/backstage/controller/SupDispatchCarController.java b/src/main/java/com/bonus/gzcar/business/backstage/controller/SupDispatchCarController.java
index 9b4b08a..0f4c86e 100644
--- a/src/main/java/com/bonus/gzcar/business/backstage/controller/SupDispatchCarController.java
+++ b/src/main/java/com/bonus/gzcar/business/backstage/controller/SupDispatchCarController.java
@@ -283,7 +283,7 @@ public class SupDispatchCarController {
// 只有当detailCount > 1时才需要合并
if (detailCount > 1) {
// 合并主数据列(前10列)
- for (int col = 0; col < 10; col++) {
+ for (int col = 0; col < 11; col++) {
mergeRegions.add(new CellRangeAddress(
currentRow,
currentRow + detailCount - 1,
@@ -321,14 +321,14 @@ public class SupDispatchCarController {
CellStyle wrapTextStyle = createWrapTextStyle(workbook); // 自动换行样式
// 设置列宽(可根据实际情况调整)
- int[] columnWidths = {8, 15, 15, 10, 15, 20, 10, 10, 15, 15, 15, 15, 15, 10, 10, 10, 10};
+ int[] columnWidths = {8, 15,15, 15, 10, 15, 20, 10, 10, 15, 15, 15, 15, 15, 10, 10, 10, 10};
for (int i = 0; i < columnWidths.length; i++) {
sheet.setColumnWidth(i, columnWidths[i] * 256); // 256是一个字符的宽度单位
}
// 创建标题行
Row titleRow = sheet.createRow(0);
- String[] titles = {"序号", "工程", "计划编号", "申请人", "申请时间", "备注", "派车状态", "派车数量", "派车日期", "到货确认单",
+ String[] titles = {"序号", "供应商","工程", "计划编号", "申请人", "申请时间", "备注", "派车状态", "派车数量", "派车日期", "到货确认单",
"类型","起运地", "目的地", "使用地", "车型", "型号", "车牌"};
for (int i = 0; i < titles.length; i++) {
Cell cell = titleRow.createCell(i);
@@ -343,24 +343,25 @@ public class SupDispatchCarController {
// 主数据(前10列)
setCellValueWithStyle(row, 0, data.getXh(),dataStyle);
- setCellValueWithStyle(row, 1, data.getProName(), wrapTextStyle);
- setCellValueWithStyle(row, 2, data.getCode(), dataStyle);
- setCellValueWithStyle(row, 3, data.getUserName(), dataStyle);
- setCellValueWithStyle(row, 4, data.getAppLyTime(), dataStyle);
- setCellValueWithStyle(row, 5, data.getRemark(), wrapTextStyle);
- setCellValueWithStyle(row, 6, data.getStatusName(), dataStyle);
- setCellValueWithStyle(row, 7, data.getDispatchNum(), dataStyle);
- setCellValueWithStyle(row, 8, data.getOutTime(), dataStyle);
- setCellValueWithStyle(row, 9, data.getFileNum(), dataStyle);
+ setCellValueWithStyle(row, 1, data.getSupName(), wrapTextStyle);
+ setCellValueWithStyle(row, 2, data.getProName(), wrapTextStyle);
+ setCellValueWithStyle(row, 3, data.getCode(), dataStyle);
+ setCellValueWithStyle(row, 4, data.getUserName(), dataStyle);
+ setCellValueWithStyle(row, 5, data.getAppLyTime(), dataStyle);
+ setCellValueWithStyle(row, 6, data.getRemark(), wrapTextStyle);
+ setCellValueWithStyle(row, 7, data.getStatusName(), dataStyle);
+ setCellValueWithStyle(row, 8, data.getDispatchNum(), dataStyle);
+ setCellValueWithStyle(row, 9, data.getOutTime(), dataStyle);
+ setCellValueWithStyle(row, 10, data.getFileNum(), dataStyle);
// 详情数据(后6列)
- setCellValueWithStyle(row, 10, data.getCarType(), dataStyle);
- setCellValueWithStyle(row, 11, data.getStartAddress(), dataStyle);
- setCellValueWithStyle(row, 12, data.getEndAddress(), dataStyle);
- setCellValueWithStyle(row, 13, data.getUseAddress(), dataStyle);
- setCellValueWithStyle(row, 14, data.getName(), dataStyle);
- setCellValueWithStyle(row, 15, data.getModel(), dataStyle);
- setCellValueWithStyle(row, 16, data.getCarNumStr(), dataStyle);
+ setCellValueWithStyle(row, 11, data.getCarType(), dataStyle);
+ setCellValueWithStyle(row, 12, data.getStartAddress(), dataStyle);
+ setCellValueWithStyle(row, 13, data.getEndAddress(), dataStyle);
+ setCellValueWithStyle(row, 14, data.getUseAddress(), dataStyle);
+ setCellValueWithStyle(row, 15, data.getName(), dataStyle);
+ setCellValueWithStyle(row, 16, data.getModel(), dataStyle);
+ setCellValueWithStyle(row, 17, data.getCarNumStr(), dataStyle);
}
// 添加合并区域
diff --git a/src/main/resources/mappers/business/backstage/CarDriverMapper.xml b/src/main/resources/mappers/business/backstage/CarDriverMapper.xml
index 8356b5a..b97b2d0 100644
--- a/src/main/resources/mappers/business/backstage/CarDriverMapper.xml
+++ b/src/main/resources/mappers/business/backstage/CarDriverMapper.xml
@@ -95,8 +95,8 @@