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 4163ea4..d9e0401 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 @@ -239,6 +239,18 @@ public class PrepaymentServiceImpl implements PrepaymentService { } // 创建第二个工作表 + // 定义一个List来接收所有id的值 + List prepaymentId = new ArrayList<>(); + if(list.size()>0){ + for(PrepaymentBean bean:list){ + String id = bean.getId(); + // 将id添加到数组中 + prepaymentId.add(id); + } + }else{ + prepaymentId.add("a"); + } + params.put("prepaymentIds", prepaymentId); List list2=dao.getOperationsList(params,1,1000000); writer.setSheet(1); // 切换到第二个工作表(索引从0开始) writer.renameSheet(1, "各月增减明细"); diff --git a/src/main/resources/mappers/ca/PrepaymentMapper.xml b/src/main/resources/mappers/ca/PrepaymentMapper.xml index ad18fb3..4115139 100644 --- a/src/main/resources/mappers/ca/PrepaymentMapper.xml +++ b/src/main/resources/mappers/ca/PrepaymentMapper.xml @@ -242,6 +242,12 @@ AND bm.p_id = #{params.prepaymentId} + + AND bm.p_id IN + + #{id} + + ORDER BY bm.updated_time DESC diff --git a/src/main/resources/static/js/prepayment/proForm.js b/src/main/resources/static/js/prepayment/proForm.js index 8825b07..8b6f65c 100644 --- a/src/main/resources/static/js/prepayment/proForm.js +++ b/src/main/resources/static/js/prepayment/proForm.js @@ -38,11 +38,11 @@ layui.use(['table', 'form', 'laydate'], function(){ if (totalCount <= 1) { return `禁止操作`; } else { - // 多条数据时,第一行禁止操作,其他行可以操作 + // 多条数据时,第一行可以操作,其他行禁止操作 if (d.LAY_INDEX === 0) { - return `禁止操作`; - } else { return `修改 删除`; + } else { + return `禁止操作`; } } }}