diff --git a/src/main/java/com/xujie/modules/inspection/entity/SrmInspectRequestFeeEntity.java b/src/main/java/com/xujie/modules/inspection/entity/SrmInspectRequestFeeEntity.java index 34da388..7a7554b 100644 --- a/src/main/java/com/xujie/modules/inspection/entity/SrmInspectRequestFeeEntity.java +++ b/src/main/java/com/xujie/modules/inspection/entity/SrmInspectRequestFeeEntity.java @@ -1,5 +1,6 @@ package com.xujie.modules.inspection.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; @@ -17,6 +18,26 @@ public class SrmInspectRequestFeeEntity { private String requestNo; + /** + * 供应商编码(关联申请单头表带出,非物理列) + */ + @TableField(exist = false) + private String supplierNo; + + /** + * 实际验货日期(关联申请单头表带出,非物理列) + */ + @TableField(exist = false) + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date inspectDate; + + /** + * 供应商名称(关联 srm_supplier 查询,非物理列) + */ + @TableField(exist = false) + private String supplierName; + private String createBy; @DateTimeFormat(pattern = "yyyy-MM-dd") diff --git a/src/main/java/com/xujie/modules/inspection/expense/support/ExpenseWorkbookWriter.java b/src/main/java/com/xujie/modules/inspection/expense/support/ExpenseWorkbookWriter.java index 2e98c75..befb1ce 100644 --- a/src/main/java/com/xujie/modules/inspection/expense/support/ExpenseWorkbookWriter.java +++ b/src/main/java/com/xujie/modules/inspection/expense/support/ExpenseWorkbookWriter.java @@ -120,34 +120,46 @@ public class ExpenseWorkbookWriter { // 原模板合并表头内部有残留出租车文字及 SUM(E4:F4),应清空隐藏子单元格 - rqrq。 cell(routes, 3, 4).setBlank(); cell(routes, 3, 7).setBlank(); + // 第二页列布局调整:费用类型移到 B 列,出发地/到达地顺次后移,里程列删除(金额列左移到 G) - rqrq。表头在 row 2。 + text(routes, 2, 1, "Expense Type\n费用类型"); + text(routes, 2, 2, "From\n出发地"); + text(routes, 2, 3, "To\n到达地"); + text(routes, 2, 6, "Sub-total\n小计"); + routes.setColumnWidth(1, 5600); + cell(routes, 3, 6).setBlank(); + cell(routes, 2, 7).setBlank(); CellStyle date = style(workbook, cell(routes, 4, 0).getCellStyle(), "yyyy-mm-dd"); CellStyle tripMoney = style(workbook, cell(routes, 4, 7).getCellStyle(), "#,##0.00"); - CellStyle mileage = style(workbook, cell(routes, 4, 6).getCellStyle(), "0.##"); for (int i = 0; i < tripRows; i++) { int row = 4 + i; cell(routes, row, 0).setCellStyle(date); - cell(routes, row, 7).setCellStyle(tripMoney); - cell(routes, row, 6).setCellStyle(mileage); + cell(routes, row, 6).setCellStyle(tripMoney); + cell(routes, row, 7).setBlank(); if (i >= trips.size()) { continue; } ExpenseTrip t = trips.get(i); cell(routes, row, 0).setCellValue(t.getTripDate()); - text(routes, row, 1, t.getStartPlace()); - text(routes, row, 2, t.getEndPlace()); - text(routes, row, 3, t.getExpenseDesc()); + text(routes, row, 1, t.getExpenseDesc()); + text(routes, row, 2, t.getStartPlace()); + text(routes, row, 3, t.getEndPlace()); text(routes, row, 4, t.getVehicle()); number(routes, row, 5, t.getBillCount()); - decimal(routes, row, 6, t.getMileage()); - decimal(routes, row, 7, ExpenseReportServiceImpl.amount(t.getAmount(), "行程金额")); + decimal(routes, row, 6, ExpenseReportServiceImpl.amount(t.getAmount(), "行程金额")); routes.getRow(row).setHeightInPoints(Math.max(30, 14 * Math.max((t.getExpenseDesc().length() + 19) / 20, (Math.max(t.getStartPlace().length(), t.getEndPlace().length()) + 9) / 10))); } - cell(routes, tripTotal, 7).setCellFormula(dynamicSum("H", 5)); - cell(routes, tripTotal, 7).setCellStyle(tripMoney); + cell(routes, tripTotal, 6).setCellFormula(dynamicSum("G", 5)); + cell(routes, tripTotal, 6).setCellStyle(tripMoney); + cell(routes, tripTotal, 7).setBlank(); text(routes, tripTotal + 3, 6, headers.get(0).getApplyUserName()); - print(workbook, routes, 1, 7, tripTotal + 3, 2, 3); + print(workbook, routes, 1, 6, tripTotal + 3, 2, 3); + // 清除 H 列残留边框(模板原金额列样式带有边框) - rqrq。 + CellStyle noBorder = workbook.createCellStyle(); + for (int row = 0; row <= tripTotal + 3; row++) { + cell(routes, row, 7).setCellStyle(noBorder); + } // 4) 常规公式后端算缓存,并保留公式供 Excel/WPS 打开及手工改动后重算 - rqrq。 workbook.getCreationHelper().createFormulaEvaluator().evaluateAll(); diff --git a/src/main/resources/mapper/inspection/SrmFeeMapper.xml b/src/main/resources/mapper/inspection/SrmFeeMapper.xml index 21a1e7b..e2b3d86 100644 --- a/src/main/resources/mapper/inspection/SrmFeeMapper.xml +++ b/src/main/resources/mapper/inspection/SrmFeeMapper.xml @@ -36,6 +36,9 @@ + + + @@ -153,12 +156,18 @@ WHERE site = #{site} AND fee_no = #{feeNo} AND item_no = #{itemNo} - +