diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectController.java index 498f40d9..f297ddca 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectController.java @@ -135,7 +135,7 @@ public class PayMemberProjectController extends JeroController page = new Page<>(pageNo, pageSize); - IPage list = tbMemberProjectSubitemService.queryListByCompany(page, companyId, PayProjectCommon.PROJECT_TYPE4, payIncomeContract.getPack(), payIncomeContract.getPackYear()); + IPage list = tbMemberProjectSubitemService.queryListByCompany(page, companyId, PayProjectCommon.PROJECT_TYPE5, payIncomeContract.getPack(), payIncomeContract.getPackYear()); if (!CollectionUtils.isEmpty(list.getRecords())) { List listTbMemberProjectSubitem = list.getRecords(); listTbMemberProjectSubitem.forEach(p -> { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml index 4a9617c6..fa0bfa5f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml @@ -35,7 +35,7 @@ WHERE tmps.company_id =#{companyId} AND tmp.id IS NOT NULL AND tmp.id != '' AND (pica.id is null OR pica.id = '') - AND (ppc.id is null OR ppc.id ='') + AND (ppc.pack_year=#{packYear} or ppc.id is null OR ppc.id ='') GROUP BY tmps.id ORDER BY tmps.create_time DESC