refactor(ca): 优化付款账户相关页面和报表

- 修改 addPaymentAccount 页面中"账号"标签为"账户"
- 在 PayAccountInfoMapper 中添加 accountNumber 字段映射
- 更新 PayAccountInfoServiceImpl 中导出报表的列顺序和名称
- 修改 paymentAccount 页面中"账号"列标题为"账户"

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.writeCellValue(3,1,"备注");
-        writer.setColumnWidth(3, 10);
+        writer.setColumnWidth(3, 35);
-        writer.writeCellValue(4,1,"操作时间");
+        writer.writeCellValue(4,1,"操作人");
-        writer.setColumnWidth(4, 25);
+        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(2, 2 + i, list.get(i).getAccountNumber()==null?"":list.get(i).getAccountNumber());
-            writer.writeCellValue(3, 2 + i, list.get(i).getCzyName()==null?"":list.get(i).getCzyName());
+            writer.writeCellValue(3, 2 + i, list.get(i).getRemarks()==null?"":list.get(i).getRemarks());
-            writer.writeCellValue(4, 2 + i, list.get(i).getCzsj()==null?"":list.get(i).getCzsj());
+            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");

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

src/main/resources/static/pages/finance/addPaymentAccount.html

@@ -26,7 +26,7 @@
         </div>
 
         <div class="layui-input-inline"style="float: left;width: 50%;margin-top: 2%;margin-left: 20%" >
-            <label class="layui-form-label" style="width: 30%">账号:</label>
+            <label class="layui-form-label" style="width: 30%">账户:</label>
             <div class="layui-input-block">
                 <input style="width: 85%" type="text" name="accountNumber" id="accountNumber" maxlength="50"  lay-verify="required" class="layui-input">
             </div>

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);
                     }
                 }