fix 86988 功能安全中心--项目会议--导出后顺序与列表不一致
This commit is contained in:
+2
@@ -1191,6 +1191,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
|
||||
if (!b){
|
||||
throw new JeroBootException("功能安全中心成员才能报名");
|
||||
}
|
||||
payMeetingSituation1.setRegisterCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_1);
|
||||
}
|
||||
//国际研讨会会议的嘉宾和其他类型不同
|
||||
if (meetingType.equals(Integer.parseInt(MeetingCommon.INTERNATIONAL_MEETING)) &&
|
||||
@@ -1732,6 +1733,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
|
||||
if (StringUtils.isNotBlank(particularYear)){
|
||||
queryWrapper.eq("DATE_FORMAT( ppr.payment_date, '%Y' )",particularYear);
|
||||
}
|
||||
queryWrapper.orderByDesc("pms.create_time");
|
||||
IPage<PayMeetingSituation> pageListContract = pageListContract(meetingId, new Page<>(-1, -1), queryWrapper,meetingType);
|
||||
List<PayMeetingSituation> pageList = pageListContract.getRecords();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user