update 更改sysBaseAPI变量名称
This commit is contained in:
+11
-11
@@ -68,7 +68,7 @@ public class CommitteeMeetingController extends JeroController<PayMeeting, IPayM
|
|||||||
@Resource
|
@Resource
|
||||||
private IPayMeetingService payMeetingService;
|
private IPayMeetingService payMeetingService;
|
||||||
@Resource
|
@Resource
|
||||||
private ISysBaseAPI sysBaseApi;
|
private ISysBaseAPI sysBaseAPI;
|
||||||
@Resource
|
@Resource
|
||||||
private IPayMeetingHotelContactsService meetingHotelContactsService;
|
private IPayMeetingHotelContactsService meetingHotelContactsService;
|
||||||
@Resource
|
@Resource
|
||||||
@@ -114,8 +114,8 @@ public class CommitteeMeetingController extends JeroController<PayMeeting, IPayM
|
|||||||
IPage<PayMeeting> pageList = payMeetingService.page(page, queryWrapper);
|
IPage<PayMeeting> pageList = payMeetingService.page(page, queryWrapper);
|
||||||
for (PayMeeting meeting : pageList.getRecords()) {
|
for (PayMeeting meeting : pageList.getRecords()) {
|
||||||
//查询会议负责人
|
//查询会议负责人
|
||||||
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
|
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
|
||||||
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
|
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
|
||||||
String departName = departNamesByUsername.get(0);
|
String departName = departNamesByUsername.get(0);
|
||||||
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
|
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
|
||||||
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
|
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
|
||||||
@@ -213,15 +213,15 @@ public class CommitteeMeetingController extends JeroController<PayMeeting, IPayM
|
|||||||
return Result.error("未找到对应数据");
|
return Result.error("未找到对应数据");
|
||||||
}
|
}
|
||||||
//查询会议负责人
|
//查询会议负责人
|
||||||
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
|
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
|
||||||
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
|
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
|
||||||
String departName = departNamesByUsername.get(0);
|
String departName = departNamesByUsername.get(0);
|
||||||
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
|
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
|
||||||
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
|
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
|
||||||
PayMeetingVO payMeetingVO = new PayMeetingVO();
|
PayMeetingVO payMeetingVO = new PayMeetingVO();
|
||||||
BeanUtils.copyProperties(meeting, payMeetingVO);
|
BeanUtils.copyProperties(meeting, payMeetingVO);
|
||||||
String meetingType = meeting.getMeetingType().toString();
|
String meetingType = meeting.getMeetingType().toString();
|
||||||
//String meetingType1 = sysBaseApi.translateDict("meeting_type", meetingType);
|
//String meetingType1 = sysBaseAPI.translateDict("meeting_type", meetingType);
|
||||||
payMeetingVO.setMeetingType(meetingType);
|
payMeetingVO.setMeetingType(meetingType);
|
||||||
payMeetingVO.setTbMeetingType(meeting.getMeetingType().toString());
|
payMeetingVO.setTbMeetingType(meeting.getMeetingType().toString());
|
||||||
//payMeetingVO.setHotelContactsList(new ArrayList<>());
|
//payMeetingVO.setHotelContactsList(new ArrayList<>());
|
||||||
@@ -233,7 +233,7 @@ public class CommitteeMeetingController extends JeroController<PayMeeting, IPayM
|
|||||||
payMeetingVO.setHotelContactsList(payMeetingHotelContactsList);
|
payMeetingVO.setHotelContactsList(payMeetingHotelContactsList);
|
||||||
//标协会议类型
|
//标协会议类型
|
||||||
//String tbMeetingType = meeting.getTbMeetingType().toString();
|
//String tbMeetingType = meeting.getTbMeetingType().toString();
|
||||||
//String type = sysBaseApi.translateDict("standard_meeting_type", tbMeetingType);
|
//String type = sysBaseAPI.translateDict("standard_meeting_type", tbMeetingType);
|
||||||
//payMeetingVO.setTbMeetingType(type);
|
//payMeetingVO.setTbMeetingType(type);
|
||||||
// 工作组项目查询工作组项目名
|
// 工作组项目查询工作组项目名
|
||||||
} else if (meetingType.equals(MeetingCommon.WORKING_GROUP_MEETING)) {
|
} else if (meetingType.equals(MeetingCommon.WORKING_GROUP_MEETING)) {
|
||||||
@@ -266,15 +266,15 @@ public class CommitteeMeetingController extends JeroController<PayMeeting, IPayM
|
|||||||
String meetingType = pageList.get(0).getMeetingType().toString();
|
String meetingType = pageList.get(0).getMeetingType().toString();
|
||||||
for (PayMeeting meeting : pageList) {
|
for (PayMeeting meeting : pageList) {
|
||||||
//查询会议负责人
|
//查询会议负责人
|
||||||
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
|
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
|
||||||
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
|
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
|
||||||
String departName = departNamesByUsername.get(0);
|
String departName = departNamesByUsername.get(0);
|
||||||
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
|
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
|
||||||
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
|
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
|
||||||
PayMeetingVO payMeetingVO = new PayMeetingVO();
|
PayMeetingVO payMeetingVO = new PayMeetingVO();
|
||||||
BeanUtils.copyProperties(meeting, payMeetingVO);
|
BeanUtils.copyProperties(meeting, payMeetingVO);
|
||||||
meetingType = meeting.getMeetingType().toString();
|
meetingType = meeting.getMeetingType().toString();
|
||||||
String meetingType1 = sysBaseApi.translateDict("meeting_type", meetingType);
|
String meetingType1 = sysBaseAPI.translateDict("meeting_type", meetingType);
|
||||||
payMeetingVO.setMeetingType(meetingType1);
|
payMeetingVO.setMeetingType(meetingType1);
|
||||||
payMeetingVO.setHotelContactsList(new ArrayList<>());
|
payMeetingVO.setHotelContactsList(new ArrayList<>());
|
||||||
//标协会议查询酒店联系人列表
|
//标协会议查询酒店联系人列表
|
||||||
@@ -286,7 +286,7 @@ public class CommitteeMeetingController extends JeroController<PayMeeting, IPayM
|
|||||||
payMeetingVO.setHotelContactsList(payMeetingHotelContactsList);
|
payMeetingVO.setHotelContactsList(payMeetingHotelContactsList);
|
||||||
//标协会议类型
|
//标协会议类型
|
||||||
String tbMeetingType = meeting.getTbMeetingType().toString();
|
String tbMeetingType = meeting.getTbMeetingType().toString();
|
||||||
String type = sysBaseApi.translateDict("standard_meeting_type", tbMeetingType);
|
String type = sysBaseAPI.translateDict("standard_meeting_type", tbMeetingType);
|
||||||
payMeetingVO.setTbMeetingType(type);
|
payMeetingVO.setTbMeetingType(type);
|
||||||
//保存数据
|
//保存数据
|
||||||
StandardsMeetingExcel standardsMeetingExcel = new StandardsMeetingExcel();
|
StandardsMeetingExcel standardsMeetingExcel = new StandardsMeetingExcel();
|
||||||
|
|||||||
+11
-11
@@ -68,7 +68,7 @@ public class InternalMeetingController extends JeroController<PayMeeting, IPayMe
|
|||||||
@Resource
|
@Resource
|
||||||
private IPayMeetingService payMeetingService;
|
private IPayMeetingService payMeetingService;
|
||||||
@Resource
|
@Resource
|
||||||
private ISysBaseAPI sysBaseApi;
|
private ISysBaseAPI sysBaseAPI;
|
||||||
@Resource
|
@Resource
|
||||||
private IPayMeetingHotelContactsService meetingHotelContactsService;
|
private IPayMeetingHotelContactsService meetingHotelContactsService;
|
||||||
@Resource
|
@Resource
|
||||||
@@ -114,8 +114,8 @@ public class InternalMeetingController extends JeroController<PayMeeting, IPayMe
|
|||||||
IPage<PayMeeting> pageList = payMeetingService.page(page, queryWrapper);
|
IPage<PayMeeting> pageList = payMeetingService.page(page, queryWrapper);
|
||||||
for (PayMeeting meeting : pageList.getRecords()) {
|
for (PayMeeting meeting : pageList.getRecords()) {
|
||||||
//查询会议负责人
|
//查询会议负责人
|
||||||
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
|
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
|
||||||
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
|
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
|
||||||
String departName = departNamesByUsername.get(0);
|
String departName = departNamesByUsername.get(0);
|
||||||
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
|
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
|
||||||
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
|
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
|
||||||
@@ -213,15 +213,15 @@ public class InternalMeetingController extends JeroController<PayMeeting, IPayMe
|
|||||||
return Result.error("未找到对应数据");
|
return Result.error("未找到对应数据");
|
||||||
}
|
}
|
||||||
//查询会议负责人
|
//查询会议负责人
|
||||||
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
|
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
|
||||||
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
|
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
|
||||||
String departName = departNamesByUsername.get(0);
|
String departName = departNamesByUsername.get(0);
|
||||||
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
|
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
|
||||||
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
|
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
|
||||||
PayMeetingVO payMeetingVO = new PayMeetingVO();
|
PayMeetingVO payMeetingVO = new PayMeetingVO();
|
||||||
BeanUtils.copyProperties(meeting, payMeetingVO);
|
BeanUtils.copyProperties(meeting, payMeetingVO);
|
||||||
String meetingType = meeting.getMeetingType().toString();
|
String meetingType = meeting.getMeetingType().toString();
|
||||||
//String meetingType1 = sysBaseApi.translateDict("meeting_type", meetingType);
|
//String meetingType1 = sysBaseAPI.translateDict("meeting_type", meetingType);
|
||||||
payMeetingVO.setMeetingType(meetingType);
|
payMeetingVO.setMeetingType(meetingType);
|
||||||
payMeetingVO.setTbMeetingType(meeting.getMeetingType().toString());
|
payMeetingVO.setTbMeetingType(meeting.getMeetingType().toString());
|
||||||
//payMeetingVO.setHotelContactsList(new ArrayList<>());
|
//payMeetingVO.setHotelContactsList(new ArrayList<>());
|
||||||
@@ -233,7 +233,7 @@ public class InternalMeetingController extends JeroController<PayMeeting, IPayMe
|
|||||||
payMeetingVO.setHotelContactsList(payMeetingHotelContactsList);
|
payMeetingVO.setHotelContactsList(payMeetingHotelContactsList);
|
||||||
//标协会议类型
|
//标协会议类型
|
||||||
//String tbMeetingType = meeting.getTbMeetingType().toString();
|
//String tbMeetingType = meeting.getTbMeetingType().toString();
|
||||||
//String type = sysBaseApi.translateDict("standard_meeting_type", tbMeetingType);
|
//String type = sysBaseAPI.translateDict("standard_meeting_type", tbMeetingType);
|
||||||
//payMeetingVO.setTbMeetingType(type);
|
//payMeetingVO.setTbMeetingType(type);
|
||||||
// 工作组项目查询工作组项目名
|
// 工作组项目查询工作组项目名
|
||||||
} else if (meetingType.equals(MeetingCommon.WORKING_GROUP_MEETING)) {
|
} else if (meetingType.equals(MeetingCommon.WORKING_GROUP_MEETING)) {
|
||||||
@@ -266,15 +266,15 @@ public class InternalMeetingController extends JeroController<PayMeeting, IPayMe
|
|||||||
String meetingType = pageList.get(0).getMeetingType().toString();
|
String meetingType = pageList.get(0).getMeetingType().toString();
|
||||||
for (PayMeeting meeting : pageList) {
|
for (PayMeeting meeting : pageList) {
|
||||||
//查询会议负责人
|
//查询会议负责人
|
||||||
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
|
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
|
||||||
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
|
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
|
||||||
String departName = departNamesByUsername.get(0);
|
String departName = departNamesByUsername.get(0);
|
||||||
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
|
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
|
||||||
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
|
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
|
||||||
PayMeetingVO payMeetingVO = new PayMeetingVO();
|
PayMeetingVO payMeetingVO = new PayMeetingVO();
|
||||||
BeanUtils.copyProperties(meeting, payMeetingVO);
|
BeanUtils.copyProperties(meeting, payMeetingVO);
|
||||||
meetingType = meeting.getMeetingType().toString();
|
meetingType = meeting.getMeetingType().toString();
|
||||||
String meetingType1 = sysBaseApi.translateDict("meeting_type", meetingType);
|
String meetingType1 = sysBaseAPI.translateDict("meeting_type", meetingType);
|
||||||
payMeetingVO.setMeetingType(meetingType1);
|
payMeetingVO.setMeetingType(meetingType1);
|
||||||
payMeetingVO.setHotelContactsList(new ArrayList<>());
|
payMeetingVO.setHotelContactsList(new ArrayList<>());
|
||||||
//标协会议查询酒店联系人列表
|
//标协会议查询酒店联系人列表
|
||||||
@@ -286,7 +286,7 @@ public class InternalMeetingController extends JeroController<PayMeeting, IPayMe
|
|||||||
payMeetingVO.setHotelContactsList(payMeetingHotelContactsList);
|
payMeetingVO.setHotelContactsList(payMeetingHotelContactsList);
|
||||||
//标协会议类型
|
//标协会议类型
|
||||||
String tbMeetingType = meeting.getTbMeetingType().toString();
|
String tbMeetingType = meeting.getTbMeetingType().toString();
|
||||||
String type = sysBaseApi.translateDict("standard_meeting_type", tbMeetingType);
|
String type = sysBaseAPI.translateDict("standard_meeting_type", tbMeetingType);
|
||||||
payMeetingVO.setTbMeetingType(type);
|
payMeetingVO.setTbMeetingType(type);
|
||||||
//保存数据
|
//保存数据
|
||||||
StandardsMeetingExcel standardsMeetingExcel = new StandardsMeetingExcel();
|
StandardsMeetingExcel standardsMeetingExcel = new StandardsMeetingExcel();
|
||||||
|
|||||||
+11
-11
@@ -68,7 +68,7 @@ public class OtherMeetingController extends JeroController<PayMeeting, IPayMeeti
|
|||||||
@Resource
|
@Resource
|
||||||
private IPayMeetingService payMeetingService;
|
private IPayMeetingService payMeetingService;
|
||||||
@Resource
|
@Resource
|
||||||
private ISysBaseAPI sysBaseApi;
|
private ISysBaseAPI sysBaseAPI;
|
||||||
@Resource
|
@Resource
|
||||||
private IPayMeetingHotelContactsService meetingHotelContactsService;
|
private IPayMeetingHotelContactsService meetingHotelContactsService;
|
||||||
@Resource
|
@Resource
|
||||||
@@ -114,8 +114,8 @@ public class OtherMeetingController extends JeroController<PayMeeting, IPayMeeti
|
|||||||
IPage<PayMeeting> pageList = payMeetingService.page(page, queryWrapper);
|
IPage<PayMeeting> pageList = payMeetingService.page(page, queryWrapper);
|
||||||
for (PayMeeting meeting : pageList.getRecords()) {
|
for (PayMeeting meeting : pageList.getRecords()) {
|
||||||
//查询会议负责人
|
//查询会议负责人
|
||||||
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
|
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
|
||||||
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
|
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
|
||||||
String departName = departNamesByUsername.get(0);
|
String departName = departNamesByUsername.get(0);
|
||||||
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
|
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
|
||||||
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
|
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
|
||||||
@@ -213,15 +213,15 @@ public class OtherMeetingController extends JeroController<PayMeeting, IPayMeeti
|
|||||||
return Result.error("未找到对应数据");
|
return Result.error("未找到对应数据");
|
||||||
}
|
}
|
||||||
//查询会议负责人
|
//查询会议负责人
|
||||||
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
|
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
|
||||||
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
|
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
|
||||||
String departName = departNamesByUsername.get(0);
|
String departName = departNamesByUsername.get(0);
|
||||||
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
|
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
|
||||||
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
|
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
|
||||||
PayMeetingVO payMeetingVO = new PayMeetingVO();
|
PayMeetingVO payMeetingVO = new PayMeetingVO();
|
||||||
BeanUtils.copyProperties(meeting, payMeetingVO);
|
BeanUtils.copyProperties(meeting, payMeetingVO);
|
||||||
String meetingType = meeting.getMeetingType().toString();
|
String meetingType = meeting.getMeetingType().toString();
|
||||||
//String meetingType1 = sysBaseApi.translateDict("meeting_type", meetingType);
|
//String meetingType1 = sysBaseAPI.translateDict("meeting_type", meetingType);
|
||||||
payMeetingVO.setMeetingType(meetingType);
|
payMeetingVO.setMeetingType(meetingType);
|
||||||
payMeetingVO.setTbMeetingType(meeting.getMeetingType().toString());
|
payMeetingVO.setTbMeetingType(meeting.getMeetingType().toString());
|
||||||
//payMeetingVO.setHotelContactsList(new ArrayList<>());
|
//payMeetingVO.setHotelContactsList(new ArrayList<>());
|
||||||
@@ -233,7 +233,7 @@ public class OtherMeetingController extends JeroController<PayMeeting, IPayMeeti
|
|||||||
payMeetingVO.setHotelContactsList(payMeetingHotelContactsList);
|
payMeetingVO.setHotelContactsList(payMeetingHotelContactsList);
|
||||||
//标协会议类型
|
//标协会议类型
|
||||||
//String tbMeetingType = meeting.getTbMeetingType().toString();
|
//String tbMeetingType = meeting.getTbMeetingType().toString();
|
||||||
//String type = sysBaseApi.translateDict("standard_meeting_type", tbMeetingType);
|
//String type = sysBaseAPI.translateDict("standard_meeting_type", tbMeetingType);
|
||||||
//payMeetingVO.setTbMeetingType(type);
|
//payMeetingVO.setTbMeetingType(type);
|
||||||
// 工作组项目查询工作组项目名
|
// 工作组项目查询工作组项目名
|
||||||
} else if (meetingType.equals(MeetingCommon.WORKING_GROUP_MEETING)) {
|
} else if (meetingType.equals(MeetingCommon.WORKING_GROUP_MEETING)) {
|
||||||
@@ -266,15 +266,15 @@ public class OtherMeetingController extends JeroController<PayMeeting, IPayMeeti
|
|||||||
String meetingType = pageList.get(0).getMeetingType().toString();
|
String meetingType = pageList.get(0).getMeetingType().toString();
|
||||||
for (PayMeeting meeting : pageList) {
|
for (PayMeeting meeting : pageList) {
|
||||||
//查询会议负责人
|
//查询会议负责人
|
||||||
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
|
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
|
||||||
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
|
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
|
||||||
String departName = departNamesByUsername.get(0);
|
String departName = departNamesByUsername.get(0);
|
||||||
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
|
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
|
||||||
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
|
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
|
||||||
PayMeetingVO payMeetingVO = new PayMeetingVO();
|
PayMeetingVO payMeetingVO = new PayMeetingVO();
|
||||||
BeanUtils.copyProperties(meeting, payMeetingVO);
|
BeanUtils.copyProperties(meeting, payMeetingVO);
|
||||||
meetingType = meeting.getMeetingType().toString();
|
meetingType = meeting.getMeetingType().toString();
|
||||||
String meetingType1 = sysBaseApi.translateDict("meeting_type", meetingType);
|
String meetingType1 = sysBaseAPI.translateDict("meeting_type", meetingType);
|
||||||
payMeetingVO.setMeetingType(meetingType1);
|
payMeetingVO.setMeetingType(meetingType1);
|
||||||
payMeetingVO.setHotelContactsList(new ArrayList<>());
|
payMeetingVO.setHotelContactsList(new ArrayList<>());
|
||||||
//标协会议查询酒店联系人列表
|
//标协会议查询酒店联系人列表
|
||||||
@@ -286,7 +286,7 @@ public class OtherMeetingController extends JeroController<PayMeeting, IPayMeeti
|
|||||||
payMeetingVO.setHotelContactsList(payMeetingHotelContactsList);
|
payMeetingVO.setHotelContactsList(payMeetingHotelContactsList);
|
||||||
//标协会议类型
|
//标协会议类型
|
||||||
String tbMeetingType = meeting.getTbMeetingType().toString();
|
String tbMeetingType = meeting.getTbMeetingType().toString();
|
||||||
String type = sysBaseApi.translateDict("standard_meeting_type", tbMeetingType);
|
String type = sysBaseAPI.translateDict("standard_meeting_type", tbMeetingType);
|
||||||
payMeetingVO.setTbMeetingType(type);
|
payMeetingVO.setTbMeetingType(type);
|
||||||
//保存数据
|
//保存数据
|
||||||
StandardsMeetingExcel standardsMeetingExcel = new StandardsMeetingExcel();
|
StandardsMeetingExcel standardsMeetingExcel = new StandardsMeetingExcel();
|
||||||
|
|||||||
+12
-12
@@ -72,7 +72,7 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
|
|||||||
@Resource
|
@Resource
|
||||||
private IPayMeetingService payMeetingService;
|
private IPayMeetingService payMeetingService;
|
||||||
@Resource
|
@Resource
|
||||||
private ISysBaseAPI sysBaseApi;
|
private ISysBaseAPI sysBaseAPI;
|
||||||
@Resource
|
@Resource
|
||||||
private IPayMeetingHotelContactsService meetingHotelContactsService;
|
private IPayMeetingHotelContactsService meetingHotelContactsService;
|
||||||
@Resource
|
@Resource
|
||||||
@@ -119,7 +119,7 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
|
|||||||
IPage<PayMeeting> pageList = payMeetingService.page(page, queryWrapper);
|
IPage<PayMeeting> pageList = payMeetingService.page(page, queryWrapper);
|
||||||
for (PayMeeting meeting : pageList.getRecords()) {
|
for (PayMeeting meeting : pageList.getRecords()) {
|
||||||
//查询会议负责人
|
//查询会议负责人
|
||||||
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
|
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
|
||||||
meeting.setDirectorName(user.getRealname());
|
meeting.setDirectorName(user.getRealname());
|
||||||
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
|
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
|
||||||
PayMeetingVO payMeetingVO = new PayMeetingVO();
|
PayMeetingVO payMeetingVO = new PayMeetingVO();
|
||||||
@@ -211,8 +211,8 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
|
|||||||
IPage<PayMeeting> pageList = payMeetingService.pageListContract(page, queryWrapper, now);
|
IPage<PayMeeting> pageList = payMeetingService.pageListContract(page, queryWrapper, now);
|
||||||
for (PayMeeting meeting : pageList.getRecords()) {
|
for (PayMeeting meeting : pageList.getRecords()) {
|
||||||
//查询会议负责人
|
//查询会议负责人
|
||||||
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
|
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
|
||||||
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
|
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
|
||||||
String departName = departNamesByUsername.get(0);
|
String departName = departNamesByUsername.get(0);
|
||||||
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
|
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
|
||||||
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
|
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
|
||||||
@@ -303,15 +303,15 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
|
|||||||
return Result.error("未找到对应数据");
|
return Result.error("未找到对应数据");
|
||||||
}
|
}
|
||||||
//查询会议负责人
|
//查询会议负责人
|
||||||
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
|
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
|
||||||
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
|
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
|
||||||
String departName = departNamesByUsername.get(0);
|
String departName = departNamesByUsername.get(0);
|
||||||
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
|
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
|
||||||
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
|
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
|
||||||
PayMeetingVO payMeetingVO = new PayMeetingVO();
|
PayMeetingVO payMeetingVO = new PayMeetingVO();
|
||||||
BeanUtils.copyProperties(meeting, payMeetingVO);
|
BeanUtils.copyProperties(meeting, payMeetingVO);
|
||||||
String meetingType = meeting.getMeetingType().toString();
|
String meetingType = meeting.getMeetingType().toString();
|
||||||
//String meetingType1 = sysBaseApi.translateDict("meeting_type", meetingType);
|
//String meetingType1 = sysBaseAPI.translateDict("meeting_type", meetingType);
|
||||||
payMeetingVO.setMeetingType(meetingType);
|
payMeetingVO.setMeetingType(meetingType);
|
||||||
payMeetingVO.setTbMeetingType(meeting.getMeetingType().toString());
|
payMeetingVO.setTbMeetingType(meeting.getMeetingType().toString());
|
||||||
//payMeetingVO.setHotelContactsList(new ArrayList<>());
|
//payMeetingVO.setHotelContactsList(new ArrayList<>());
|
||||||
@@ -323,7 +323,7 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
|
|||||||
payMeetingVO.setHotelContactsList(payMeetingHotelContactsList);
|
payMeetingVO.setHotelContactsList(payMeetingHotelContactsList);
|
||||||
//标协会议类型
|
//标协会议类型
|
||||||
//String tbMeetingType = meeting.getTbMeetingType().toString();
|
//String tbMeetingType = meeting.getTbMeetingType().toString();
|
||||||
//String type = sysBaseApi.translateDict("standard_meeting_type", tbMeetingType);
|
//String type = sysBaseAPI.translateDict("standard_meeting_type", tbMeetingType);
|
||||||
//payMeetingVO.setTbMeetingType(type);
|
//payMeetingVO.setTbMeetingType(type);
|
||||||
// 工作组项目查询工作组项目名
|
// 工作组项目查询工作组项目名
|
||||||
} else if (meetingType.equals(MeetingCommon.WORKING_GROUP_MEETING)) {
|
} else if (meetingType.equals(MeetingCommon.WORKING_GROUP_MEETING)) {
|
||||||
@@ -355,15 +355,15 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
|
|||||||
String meetingType = pageList.get(0).getMeetingType().toString();
|
String meetingType = pageList.get(0).getMeetingType().toString();
|
||||||
for (PayMeeting meeting : pageList) {
|
for (PayMeeting meeting : pageList) {
|
||||||
//查询会议负责人
|
//查询会议负责人
|
||||||
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
|
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
|
||||||
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
|
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
|
||||||
String departName = departNamesByUsername.get(0);
|
String departName = departNamesByUsername.get(0);
|
||||||
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
|
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
|
||||||
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
|
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
|
||||||
PayMeetingVO payMeetingVO = new PayMeetingVO();
|
PayMeetingVO payMeetingVO = new PayMeetingVO();
|
||||||
BeanUtils.copyProperties(meeting, payMeetingVO);
|
BeanUtils.copyProperties(meeting, payMeetingVO);
|
||||||
meetingType = meeting.getMeetingType().toString();
|
meetingType = meeting.getMeetingType().toString();
|
||||||
String meetingType1 = sysBaseApi.translateDict("meeting_type", meetingType);
|
String meetingType1 = sysBaseAPI.translateDict("meeting_type", meetingType);
|
||||||
payMeetingVO.setMeetingType(meetingType1);
|
payMeetingVO.setMeetingType(meetingType1);
|
||||||
payMeetingVO.setHotelContactsList(new ArrayList<>());
|
payMeetingVO.setHotelContactsList(new ArrayList<>());
|
||||||
//标协会议查询酒店联系人列表
|
//标协会议查询酒店联系人列表
|
||||||
@@ -375,7 +375,7 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
|
|||||||
payMeetingVO.setHotelContactsList(payMeetingHotelContactsList);
|
payMeetingVO.setHotelContactsList(payMeetingHotelContactsList);
|
||||||
//标协会议类型
|
//标协会议类型
|
||||||
String tbMeetingType = meeting.getTbMeetingType().toString();
|
String tbMeetingType = meeting.getTbMeetingType().toString();
|
||||||
String type = sysBaseApi.translateDict("standard_meeting_type", tbMeetingType);
|
String type = sysBaseAPI.translateDict("standard_meeting_type", tbMeetingType);
|
||||||
payMeetingVO.setTbMeetingType(type);
|
payMeetingVO.setTbMeetingType(type);
|
||||||
//保存数据
|
//保存数据
|
||||||
StandardsMeetingExcel standardsMeetingExcel = new StandardsMeetingExcel();
|
StandardsMeetingExcel standardsMeetingExcel = new StandardsMeetingExcel();
|
||||||
|
|||||||
+11
-11
@@ -68,7 +68,7 @@ public class StandardsMeetingController extends JeroController<PayMeeting, IPayM
|
|||||||
@Resource
|
@Resource
|
||||||
private IPayMeetingService payMeetingService;
|
private IPayMeetingService payMeetingService;
|
||||||
@Resource
|
@Resource
|
||||||
private ISysBaseAPI sysBaseApi;
|
private ISysBaseAPI sysBaseAPI;
|
||||||
@Resource
|
@Resource
|
||||||
private IPayMeetingHotelContactsService meetingHotelContactsService;
|
private IPayMeetingHotelContactsService meetingHotelContactsService;
|
||||||
@Resource
|
@Resource
|
||||||
@@ -114,8 +114,8 @@ public class StandardsMeetingController extends JeroController<PayMeeting, IPayM
|
|||||||
IPage<PayMeeting> pageList = payMeetingService.page(page, queryWrapper);
|
IPage<PayMeeting> pageList = payMeetingService.page(page, queryWrapper);
|
||||||
for (PayMeeting meeting : pageList.getRecords()) {
|
for (PayMeeting meeting : pageList.getRecords()) {
|
||||||
//查询会议负责人
|
//查询会议负责人
|
||||||
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
|
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
|
||||||
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
|
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
|
||||||
String departName = departNamesByUsername.get(0);
|
String departName = departNamesByUsername.get(0);
|
||||||
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
|
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
|
||||||
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
|
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
|
||||||
@@ -213,15 +213,15 @@ public class StandardsMeetingController extends JeroController<PayMeeting, IPayM
|
|||||||
return Result.error("未找到对应数据");
|
return Result.error("未找到对应数据");
|
||||||
}
|
}
|
||||||
//查询会议负责人
|
//查询会议负责人
|
||||||
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
|
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
|
||||||
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
|
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
|
||||||
String departName = departNamesByUsername.get(0);
|
String departName = departNamesByUsername.get(0);
|
||||||
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
|
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
|
||||||
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
|
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
|
||||||
PayMeetingVO payMeetingVO = new PayMeetingVO();
|
PayMeetingVO payMeetingVO = new PayMeetingVO();
|
||||||
BeanUtils.copyProperties(meeting, payMeetingVO);
|
BeanUtils.copyProperties(meeting, payMeetingVO);
|
||||||
String meetingType = meeting.getMeetingType().toString();
|
String meetingType = meeting.getMeetingType().toString();
|
||||||
//String meetingType1 = sysBaseApi.translateDict("meeting_type", meetingType);
|
//String meetingType1 = sysBaseAPI.translateDict("meeting_type", meetingType);
|
||||||
payMeetingVO.setMeetingType(meetingType);
|
payMeetingVO.setMeetingType(meetingType);
|
||||||
payMeetingVO.setTbMeetingType(meeting.getMeetingType().toString());
|
payMeetingVO.setTbMeetingType(meeting.getMeetingType().toString());
|
||||||
//payMeetingVO.setHotelContactsList(new ArrayList<>());
|
//payMeetingVO.setHotelContactsList(new ArrayList<>());
|
||||||
@@ -233,7 +233,7 @@ public class StandardsMeetingController extends JeroController<PayMeeting, IPayM
|
|||||||
payMeetingVO.setHotelContactsList(payMeetingHotelContactsList);
|
payMeetingVO.setHotelContactsList(payMeetingHotelContactsList);
|
||||||
//标协会议类型
|
//标协会议类型
|
||||||
//String tbMeetingType = meeting.getTbMeetingType().toString();
|
//String tbMeetingType = meeting.getTbMeetingType().toString();
|
||||||
//String type = sysBaseApi.translateDict("standard_meeting_type", tbMeetingType);
|
//String type = sysBaseAPI.translateDict("standard_meeting_type", tbMeetingType);
|
||||||
//payMeetingVO.setTbMeetingType(type);
|
//payMeetingVO.setTbMeetingType(type);
|
||||||
// 工作组项目查询工作组项目名
|
// 工作组项目查询工作组项目名
|
||||||
} else if (meetingType.equals(MeetingCommon.WORKING_GROUP_MEETING)) {
|
} else if (meetingType.equals(MeetingCommon.WORKING_GROUP_MEETING)) {
|
||||||
@@ -266,15 +266,15 @@ public class StandardsMeetingController extends JeroController<PayMeeting, IPayM
|
|||||||
String meetingType = pageList.get(0).getMeetingType().toString();
|
String meetingType = pageList.get(0).getMeetingType().toString();
|
||||||
for (PayMeeting meeting : pageList) {
|
for (PayMeeting meeting : pageList) {
|
||||||
//查询会议负责人
|
//查询会议负责人
|
||||||
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
|
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
|
||||||
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
|
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
|
||||||
String departName = departNamesByUsername.get(0);
|
String departName = departNamesByUsername.get(0);
|
||||||
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
|
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
|
||||||
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
|
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
|
||||||
PayMeetingVO payMeetingVO = new PayMeetingVO();
|
PayMeetingVO payMeetingVO = new PayMeetingVO();
|
||||||
BeanUtils.copyProperties(meeting, payMeetingVO);
|
BeanUtils.copyProperties(meeting, payMeetingVO);
|
||||||
meetingType = meeting.getMeetingType().toString();
|
meetingType = meeting.getMeetingType().toString();
|
||||||
String meetingType1 = sysBaseApi.translateDict("meeting_type", meetingType);
|
String meetingType1 = sysBaseAPI.translateDict("meeting_type", meetingType);
|
||||||
payMeetingVO.setMeetingType(meetingType1);
|
payMeetingVO.setMeetingType(meetingType1);
|
||||||
payMeetingVO.setHotelContactsList(new ArrayList<>());
|
payMeetingVO.setHotelContactsList(new ArrayList<>());
|
||||||
//标协会议查询酒店联系人列表
|
//标协会议查询酒店联系人列表
|
||||||
@@ -286,7 +286,7 @@ public class StandardsMeetingController extends JeroController<PayMeeting, IPayM
|
|||||||
payMeetingVO.setHotelContactsList(payMeetingHotelContactsList);
|
payMeetingVO.setHotelContactsList(payMeetingHotelContactsList);
|
||||||
//标协会议类型
|
//标协会议类型
|
||||||
String tbMeetingType = meeting.getTbMeetingType().toString();
|
String tbMeetingType = meeting.getTbMeetingType().toString();
|
||||||
String type = sysBaseApi.translateDict("standard_meeting_type", tbMeetingType);
|
String type = sysBaseAPI.translateDict("standard_meeting_type", tbMeetingType);
|
||||||
payMeetingVO.setTbMeetingType(type);
|
payMeetingVO.setTbMeetingType(type);
|
||||||
//保存数据
|
//保存数据
|
||||||
StandardsMeetingExcel standardsMeetingExcel = new StandardsMeetingExcel();
|
StandardsMeetingExcel standardsMeetingExcel = new StandardsMeetingExcel();
|
||||||
|
|||||||
+11
-11
@@ -68,7 +68,7 @@ public class WorkGroupMeetingController extends JeroController<PayMeeting, IPayM
|
|||||||
@Resource
|
@Resource
|
||||||
private IPayMeetingService payMeetingService;
|
private IPayMeetingService payMeetingService;
|
||||||
@Resource
|
@Resource
|
||||||
private ISysBaseAPI sysBaseApi;
|
private ISysBaseAPI sysBaseAPI;
|
||||||
@Resource
|
@Resource
|
||||||
private IPayMeetingHotelContactsService meetingHotelContactsService;
|
private IPayMeetingHotelContactsService meetingHotelContactsService;
|
||||||
@Resource
|
@Resource
|
||||||
@@ -114,8 +114,8 @@ public class WorkGroupMeetingController extends JeroController<PayMeeting, IPayM
|
|||||||
IPage<PayMeeting> pageList = payMeetingService.page(page, queryWrapper);
|
IPage<PayMeeting> pageList = payMeetingService.page(page, queryWrapper);
|
||||||
for (PayMeeting meeting : pageList.getRecords()) {
|
for (PayMeeting meeting : pageList.getRecords()) {
|
||||||
//查询会议负责人
|
//查询会议负责人
|
||||||
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
|
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
|
||||||
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
|
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
|
||||||
String departName = departNamesByUsername.get(0);
|
String departName = departNamesByUsername.get(0);
|
||||||
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
|
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
|
||||||
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
|
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
|
||||||
@@ -213,15 +213,15 @@ public class WorkGroupMeetingController extends JeroController<PayMeeting, IPayM
|
|||||||
return Result.error("未找到对应数据");
|
return Result.error("未找到对应数据");
|
||||||
}
|
}
|
||||||
//查询会议负责人
|
//查询会议负责人
|
||||||
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
|
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
|
||||||
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
|
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
|
||||||
String departName = departNamesByUsername.get(0);
|
String departName = departNamesByUsername.get(0);
|
||||||
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
|
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
|
||||||
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
|
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
|
||||||
PayMeetingVO payMeetingVO = new PayMeetingVO();
|
PayMeetingVO payMeetingVO = new PayMeetingVO();
|
||||||
BeanUtils.copyProperties(meeting, payMeetingVO);
|
BeanUtils.copyProperties(meeting, payMeetingVO);
|
||||||
String meetingType = meeting.getMeetingType().toString();
|
String meetingType = meeting.getMeetingType().toString();
|
||||||
//String meetingType1 = sysBaseApi.translateDict("meeting_type", meetingType);
|
//String meetingType1 = sysBaseAPI.translateDict("meeting_type", meetingType);
|
||||||
payMeetingVO.setMeetingType(meetingType);
|
payMeetingVO.setMeetingType(meetingType);
|
||||||
payMeetingVO.setTbMeetingType(meeting.getMeetingType().toString());
|
payMeetingVO.setTbMeetingType(meeting.getMeetingType().toString());
|
||||||
//payMeetingVO.setHotelContactsList(new ArrayList<>());
|
//payMeetingVO.setHotelContactsList(new ArrayList<>());
|
||||||
@@ -233,7 +233,7 @@ public class WorkGroupMeetingController extends JeroController<PayMeeting, IPayM
|
|||||||
payMeetingVO.setHotelContactsList(payMeetingHotelContactsList);
|
payMeetingVO.setHotelContactsList(payMeetingHotelContactsList);
|
||||||
//标协会议类型
|
//标协会议类型
|
||||||
//String tbMeetingType = meeting.getTbMeetingType().toString();
|
//String tbMeetingType = meeting.getTbMeetingType().toString();
|
||||||
//String type = sysBaseApi.translateDict("standard_meeting_type", tbMeetingType);
|
//String type = sysBaseAPI.translateDict("standard_meeting_type", tbMeetingType);
|
||||||
//payMeetingVO.setTbMeetingType(type);
|
//payMeetingVO.setTbMeetingType(type);
|
||||||
// 工作组项目查询工作组项目名
|
// 工作组项目查询工作组项目名
|
||||||
} else if (meetingType.equals(MeetingCommon.WORKING_GROUP_MEETING)) {
|
} else if (meetingType.equals(MeetingCommon.WORKING_GROUP_MEETING)) {
|
||||||
@@ -266,15 +266,15 @@ public class WorkGroupMeetingController extends JeroController<PayMeeting, IPayM
|
|||||||
String meetingType = pageList.get(0).getMeetingType().toString();
|
String meetingType = pageList.get(0).getMeetingType().toString();
|
||||||
for (PayMeeting meeting : pageList) {
|
for (PayMeeting meeting : pageList) {
|
||||||
//查询会议负责人
|
//查询会议负责人
|
||||||
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
|
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
|
||||||
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
|
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
|
||||||
String departName = departNamesByUsername.get(0);
|
String departName = departNamesByUsername.get(0);
|
||||||
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
|
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
|
||||||
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
|
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
|
||||||
PayMeetingVO payMeetingVO = new PayMeetingVO();
|
PayMeetingVO payMeetingVO = new PayMeetingVO();
|
||||||
BeanUtils.copyProperties(meeting, payMeetingVO);
|
BeanUtils.copyProperties(meeting, payMeetingVO);
|
||||||
meetingType = meeting.getMeetingType().toString();
|
meetingType = meeting.getMeetingType().toString();
|
||||||
String meetingType1 = sysBaseApi.translateDict("meeting_type", meetingType);
|
String meetingType1 = sysBaseAPI.translateDict("meeting_type", meetingType);
|
||||||
payMeetingVO.setMeetingType(meetingType1);
|
payMeetingVO.setMeetingType(meetingType1);
|
||||||
payMeetingVO.setHotelContactsList(new ArrayList<>());
|
payMeetingVO.setHotelContactsList(new ArrayList<>());
|
||||||
//标协会议查询酒店联系人列表
|
//标协会议查询酒店联系人列表
|
||||||
@@ -286,7 +286,7 @@ public class WorkGroupMeetingController extends JeroController<PayMeeting, IPayM
|
|||||||
payMeetingVO.setHotelContactsList(payMeetingHotelContactsList);
|
payMeetingVO.setHotelContactsList(payMeetingHotelContactsList);
|
||||||
//标协会议类型
|
//标协会议类型
|
||||||
String tbMeetingType = meeting.getTbMeetingType().toString();
|
String tbMeetingType = meeting.getTbMeetingType().toString();
|
||||||
String type = sysBaseApi.translateDict("standard_meeting_type", tbMeetingType);
|
String type = sysBaseAPI.translateDict("standard_meeting_type", tbMeetingType);
|
||||||
payMeetingVO.setTbMeetingType(type);
|
payMeetingVO.setTbMeetingType(type);
|
||||||
//保存数据
|
//保存数据
|
||||||
StandardsMeetingExcel standardsMeetingExcel = new StandardsMeetingExcel();
|
StandardsMeetingExcel standardsMeetingExcel = new StandardsMeetingExcel();
|
||||||
|
|||||||
+5
-5
@@ -68,7 +68,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|||||||
@Transactional(rollbackFor = Exception.class)
|
@Transactional(rollbackFor = Exception.class)
|
||||||
public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeeting> implements IPayMeetingService {
|
public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeeting> implements IPayMeetingService {
|
||||||
@Resource
|
@Resource
|
||||||
private ISysBaseAPI sysBaseApi;
|
private ISysBaseAPI sysBaseAPI;
|
||||||
@Resource
|
@Resource
|
||||||
private IPayMeetingHotelContactsService meetingHotelContactsService;
|
private IPayMeetingHotelContactsService meetingHotelContactsService;
|
||||||
@Resource
|
@Resource
|
||||||
@@ -224,7 +224,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
|
|||||||
}
|
}
|
||||||
//判断会议类型
|
//判断会议类型
|
||||||
String meetingType = payMeetingVO.getMeetingType();
|
String meetingType = payMeetingVO.getMeetingType();
|
||||||
String type = sysBaseApi.translateDict("meeting_type", meetingType);
|
String type = sysBaseAPI.translateDict("meeting_type", meetingType);
|
||||||
if (StrUtil.isBlank(type)) {
|
if (StrUtil.isBlank(type)) {
|
||||||
throw new JeroBootException("会议类型不存在");
|
throw new JeroBootException("会议类型不存在");
|
||||||
}else {
|
}else {
|
||||||
@@ -232,7 +232,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
|
|||||||
}
|
}
|
||||||
//判断会议联系人
|
//判断会议联系人
|
||||||
String directorId = payMeetingVO.getDirectorId();
|
String directorId = payMeetingVO.getDirectorId();
|
||||||
LoginUser loginUser = sysBaseApi.getUserById(directorId);
|
LoginUser loginUser = sysBaseAPI.getUserById(directorId);
|
||||||
if (loginUser == null) {
|
if (loginUser == null) {
|
||||||
throw new JeroBootException("会议负责人不存在");
|
throw new JeroBootException("会议负责人不存在");
|
||||||
}else{
|
}else{
|
||||||
@@ -261,7 +261,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
|
|||||||
ValidUtil.validate(payMeetingVO, StandardMeeting.class);
|
ValidUtil.validate(payMeetingVO, StandardMeeting.class);
|
||||||
//标协会议类型
|
//标协会议类型
|
||||||
String tbMeetingType = payMeetingVO.getTbMeetingType();
|
String tbMeetingType = payMeetingVO.getTbMeetingType();
|
||||||
String standardMeetingType = sysBaseApi.translateDict("standard_meeting_type", tbMeetingType);
|
String standardMeetingType = sysBaseAPI.translateDict("standard_meeting_type", tbMeetingType);
|
||||||
if (standardMeetingType == null){
|
if (standardMeetingType == null){
|
||||||
throw new JeroBootException("标协会议类型不存在");
|
throw new JeroBootException("标协会议类型不存在");
|
||||||
}
|
}
|
||||||
@@ -450,7 +450,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
|
|||||||
//发送消息
|
//发送消息
|
||||||
for (PayContactsManagement payContactsManagement : list) {
|
for (PayContactsManagement payContactsManagement : list) {
|
||||||
String directorId = payMeeting.getDirectorId();
|
String directorId = payMeeting.getDirectorId();
|
||||||
LoginUser director = sysBaseApi.getUserById(directorId);
|
LoginUser director = sysBaseAPI.getUserById(directorId);
|
||||||
// 给企业联系人发送消息
|
// 给企业联系人发送消息
|
||||||
String email = payContactsManagement.getEmail();
|
String email = payContactsManagement.getEmail();
|
||||||
String phone = payContactsManagement.getPhone();
|
String phone = payContactsManagement.getPhone();
|
||||||
|
|||||||
Reference in New Issue
Block a user