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

fix 工作组成员修改联系人逻辑后工作组会议发布报错

Browse Source
This commit is contained in:
lijiarao
2022-05-19 10:35:31 +08:00
parent 9aa0109a37
commit d6756e5a27
2 changed files with 19 additions and 33 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
+11 -23
View File
@@ -52,7 +52,9 @@ import com.jero.modules.oss.entity.OSSFile;
import com.jero.modules.oss.service.IOSSFileService;
import com.jero.project.entity.PayWorkingGroup;
import com.jero.project.entity.PayWorkingGroupSubItem;
import com.jero.project.entity.PayWorkingGroupSubItemContacts;
import com.jero.project.service.IPayWorkingGroupService;
import com.jero.project.service.IPayWorkingGroupSubItemContactsService;
import com.jero.project.service.IPayWorkingGroupSubItemService;
import com.jero.standards.xuanguan.stablecrosstraining.entity.StableCrossTraining;
import com.jero.standards.xuanguan.stablecrosstraining.service.IStableCrossTrainingService;
@@ -125,6 +127,8 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
private IPayMeetingContactsService meetingContactsService;
@Resource
private PayMeetingContactsMapper meetingContactsMapper;
@Resource
private IPayWorkingGroupSubItemContactsService workingGroupSubItemContactsService;
/**
* 新增会议
@@ -568,32 +572,16 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
for (PayWorkingGroupSubItem payWorkingGroupSubItem : payWorkingGroupSubItems) {
workingGroupId = payWorkingGroupSubItem.getWorkingGroupId();
String groupSubItemId = payWorkingGroupSubItem.getId();
String contactsIdOne = payWorkingGroupSubItem.getContactsIdOne();
if (StringUtils.isNotBlank(contactsIdOne)) {
contactsIdList.add(contactsIdOne);
LambdaQueryWrapper<PayWorkingGroupSubItemContacts> wrapper1 = new LambdaQueryWrapper<>();
wrapper1.eq(PayWorkingGroupSubItemContacts::getWorkingGroupSubId, groupSubItemId);
List<PayWorkingGroupSubItemContacts> groupSubItemContactsList = workingGroupSubItemContactsService.list(wrapper1);
for (PayWorkingGroupSubItemContacts payWorkingGroupSubItemContacts : groupSubItemContactsList) {
String contactsId = payWorkingGroupSubItemContacts.getContactsId();
contactsIdList.add(contactsId);
meetingRemindRecordList.add(
new PayMeetingRemindRecord()
.setSubitemId(groupSubItemId)
.setContactId(contactsIdOne)
);
}
String contactsIdTwo = payWorkingGroupSubItem.getContactsIdTwo();
if (StringUtils.isNotBlank(contactsIdTwo)) {
contactsIdList.add(contactsIdTwo);
meetingRemindRecordList.add(
new PayMeetingRemindRecord()
.setSubitemId(groupSubItemId)
.setContactId(contactsIdTwo)
);
}
String contactsIdThree = payWorkingGroupSubItem.getContactsIdThree();
if (StringUtils.isNotBlank(contactsIdThree)) {
contactsIdList.add(contactsIdThree);
meetingRemindRecordList.add(
new PayMeetingRemindRecord()
.setSubitemId(groupSubItemId)
.setContactId(contactsIdThree)
.setContactId(contactsId)
);
}
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+8 -10
View File
@@ -62,6 +62,8 @@ import com.jero.payment.entity.PayPaymentRecord;
import com.jero.payment.service.IPayPaymentRecordService;
import com.jero.project.common.PayProjectCommon;
import com.jero.project.entity.PayWorkingGroupSubItem;
import com.jero.project.entity.PayWorkingGroupSubItemContacts;
import com.jero.project.service.IPayWorkingGroupSubItemContactsService;
import com.jero.project.service.IPayWorkingGroupSubItemService;
import com.jero.standards.memberinfo.service.IMemberInfoService;
import com.jero.temporary.service.IPayCompanyManagementTemporaryService;
@@ -138,6 +140,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
private IOSSFileService ossFileService;
@Resource
private IPayMeetingContactsService meetingContactsService;
@Resource
private IPayWorkingGroupSubItemContactsService workingGroupSubItemContactsService;
private static final String[] CAN_MODIFY_LIST =
@@ -1215,16 +1219,10 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
payMeetingSituation1.setRegisterCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_1);
//如果是工作组会议或者分标委会议或理事会会议，判断是否为成员
if (meetingType.equals(MeetingCommon.WORKING_GROUP_MEETING_INT)) {
LambdaQueryWrapper<PayWorkingGroupSubItem> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(PayWorkingGroupSubItem::getWorkingGroupId, payMeeting.getWorkingGroupId());
wrapper.eq(PayWorkingGroupSubItem::getChargeCompanyId, payMeetingSituation1.getCompanyId());
wrapper.and(i -> i.eq(PayWorkingGroupSubItem::getContactsIdOne, payMeetingSituation1.getCompanyContactId())
.or()
.eq(PayWorkingGroupSubItem::getContactsIdTwo, payMeetingSituation1.getCompanyContactId())
.or()
.eq(PayWorkingGroupSubItem::getContactsIdThree, payMeetingSituation1.getCompanyContactId())
);
int count = payWorkingGroupSubItemService.count(wrapper);
LambdaQueryWrapper<PayWorkingGroupSubItemContacts> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(PayWorkingGroupSubItemContacts::getWorkingGroupId, payMeeting.getWorkingGroupId());
wrapper.eq(PayWorkingGroupSubItemContacts::getContactsId, payMeetingSituation1.getCompanyContactId());
int count = workingGroupSubItemContactsService.count(wrapper);
if (count <= 0) {
payMeetingSituation1.setRegisterCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_0);
}