From 2f34c8db5ad1f458d6c91f0bc3cdee56649f8af7 Mon Sep 17 00:00:00 2001 From: jjLv <1981429112@qq.com> Date: Mon, 6 Jan 2025 15:55:17 +0800 Subject: [PATCH] =?UTF-8?q?refactor(ca):=20=E4=BC=98=E5=8C=96=E4=BB=98?= =?UTF-8?q?=E6=AC=BE=E8=B4=A6=E6=88=B7=E7=9B=B8=E5=85=B3=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=92=8C=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改 addPaymentAccount 页面中"账号"标签为"账户" - 在 PayAccountInfoMapper 中添加 accountNumber 字段映射 - 更新 PayAccountInfoServiceImpl 中导出报表的列顺序和名称 - 修改 paymentAccount 页面中"账号"列标题为"账户" --- .../impl/PayAccountInfoServiceImpl.java | 21 +++++++++++-------- .../mappers/ca/PayAccountInfoMapper.xml | 1 + .../pages/finance/addPaymentAccount.html | 2 +- .../static/pages/finance/paymentAccount.html | 2 +- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/bonus/boot/manager/ca/bm/service/impl/PayAccountInfoServiceImpl.java b/src/main/java/com/bonus/boot/manager/ca/bm/service/impl/PayAccountInfoServiceImpl.java index 0543ff9..434bace 100644 --- a/src/main/java/com/bonus/boot/manager/ca/bm/service/impl/PayAccountInfoServiceImpl.java +++ b/src/main/java/com/bonus/boot/manager/ca/bm/service/impl/PayAccountInfoServiceImpl.java @@ -93,27 +93,30 @@ public class PayAccountInfoServiceImpl implements PayAccountInfoService { } // 导出标题 ExcelWriter writer = cn.hutool.poi.excel.ExcelUtil.getWriter(true); - writer.merge(4, fileName,false); + writer.merge(5, fileName,false); // 合并二级表头 writer.writeCellValue(0,1,"序号"); writer.setColumnWidth(0, 8); writer.writeCellValue(1,1,"付款账户名称"); writer.setColumnWidth(1, 25); - writer.writeCellValue(2,1,"备注"); + writer.writeCellValue(2,1,"账户"); writer.setColumnWidth(2, 35); - writer.writeCellValue(3,1,"操作人"); - writer.setColumnWidth(3, 10); - writer.writeCellValue(4,1,"操作时间"); - writer.setColumnWidth(4, 25); + writer.writeCellValue(3,1,"备注"); + writer.setColumnWidth(3, 35); + writer.writeCellValue(4,1,"操作人"); + writer.setColumnWidth(4, 10); + writer.writeCellValue(5,1,"操作时间"); + writer.setColumnWidth(5, 25); // 设置表头高度、单元格宽度 writer.setRowHeight(0, 35); for (int i = 0; i < list.size(); i++) { writer.writeCellValue(0, 2 + i, i + 1); writer.writeCellValue(1, 2 + i, list.get(i).getName()==null?"":list.get(i).getName()); - writer.writeCellValue(2, 2 + i, list.get(i).getRemarks()==null?"":list.get(i).getRemarks()); - writer.writeCellValue(3, 2 + i, list.get(i).getCzyName()==null?"":list.get(i).getCzyName()); - writer.writeCellValue(4, 2 + i, list.get(i).getCzsj()==null?"":list.get(i).getCzsj()); + writer.writeCellValue(2, 2 + i, list.get(i).getAccountNumber()==null?"":list.get(i).getAccountNumber()); + writer.writeCellValue(3, 2 + i, list.get(i).getRemarks()==null?"":list.get(i).getRemarks()); + writer.writeCellValue(4, 2 + i, list.get(i).getCzyName()==null?"":list.get(i).getCzyName()); + writer.writeCellValue(5, 2 + i, list.get(i).getCzsj()==null?"":list.get(i).getCzsj()); writer.setRowHeight(2 + i, 35); } response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8"); diff --git a/src/main/resources/mappers/ca/PayAccountInfoMapper.xml b/src/main/resources/mappers/ca/PayAccountInfoMapper.xml index d5b6322..3d8dc7d 100644 --- a/src/main/resources/mappers/ca/PayAccountInfoMapper.xml +++ b/src/main/resources/mappers/ca/PayAccountInfoMapper.xml @@ -60,6 +60,7 @@ select cbpai.id, cbpai.name, + cbpai.account_number as accountNumber, cbpai.remark as remarks, su.username as czyName, cbpai.oper_time as czsj diff --git a/src/main/resources/static/pages/finance/addPaymentAccount.html b/src/main/resources/static/pages/finance/addPaymentAccount.html index 1e5974f..7296af8 100644 --- a/src/main/resources/static/pages/finance/addPaymentAccount.html +++ b/src/main/resources/static/pages/finance/addPaymentAccount.html @@ -26,7 +26,7 @@
- +
diff --git a/src/main/resources/static/pages/finance/paymentAccount.html b/src/main/resources/static/pages/finance/paymentAccount.html index 24aeeda..b921248 100644 --- a/src/main/resources/static/pages/finance/paymentAccount.html +++ b/src/main/resources/static/pages/finance/paymentAccount.html @@ -111,7 +111,7 @@ {field: 'number', width: 100, title: '序号', align: 'center', type: 'numbers'} , {field: 'name', align: 'center', title: '付款账户名称'} , { - field: 'accountNumber', align: 'center', title: '账号', templet: function (d) { + field: 'accountNumber', align: 'center', title: '账户', templet: function (d) { return maskAccountNumber(d.accountNumber); } }