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

fix bug 41839 标协会员项目

Browse Source
This commit is contained in:
lijiarao
2021-11-03 18:41:35 +08:00
parent b06451c081
commit c65de06d23
3 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingMapper.java
+2
View File
@@ -25,4 +25,6 @@ public interface PayMeetingMapper extends BaseMapper<PayMeeting> {
IPage<PayMeeting> internelPage(Page<PayMeeting> page, @Param(Constants.WRAPPER) QueryWrapper<PayMeeting> queryWrapper);
IPage<PayMeeting> workGroupPage(Page<PayMeeting> page, @Param(Constants.WRAPPER) QueryWrapper<PayMeeting> queryWrapper);
IPage<PayMeeting> standardPage(Page<PayMeeting> page, @Param(Constants.WRAPPER) QueryWrapper<PayMeeting> queryWrapper);
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml
+7
View File
@@ -102,4 +102,11 @@
left join pay_working_group pwg on pwg.id = pm.working_group_id
${ew.customSqlSegment}
</select>
<select id="standardPage" resultMap="PayMeetingResultMap">
select distinct pm.*
from pay_meeting pm
left join tb_member_project tmp on tmp.id = pm.standards_id
${ew.customSqlSegment}
</select>
</mapper>
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
+7
View File
@@ -623,6 +623,13 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
.eq("dock_id", sysUser.getId())
);
pageList = baseMapper.internelPage(page,queryWrapper);
}else if (meetingType.equals(MeetingCommon.STANDARD_MEETING_INT)) {
queryWrapper.and(
a -> a.eq("tmp.director_id", sysUser.getId())
.or()
.eq("pm.director_id", sysUser.getId())
);
pageList = baseMapper.standardPage(page,queryWrapper);
}else {
queryWrapper.eq("director_id", sysUser.getId());
pageList = page(page, queryWrapper);