工程预付款统计功能bug修改,系统漏洞修复
This commit is contained in:
parent
fcfd4fe1b5
commit
6d9247831c
|
|
@ -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<OperationsBean> 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,"序号");
|
||||
|
|
|
|||
|
|
@ -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<SysUser> getMsgList(SysUser o) {
|
||||
return userDao.getMsgList(o);
|
||||
List<SysUser> 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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 `<a class="layui-btn layui-btn-xs" onclick="edit('${d.id}','${d.reverseId}')">修改</a> <a class="layui-btn layui-btn-danger layui-btn-xs" onclick="del('${d.id}')">删除</a>`;
|
||||
} else {
|
||||
// 获取表格数据总数
|
||||
var tableData = table.cache.menuTable || [];
|
||||
var totalCount = tableData.length;
|
||||
// 如果只有一条数据，禁止所有操作
|
||||
if (totalCount <= 1) {
|
||||
return `禁止操作`;
|
||||
} else {
|
||||
// 多条数据时，第一行禁止操作，其他行可以操作
|
||||
if (d.LAY_INDEX === 0) {
|
||||
return `禁止操作`;
|
||||
} else {
|
||||
return `<a class="layui-btn layui-btn-xs" onclick="edit('${d.id}','${d.reverseId}')">修改</a> <a class="layui-btn layui-btn-danger layui-btn-xs" onclick="del('${d.id}')">删除</a>`;
|
||||
}
|
||||
}
|
||||
}}
|
||||
],
|
||||
|
|
|
|||
|
|
@ -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: '操作时间'}
|
||||
|
|
|
|||
|
|
@ -97,6 +97,7 @@
|
|||
<script type="text/javascript" src="../../js/jedate/jedate.js"></script>
|
||||
<script type="text/javascript" src="../../js/select.js"></script>
|
||||
<script src="../../css/ztree/3.5/jquery.ztree.all.min.js"></script>
|
||||
<script src="../../js/my/aes.js"></script>
|
||||
<script type="text/javascript" src="../../js/work/basic/UserManagementList.js" defer="defer"></script>
|
||||
<script type="text/html" id="toolsBar">
|
||||
<a lay-event="resetPassword" style="color: #009688;cursor: pointer;font-size: 16px">重置密码</a>
|
||||
|
|
|
|||
Loading…
Reference in New Issue