add:理事会功能

This commit is contained in:
zhangqinlin
2021-12-10 18:07:46 +08:00
parent 129e7ace93
commit dc081ad74a
5 changed files with 9 additions and 11 deletions
@@ -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);
@@ -99,8 +99,6 @@
</foreach>
</if>
</where>
</select>
</mapper>
@@ -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},'%')
@@ -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);
}
@@ -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