diff --git a/src/main/java/com/bonus/boot/manager/ca/bm/service/impl/PrepaymentServiceImpl.java b/src/main/java/com/bonus/boot/manager/ca/bm/service/impl/PrepaymentServiceImpl.java index 6865b3e..4163ea4 100644 --- a/src/main/java/com/bonus/boot/manager/ca/bm/service/impl/PrepaymentServiceImpl.java +++ b/src/main/java/com/bonus/boot/manager/ca/bm/service/impl/PrepaymentServiceImpl.java @@ -168,10 +168,15 @@ public class PrepaymentServiceImpl implements PrepaymentService { start = end + 1; } // 导出标题 - ExcelWriter writer = cn.hutool.poi.excel.ExcelUtil.getWriter("工程预付款统计"); +// ExcelWriter writer = cn.hutool.poi.excel.ExcelUtil.getWriter("工程预付款统计"); + // 修改为： + ExcelWriter writer = cn.hutool.poi.excel.ExcelUtil.getWriter(); + writer.renameSheet(0, "工程预付款统计"); // 设置第一个工作表名称 // writer.setSheet("工程预付款统计"); - writer.merge(13, fileName,false); +// writer.merge(13, fileName,false); + // 修改为明确指定行列范围 + writer.merge(0, 0, 0, 13, fileName, false); // 合并二级表头 writer.writeCellValue(0,1,"序号"); @@ -235,9 +240,13 @@ public class PrepaymentServiceImpl implements PrepaymentService { // 创建第二个工作表 List list2=dao.getOperationsList(params,1,1000000); - writer.setSheet("各月增减明细"); - writer.merge(11, "各月增减明细",false); - + writer.setSheet(1); // 切换到第二个工作表（索引从0开始） + writer.renameSheet(1, "各月增减明细"); + writer.merge(0, 0, 0, 11, "各月增减明细", false); +// writer.setSheet("各月增减明细"); +// writer.merge(11, "各月增减明细",false); + // 修改为明确指定行列范围 +// writer.merge(0, 0, 0, 11, "各月增减明细", false); // 合并二级表头 writer.writeCellValue(0,1,"序号"); writer.setColumnWidth(0, 8); @@ -348,7 +357,8 @@ public class PrepaymentServiceImpl implements PrepaymentService { } // 导出标题 ExcelWriter writer = cn.hutool.poi.excel.ExcelUtil.getWriter(true); - writer.merge(11, fileName,false); +// writer.merge(11, fileName,false); + writer.merge(0, 0, 0, 11, fileName, false); // 原来是 writer.merge(11, fileName,false); // 合并二级表头 writer.writeCellValue(0,1,"序号"); diff --git a/src/main/java/com/bonus/boot/manager/manager/service/impl/UserServiceImpl.java b/src/main/java/com/bonus/boot/manager/manager/service/impl/UserServiceImpl.java index a74e9dc..3870f7a 100644 --- a/src/main/java/com/bonus/boot/manager/manager/service/impl/UserServiceImpl.java +++ b/src/main/java/com/bonus/boot/manager/manager/service/impl/UserServiceImpl.java @@ -3,6 +3,7 @@ package com.bonus.boot.manager.manager.service.impl; import java.util.List; import com.bonus.boot.manager.manager.dao.UtilDao; +import com.bonus.boot.manager.manager.utils.AESCBCUtils; import com.bonus.boot.manager.manager.utils.UserUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -87,7 +88,17 @@ public class UserServiceImpl implements UserService { @Override public List getMsgList(SysUser o) { - return userDao.getMsgList(o); + List list = userDao.getMsgList(o); + if (list.size() > 0) { + for (SysUser sysUser : list) { + try { + sysUser.setPhone(AESCBCUtils.encrypt(sysUser.getPhone())); + } catch (Exception e) { + e.printStackTrace(); + } + } + } + return list; } @Override diff --git a/src/main/resources/mappers/ca/PrepaymentMapper.xml b/src/main/resources/mappers/ca/PrepaymentMapper.xml index 5702241..ad18fb3 100644 --- a/src/main/resources/mappers/ca/PrepaymentMapper.xml +++ b/src/main/resources/mappers/ca/PrepaymentMapper.xml @@ -156,7 +156,7 @@ bm.updated_time as updatedTime, GREATEST(PERIOD_DIFF(DATE_FORMAT(CURDATE(), '%Y%m'), DATE_FORMAT(bm.first_payment_date, '%Y%m')) + 1, 1) AS agingMonths, - (SELECT SUM(current_balance) FROM bm_project_prepayment WHERE bm.is_active = '1') as totalActiveBalance, + (SELECT SUM(current_balance) FROM bm_project_prepayment WHERE is_active = '1') as totalActiveBalance, CASE WHEN bm.current_balance = 0 THEN 0 ELSE 1 diff --git a/src/main/resources/static/js/prepayment/proForm.js b/src/main/resources/static/js/prepayment/proForm.js index 973299d..8825b07 100644 --- a/src/main/resources/static/js/prepayment/proForm.js +++ b/src/main/resources/static/js/prepayment/proForm.js @@ -31,10 +31,19 @@ layui.use(['table', 'form', 'laydate'], function(){ {field: 'updatedTime', title: '数据更新时间', width: 260, align: 'center', rowspan: 2}, // {field: 'operation', title: '操作', width: 220, align: 'center', fixed: 'right', rowspan: 2} { field: 'operation', title: '操作', width: 220, align: 'center', fixed: 'right', rowspan: 2, templet: function (d) { - if (d.LAY_INDEX === 0) { - return `修改 删除`; - } else { + // 获取表格数据总数 + var tableData = table.cache.menuTable || []; + var totalCount = tableData.length; + // 如果只有一条数据，禁止所有操作 + if (totalCount <= 1) { return `禁止操作`; + } else { + // 多条数据时，第一行禁止操作，其他行可以操作 + if (d.LAY_INDEX === 0) { + return `禁止操作`; + } else { + return `修改 删除`; + } } }} ], diff --git a/src/main/resources/static/js/work/basic/UserManagementList.js b/src/main/resources/static/js/work/basic/UserManagementList.js index acd5b30..05854df 100644 --- a/src/main/resources/static/js/work/basic/UserManagementList.js +++ b/src/main/resources/static/js/work/basic/UserManagementList.js @@ -14,7 +14,15 @@ layui.use(['table', 'layer', 'laydate', 'jquery', 'form'], function () { , cols: [[ //表头 {field: 'number', width:100,title: '序号', align: 'center', type: 'numbers'} , {field: 'username',width:200, align: 'center', title: '用户名'} - , {field: 'phone', width: 150, align: 'center', title: '手机号'} + , {field: 'phone', width: 150, align: 'center', title: '手机号', + templet: function (d) { + if (d.phone != null && d.phone != "") { + return decryptCBC(d.phone) + } else { + return ""; + } + } + } , {field: 'department', width: 220, align: 'center', title: '部门/岗位'} , {field: 'roleName', width: 200, align: 'center', title: '角色'} , {field: 'updTime', width: 200, align: 'center', title: '操作时间'} diff --git a/src/main/resources/static/pages/user/UserManagementList.html b/src/main/resources/static/pages/user/UserManagementList.html index 0caab40..2f0b48e 100644 --- a/src/main/resources/static/pages/user/UserManagementList.html +++ b/src/main/resources/static/pages/user/UserManagementList.html @@ -97,6 +97,7 @@ +