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

fix 收入合同查询不到标协会员项目

Browse Source
This commit is contained in:
lijiarao
2022-07-01 11:44:29 +08:00
parent 0eb9327dc1
commit 5fd6a177a3
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectController.java
+1 -1
View File
@@ -135,7 +135,7 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
// 标协会员 // 标协会员
if (Objects.equals(projectType, PayProjectCommon.PROJECT_TYPE5)) { if (Objects.equals(projectType, PayProjectCommon.PROJECT_TYPE5)) {
Page<TbMemberProjectSubitem> page = new Page<>(pageNo, pageSize); Page<TbMemberProjectSubitem> page = new Page<>(pageNo, pageSize);
IPage<TbMemberProjectSubitem> list = tbMemberProjectSubitemService.queryListByCompany(page, companyId, PayProjectCommon.PROJECT_TYPE4, payIncomeContract.getPack(), payIncomeContract.getPackYear()); IPage<TbMemberProjectSubitem> list = tbMemberProjectSubitemService.queryListByCompany(page, companyId, PayProjectCommon.PROJECT_TYPE5, payIncomeContract.getPack(), payIncomeContract.getPackYear());
if (!CollectionUtils.isEmpty(list.getRecords())) { if (!CollectionUtils.isEmpty(list.getRecords())) {
List<TbMemberProjectSubitem> listTbMemberProjectSubitem = list.getRecords(); List<TbMemberProjectSubitem> listTbMemberProjectSubitem = list.getRecords();
listTbMemberProjectSubitem.forEach(p -> { listTbMemberProjectSubitem.forEach(p -> {
jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml
+1 -1
View File
@@ -35,7 +35,7 @@
WHERE tmps.company_id =#{companyId} AND tmp.id IS NOT NULL AND tmp.id != '' WHERE tmps.company_id =#{companyId} AND tmp.id IS NOT NULL AND tmp.id != ''
AND (pica.id is null OR pica.id = '') AND (pica.id is null OR pica.id = '')
<if test="pack == 1 and packYear != '' and packYear != null"> <if test="pack == 1 and packYear != '' and packYear != null">
AND (ppc.id is null OR ppc.id ='') AND (ppc.pack_year=#{packYear} or ppc.id is null OR ppc.id ='')
</if> </if>
GROUP BY tmps.id ORDER BY tmps.create_time DESC GROUP BY tmps.id ORDER BY tmps.create_time DESC
</select> </select>