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 50b8adcb..8eb7c9a0 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 @@ -257,7 +257,8 @@ public class PayMeetingController extends JeroController queryById(@RequestParam(name = "id") String id) { - PayMeeting meeting = payMeetingService.queryById(id); + Date now = new Date(); + PayMeeting meeting = payMeetingService.queryByIdAndTime(id,now); if (meeting == null) { return Result.error("未找到对应数据"); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java index 27a4fd55..0dc95503 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java @@ -214,6 +214,36 @@ public class PayMeetingSituationController extends JeroController { IPage pageListContract(Page page, - @Param(Constants.WRAPPER) QueryWrapper queryWrapper, - @Param("now") Date now); + @Param(Constants.WRAPPER) QueryWrapper queryWrapper, + @Param("now") Date now); IPage pageListContract2(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper, @@ -38,4 +38,5 @@ public interface PayMeetingMapper extends BaseMapper { IPage standardPage(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + PayMeeting queryByIdAndTime(@Param("id") String id, @Param("now") Date now); } 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 3cacf369..d6d2df5b 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 @@ -208,4 +208,16 @@ left join tb_member_project tmp on tmp.id = pm.standards_id ${ew.customSqlSegment} + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java index be447d0e..e7e5c82c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java @@ -11,6 +11,7 @@ import com.jero.meeting.vo.PublishReminderVO; import com.jero.meeting.vo.UploadFileVO; import javax.servlet.http.HttpServletRequest; +import java.util.Date; import java.util.List; /** @@ -91,4 +92,6 @@ public interface IPayMeetingService extends IService { * @return */ PayMeeting getMeetingBySituationId(String situationId); + + PayMeeting queryByIdAndTime(String id, Date now); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingRemindRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingRemindRecordServiceImpl.java index dde0aff4..571c50e1 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingRemindRecordServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingRemindRecordServiceImpl.java @@ -70,8 +70,11 @@ public class PayMeetingRemindRecordServiceImpl extends ServiceImpl meetingIdList, List meetingRemindRecordList) { for (String meetingId : meetingIdList) { for (PayMeetingRemindRecord meetingRemindRecord : meetingRemindRecordList) { - meetingRemindRecord.setMeetingId(meetingId); - save(meetingRemindRecord); + PayMeetingRemindRecord meetingRemindRecord1 = new PayMeetingRemindRecord(); + meetingRemindRecord1.setSubitemId(meetingRemindRecord.getSubitemId()); + meetingRemindRecord1.setContactId(meetingRemindRecord.getContactId()); + meetingRemindRecord1.setMeetingId(meetingId); + save(meetingRemindRecord1); } } } 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 31bc3525..e622d977 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 @@ -995,4 +995,9 @@ public class PayMeetingServiceImpl extends ServiceImpl