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

add 标协会议增加会议联系人

Browse Source
This commit is contained in:
lijiarao
2022-02-23 18:02:37 +08:00
parent d2a378c182
commit bce916188a
6 changed files with 30 additions and 14 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
+19 -4
View File
@@ -35,6 +35,7 @@ import com.jero.data.service.IPayCaseCouncilSubitemService;
import com.jero.meeting.common.MeetingCommon;
import com.jero.meeting.common.MeetingSubitemCommon;
import com.jero.meeting.entity.*;
import com.jero.meeting.mapper.PayMeetingContactsMapper;
import com.jero.meeting.mapper.PayMeetingMapper;
import com.jero.meeting.service.*;
import com.jero.meeting.valid.group.CaseCommitteeMeeting;
@@ -122,6 +123,8 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
private ITbMemberProjectService tbMemberProjectService;
@Resource
private IPayMeetingContactsService meetingContactsService;
@Resource
private PayMeetingContactsMapper meetingContactsMapper;
/**
* 新增会议
@@ -142,9 +145,13 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
meetingHotelContactsService.saveBatch(hotelContactsList);
}
//会议联系人
addMeetingContactsList(payMeetingVO, payMeeting.getId());
List<PayMeetingContacts> meetingContactsList = payMeetingVO.getMeetingContactsList();
addMeetingContactsList(meetingContactsList, payMeeting.getId());
//新增会员系统标协会议
if (payMeeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) {
String directorId = payMeeting.getDirectorId();
LoginUser loginUser = sysBaseAPI.getUserById(directorId);
payMeeting.setDirectorName(loginUser.getRealname());
stableCrossTrainingService.add(payMeeting, hotelContactsList);
List<String> fileIdList = new ArrayList<>();
String meetingFiles = payMeeting.getMeetingFiles();
@@ -238,6 +245,9 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
);
meetingHotelContactsService.saveBatch(hotelContactsList);
}
//会议联系人
List<PayMeetingContacts> meetingContactsList = payMeeting.getMeetingContactsList();
addMeetingContactsList(meetingContactsList, payMeeting.getId());
}
/**
@@ -262,9 +272,13 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
meetingHotelContactsService.saveBatch(hotelContactsList);
}
//会议联系人
addMeetingContactsList(payMeetingVO, payMeeting.getId());
List<PayMeetingContacts> meetingContactsList = payMeetingVO.getMeetingContactsList();
addMeetingContactsList(meetingContactsList, payMeeting.getId());
//编辑标协会议
if (payMeeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) {
String directorId = payMeeting.getDirectorId();
LoginUser loginUser = sysBaseAPI.getUserById(directorId);
payMeeting.setDirectorName(loginUser.getRealname());
stableCrossTrainingService.edit(payMeeting, hotelContactsList);
List<String> fileIdList = new ArrayList<>();
String meetingFiles = payMeeting.getMeetingFiles();
@@ -284,8 +298,8 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
/**
* 增加会议联系人
*/
private void addMeetingContactsList(PayMeetingVO payMeetingVO, String meetingId) {
List<PayMeetingContacts> meetingContactsList = payMeetingVO.getMeetingContactsList();
private void addMeetingContactsList(List<PayMeetingContacts> meetingContactsList, String meetingId) {
if (meetingContactsList == null) {
return;
}
@@ -313,6 +327,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
meetingContacts.setMeetingId(meetingId)
);
meetingContactsService.saveBatch(addMeetingContactsList);
AuthenticationUtils.post("/stablecrosstraining/stableCrossTraining/addMeetingContactsList",null,addMeetingContactsList);
}
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java
+1 -1
View File
@@ -42,7 +42,7 @@ public class PayMeetingVO implements Serializable {
@Excel(name = "会议名称", width = 15)
@ApiModelProperty(value = "会议名称")
@NotBlank(message = "会议名称不能为空")
@Size(max = 50,message = "会议名称最长为50字符")
@Size(max = 100,message = "会议名称最长为100字符")
private String meetingName;
/**会议类型*/
jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/WorkingGroupMeetingExcel.java
+1 -1
View File
@@ -20,7 +20,7 @@ public class WorkingGroupMeetingExcel {
@Excel(name = "会议名称", width = 15)
@ApiModelProperty(value = "会议名称")
@NotBlank(message = "会议名称不能为空")
@Size(max = 50,message = "会议名称最长为50字符")
@Size(max = 100,message = "会议名称最长为100字符")
private String meetingName;
/**会议类型*/
jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/WorkingGroupMeetingExel.java
+1 -1
View File
@@ -20,7 +20,7 @@ public class WorkingGroupMeetingExel {
@Excel(name = "会议名称", width = 15)
@ApiModelProperty(value = "会议名称")
@NotBlank(message = "会议名称不能为空")
@Size(max = 50,message = "会议名称最长为50字符")
@Size(max = 100,message = "会议名称最长为100字符")
private String meetingName;
/**会议类型*/
jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/service/impl/StableCrossTrainingServiceImpl.java
+1 -3
View File
@@ -97,9 +97,7 @@ public class StableCrossTrainingServiceImpl extends ServiceImpl<StableCrossTrain
stableCrossTraining.setMeetingCosts(payMeeting.getMeetingCosts());
stableCrossTraining.setMeetingCostsVip(payMeeting.getMeetingCostsVip());
stableCrossTraining.setDirectorId(payMeeting.getDirectorId());
String directorId = payMeeting.getDirectorId();
LoginUser loginUser = sysBaseAPI.getUserById(directorId);
stableCrossTraining.setDirectorName(loginUser.getRealname());
stableCrossTraining.setDirectorName(payMeeting.getDirectorName());
stableCrossTraining.setDirectorPhone(payMeeting.getDirectorPhone());
stableCrossTraining.setMeetingDescription(payMeeting.getMeetingContent());
stableCrossTraining.setRemark(payMeeting.getRemark());