LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
zhangqinlin
2021-10-15 14:42:28 +08:00
parent dc011dba85
commit 7244fa52bb
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java
+4 -1
View File
@@ -158,9 +158,12 @@ public class PayCaseCommitteeSubitemController extends JeroController<PayCaseCom
@RequestParam(name = "ids",required = false) String ids, @RequestParam(name = "ids",required = false) String ids,
@RequestParam(name="companyName",required =false) String companyName, @RequestParam(name="companyName",required =false) String companyName,
@RequestParam(name="fenBiaoWeiName",required =false) String fenBiaoWeiName) { @RequestParam(name="fenBiaoWeiName",required =false) String fenBiaoWeiName) {
String contactsNames = oConvertUtils.replaceAllPercent(contactsName);
String companyNames = oConvertUtils.replaceAllPercent(companyName);
String fenBiaoWeiNames = oConvertUtils.replaceAllPercent(fenBiaoWeiName);
// ids为空表示搜索导出 // ids为空表示搜索导出
if (StringUtils.isBlank(ids)) { if (StringUtils.isBlank(ids)) {
List<ChooseExcelWorkingGroup> list = payCaseCommitteeSubitemService.listForExcel(contactsName, companyName, fenBiaoWeiName); List<ChooseExcelWorkingGroup> list = payCaseCommitteeSubitemService.listForExcel(contactsNames, companyNames, fenBiaoWeiNames);
return getModelAndView(list); return getModelAndView(list);
} else { } else {
ArrayList<String> idList = new ArrayList<>(Arrays.asList(ids.split(","))); ArrayList<String> idList = new ArrayList<>(Arrays.asList(ids.split(",")));
jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml
+5 -5
View File
@@ -21,13 +21,13 @@
left join pay_company_management pcm on(pm.company_id=pcm.id) left join pay_company_management pcm on(pm.company_id=pcm.id)
<where> <where>
<if test=" name!=null and name != ''"> <if test=" name!=null and name != ''">
AND pt.name LIKE CONCAT('%',#{name},'%') escape '/' AND pt.name LIKE CONCAT('%',#{name},'%')
</if> </if>
<if test=" companyName!=null and companyName != ''"> <if test=" companyName!=null and companyName != ''">
AND pcm.company_name LIKE CONCAT('%',#{companyName},'%') escape '/' AND pcm.company_name LIKE CONCAT('%',#{companyName},'%')
</if> </if>
<if test=" fenBiaoWeiName!=null and fenBiaoWeiName != ''"> <if test=" fenBiaoWeiName!=null and fenBiaoWeiName != ''">
AND pe.name LIKE CONCAT('%',#{fenBiaoWeiName},'%') escape '/' AND pe.name LIKE CONCAT('%',#{fenBiaoWeiName},'%')
</if> </if>
</where> </where>
group by pe.id group by pe.id
@@ -41,10 +41,10 @@
<where> <where>
pm.committee_id = #{pid} pm.committee_id = #{pid}
<if test=" companyName!=null and companyName != ''"> <if test=" companyName!=null and companyName != ''">
AND pcm.company_name LIKE CONCAT('%',#{companyName},'%') escape '/' AND pcm.company_name LIKE CONCAT('%',#{companyName},'%')
</if> </if>
<if test=" tname!=null and tname != ''"> <if test=" tname!=null and tname != ''">
AND pt.name LIKE CONCAT('%',#{tname},'%') escape '/' AND pt.name LIKE CONCAT('%',#{tname},'%')
</if> </if>
</where> </where>
order by pm.create_time desc order by pm.create_time desc