diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java index 62357314..68bb5d9b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java @@ -158,9 +158,12 @@ public class PayCaseCommitteeSubitemController extends JeroController list = payCaseCommitteeSubitemService.listForExcel(contactsName, companyName, fenBiaoWeiName); + List list = payCaseCommitteeSubitemService.listForExcel(contactsNames, companyNames, fenBiaoWeiNames); return getModelAndView(list); } else { ArrayList idList = new ArrayList<>(Arrays.asList(ids.split(","))); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml index e511dc3a..9c2f428f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml @@ -21,13 +21,13 @@ left join pay_company_management pcm on(pm.company_id=pcm.id) - AND pt.name LIKE CONCAT('%',#{name},'%') escape '/' + AND pt.name LIKE CONCAT('%',#{name},'%') - AND pcm.company_name LIKE CONCAT('%',#{companyName},'%') escape '/' + AND pcm.company_name LIKE CONCAT('%',#{companyName},'%') - AND pe.name LIKE CONCAT('%',#{fenBiaoWeiName},'%') escape '/' + AND pe.name LIKE CONCAT('%',#{fenBiaoWeiName},'%') group by pe.id @@ -41,10 +41,10 @@ pm.committee_id = #{pid} - AND pcm.company_name LIKE CONCAT('%',#{companyName},'%') escape '/' + AND pcm.company_name LIKE CONCAT('%',#{companyName},'%') - AND pt.name LIKE CONCAT('%',#{tname},'%') escape '/' + AND pt.name LIKE CONCAT('%',#{tname},'%') order by pm.create_time desc