add 合同新增参会人，自动关联，参会人详情回显合同编号

2021-09-28 18:40:54 +08:00
parent 2cddb6df2a
commit 7857c49fd4
3 changed files with 74 additions and 39 deletions
@@ -405,18 +405,18 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
                    }
                    PayMeetingSituation payMeetingSituation = payMeetingSituationService.getById(p.getProjectId());
                    if(Objects.isNull(payMeetingSituation)){
-                        throw new JeroBootException("会员项目不存在！");
+                        throw new JeroBootException("会议项目不存在！");
                    }
                    PayMeeting payMeeting = payMeetingService.getById(payMeetingSituation.getMeetingId());
                    if (Objects.isNull(payMeeting)) {
-                        throw new JeroBootException("会员项目不存在！");
+                        throw new JeroBootException("会议项目不存在！");
                    }
                    // 验证企业是否正确
                    if(!Objects.equals(payMeetingSituation.getCompanyId(),payIncomeContract.getSignedCompanyId())){
                        throw new JeroBootException("企业不匹配！");
                    }
                    //验证参会人是否审核已通过
-                    if (Objects.nonNull(payMeetingSituation.getPaymentRecord())
+                    if (StringUtils.isNotBlank(payMeetingSituation.getPaymentRecord())
                            && payMeetingSituation.getCheckResult().equals(MeetingSubitemCommon.SIGNUP_STATUS_1)) {
                        throw new JeroBootException("未通过审核，不可关联。");
                    }