From dc081ad74ae0af5fe86956cd971d24bf2c6282fe Mon Sep 17 00:00:00 2001
From: zhangqinlin <983410zql>
Date: Fri, 10 Dec 2021 18:07:46 +0800
Subject: [PATCH] =?UTF-8?q?add:=E7=90=86=E4=BA=8B=E4=BC=9A=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/mapper/PayCaseCommitteeSubitemMapper.java     |  2 +-
 .../data/mapper/xml/PayCaseCommitteeSubitemMapper.xml  |  2 --
 .../data/mapper/xml/PayCaseCouncilSubitemMapper.xml    | 10 +++++-----
 .../data/service/IPayCaseCommitteeSubitemService.java  |  2 +-
 .../impl/PayCaseCommitteeSubitemServiceImpl.java       |  4 ++--
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCommitteeSubitemMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCommitteeSubitemMapper.java
index da1f019e..efa5b417 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCommitteeSubitemMapper.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCommitteeSubitemMapper.java
@@ -28,7 +28,7 @@ public interface PayCaseCommitteeSubitemMapper extends BaseMapper<PayCaseCommitt
     List<payCaseCommitteeSubitemVO> listTwo (@Param(Constants.WRAPPER) Wrapper<PayCaseCommitteeSubitem> wrapper);
 
 
-    List<ChooseExcelWorkingGroup> listForExcel (@Param("name") String name,@Param("companyName") String companyName,@Param("fenBiaoWeiName") String fenBiaoWeiName);
+    List<ChooseExcelWorkingGroup> listForExcel (@Param("name") String name,@Param("companyName") String companyName,@Param("councilName") String councilName);
 
     List<ChooseExcelWorkingGroup> chooseExcel(ArrayList<String> idList);
 
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 cec86990..bc131e2f 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
@@ -99,8 +99,6 @@
                 </foreach>
             </if>
         </where>
-
-
     </select>
 
 </mapper>
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml
index 58d8df4d..402e6e5d 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml
@@ -14,7 +14,7 @@
         </collection>
     </resultMap>
     <select id="listThree"  resultMap="people">
-        SELECT pe.id as id,pe.name as name,pe.abbreviation,pe.remarks,#{companyName} as companyName,#{contactsNames} as tname
+        SELECT pe.id as id,pe.name as name,pe.abbreviation,pe.remarks,#{companyNames} as companyName,#{contactsNames} as tname
         from
         pay_case_council pe
         left JOIN pay_case_council_subitem pm on (pe.id = pm.council_id)
@@ -24,8 +24,8 @@
             <if test=" contactsNames!=null and contactsNames != ''">
                 AND pt.name LIKE CONCAT('%',#{contactsNames},'%')
             </if>
-            <if test=" companyName!=null and companyName != ''">
-                AND pcm.company_name LIKE CONCAT('%',#{companyName},'%')
+            <if test=" companyNames!=null and companyNames != ''">
+                AND pcm.company_name LIKE CONCAT('%',#{companyNames},'%')
             </if>
             <if test=" councilNames!=null and councilNames != ''">
                 AND pe.name LIKE CONCAT('%',#{councilNames},'%')
@@ -63,8 +63,8 @@
             <if test=" contactsNames!=null and contactsNames != ''">
                 AND pt.name LIKE CONCAT('%',#{contactsNames},'%')
             </if>
-            <if test=" companyName!=null and companyName != ''">
-                AND pm.company_name LIKE CONCAT('%',#{companyName},'%')
+            <if test=" companyNames!=null and companyNames != ''">
+                AND pm.company_name LIKE CONCAT('%',#{companyNames},'%')
             </if>
             <if test=" councilNames!=null and councilNames != ''">
                 AND pe.name LIKE CONCAT('%',#{councilNames},'%')
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCommitteeSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCommitteeSubitemService.java
index 11ee42fc..0e385ff2 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCommitteeSubitemService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCommitteeSubitemService.java
@@ -27,7 +27,7 @@ public interface IPayCaseCommitteeSubitemService extends IService<PayCaseCommitt
 
     IPage<FindByName> listThree(Page<FindByName> page,String name,String companyName,String fenBiaoWeiName);
 
-    List<ChooseExcelWorkingGroup> listForExcel(String name, String companyName, String fenBiaoWeiName);
+    List<ChooseExcelWorkingGroup> listForExcel(String name, String companyName, String councilName);
 
     List<ChooseExcelWorkingGroup> chooseExcel(ArrayList<String> idList);
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeSubitemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeSubitemServiceImpl.java
index 94525088..b313e6eb 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeSubitemServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeSubitemServiceImpl.java
@@ -47,8 +47,8 @@ public class PayCaseCommitteeSubitemServiceImpl extends ServiceImpl<PayCaseCommi
 
 
     @Override
-    public List<ChooseExcelWorkingGroup> listForExcel(String name, String companyName, String fenBiaoWeiName) {
-        return payCaseCommitteeSubitemMapper.listForExcel(name,companyName,fenBiaoWeiName);
+    public List<ChooseExcelWorkingGroup> listForExcel(String name, String companyName, String councilName) {
+        return payCaseCommitteeSubitemMapper.listForExcel(name,companyName,councilName);
     }
 
     @Override