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

fix 87786 其他会议-锁定后-编辑年份没有报提示

Browse Source
This commit is contained in:
lijiarao
2024-07-30 14:28:09 +08:00
parent d19282e030
commit 3ae98f5d00
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
+8 -3
View File
@@ -343,6 +343,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
PayMeeting payMeeting = getPayMeeting(payMeetingVO, hotelContactsList); PayMeeting payMeeting = getPayMeeting(payMeetingVO, hotelContactsList);
saveOrUpdate(payMeeting); saveOrUpdate(payMeeting);
String meetingId = payMeeting.getId(); String meetingId = payMeeting.getId();
//annualDataLockingService.judgeUserYear()
// 同步预计到账日期 // 同步预计到账日期
LambdaUpdateWrapper<PayMeetingSituation> upPayMeetingSituation = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<PayMeetingSituation> upPayMeetingSituation = new LambdaUpdateWrapper<>();
upPayMeetingSituation.eq(PayMeetingSituation::getMeetingId, meetingId); upPayMeetingSituation.eq(PayMeetingSituation::getMeetingId, meetingId);
@@ -459,9 +460,15 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
if (id != null) { if (id != null) {
wrapper.ne(PayMeeting::getId, id); wrapper.ne(PayMeeting::getId, id);
oldMeeting = getById(id); oldMeeting = getById(id);
String year = oldMeeting.getParticularYear();
//判断用户是否能操作所选年份数据
AnnualDataLocking annualDataLocking = annualDataLockingService.judgeUserYear(year);
}else { }else {
payMeetingVO.setIsRelease(MeetingCommon.REMIND_0); payMeetingVO.setIsRelease(MeetingCommon.REMIND_0);
} }
String year = payMeetingVO.getParticularYear();
//判断用户是否能操作所选年份数据
AnnualDataLocking annualDataLocking = annualDataLockingService.judgeUserYear(year);
if (count(wrapper) > 0) { if (count(wrapper) > 0) {
throw new JeroBootException("会议名称不能重复"); throw new JeroBootException("会议名称不能重复");
} }
@@ -494,9 +501,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
throw new JeroBootException("会议费用为0时，不可上传收款二维码"); throw new JeroBootException("会议费用为0时，不可上传收款二维码");
} }
} }
String year = payMeetingVO.getParticularYear();
//判断用户是否能操作所选年份数据
AnnualDataLocking annualDataLocking = annualDataLockingService.judgeUserYear(year);
//根据会议类型进行校验 //根据会议类型进行校验
switch (meetingType) { switch (meetingType) {
case MeetingCommon.WORKING_GROUP_MEETING: case MeetingCommon.WORKING_GROUP_MEETING: