diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java index a6727a9f..2e651e2e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java @@ -167,6 +167,12 @@ public class PayMeetingController extends JeroController { IPage pageListContract(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper, - @Param("now") String now); + @Param("now") Date now); IPage pageListContract2(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper, - @Param("now") String now); + @Param("now") Date now); IPage pageListContract3(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper, - @Param("now") String now, + @Param("now") Date now, @Param("contactId") String contactId); IPage internelPage(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml index 3626d44a..83e899bd 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml @@ -174,6 +174,13 @@ WHERE pm.meeting_type = 2 OR pm.meeting_type = 3 OR pm.meeting_type = 4 + and pm.id not in (SELECT pm.id + FROM pay_meeting pm + LEFT JOIN pay_meeting_situation pms ON pm.id = pms.meeting_id + LEFT JOIN pay_meeting_remind_record pmrr ON pm.id = pmrr.meeting_id + WHERE pms.company_contact_id = #{contactId} + OR pms.post_contact_id = #{contactId} + OR pmrr.contact_id = #{contactId}) ) result ${ew.customSqlSegment} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java index 62e8b849..fcebc3fe 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java @@ -614,18 +614,18 @@ public class PayMeetingServiceImpl extends ServiceImpl b.eq("pm.meeting_type",MeetingCommon.STANDARD_MEETING) .or()