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

update 更改sysBaseAPI变量名称

Browse Source
This commit is contained in:
lijiarao
2021-10-18 11:54:10 +08:00
parent 48ff242e0c
commit 63a150f78a
7 changed files with 72 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java
+11 -11
View File
@@ -68,7 +68,7 @@ public class CommitteeMeetingController extends JeroController<PayMeeting, IPayM
@Resource
private IPayMeetingService payMeetingService;
@Resource
private ISysBaseAPI sysBaseApi;
private ISysBaseAPI sysBaseAPI;
@Resource
private IPayMeetingHotelContactsService meetingHotelContactsService;
@Resource
@@ -114,8 +114,8 @@ public class CommitteeMeetingController extends JeroController<PayMeeting, IPayM
IPage<PayMeeting> pageList = payMeetingService.page(page, queryWrapper);
for (PayMeeting meeting : pageList.getRecords()) {
//查询会议负责人
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
@@ -213,15 +213,15 @@ public class CommitteeMeetingController extends JeroController<PayMeeting, IPayM
return Result.error("未找到对应数据");
}
//查询会议负责人
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO);
String meetingType = meeting.getMeetingType().toString();
//String meetingType1 = sysBaseApi.translateDict("meeting_type", meetingType);
//String meetingType1 = sysBaseAPI.translateDict("meeting_type", meetingType);
payMeetingVO.setMeetingType(meetingType);
payMeetingVO.setTbMeetingType(meeting.getMeetingType().toString());
//payMeetingVO.setHotelContactsList(new ArrayList<>());
@@ -233,7 +233,7 @@ public class CommitteeMeetingController extends JeroController<PayMeeting, IPayM
payMeetingVO.setHotelContactsList(payMeetingHotelContactsList);
//标协会议类型
//String tbMeetingType = meeting.getTbMeetingType().toString();
//String type = sysBaseApi.translateDict("standard_meeting_type", tbMeetingType);
//String type = sysBaseAPI.translateDict("standard_meeting_type", tbMeetingType);
//payMeetingVO.setTbMeetingType(type);
// 工作组项目查询工作组项目名
} 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();
for (PayMeeting meeting : pageList) {
//查询会议负责人
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO);
meetingType = meeting.getMeetingType().toString();
String meetingType1 = sysBaseApi.translateDict("meeting_type", meetingType);
String meetingType1 = sysBaseAPI.translateDict("meeting_type", meetingType);
payMeetingVO.setMeetingType(meetingType1);
payMeetingVO.setHotelContactsList(new ArrayList<>());
//标协会议查询酒店联系人列表
@@ -286,7 +286,7 @@ public class CommitteeMeetingController extends JeroController<PayMeeting, IPayM
payMeetingVO.setHotelContactsList(payMeetingHotelContactsList);
//标协会议类型
String tbMeetingType = meeting.getTbMeetingType().toString();
String type = sysBaseApi.translateDict("standard_meeting_type", tbMeetingType);
String type = sysBaseAPI.translateDict("standard_meeting_type", tbMeetingType);
payMeetingVO.setTbMeetingType(type);
//保存数据
StandardsMeetingExcel standardsMeetingExcel = new StandardsMeetingExcel();
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java
+11 -11
View File
@@ -68,7 +68,7 @@ public class InternalMeetingController extends JeroController<PayMeeting, IPayMe
@Resource
private IPayMeetingService payMeetingService;
@Resource
private ISysBaseAPI sysBaseApi;
private ISysBaseAPI sysBaseAPI;
@Resource
private IPayMeetingHotelContactsService meetingHotelContactsService;
@Resource
@@ -114,8 +114,8 @@ public class InternalMeetingController extends JeroController<PayMeeting, IPayMe
IPage<PayMeeting> pageList = payMeetingService.page(page, queryWrapper);
for (PayMeeting meeting : pageList.getRecords()) {
//查询会议负责人
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
@@ -213,15 +213,15 @@ public class InternalMeetingController extends JeroController<PayMeeting, IPayMe
return Result.error("未找到对应数据");
}
//查询会议负责人
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO);
String meetingType = meeting.getMeetingType().toString();
//String meetingType1 = sysBaseApi.translateDict("meeting_type", meetingType);
//String meetingType1 = sysBaseAPI.translateDict("meeting_type", meetingType);
payMeetingVO.setMeetingType(meetingType);
payMeetingVO.setTbMeetingType(meeting.getMeetingType().toString());
//payMeetingVO.setHotelContactsList(new ArrayList<>());
@@ -233,7 +233,7 @@ public class InternalMeetingController extends JeroController<PayMeeting, IPayMe
payMeetingVO.setHotelContactsList(payMeetingHotelContactsList);
//标协会议类型
//String tbMeetingType = meeting.getTbMeetingType().toString();
//String type = sysBaseApi.translateDict("standard_meeting_type", tbMeetingType);
//String type = sysBaseAPI.translateDict("standard_meeting_type", tbMeetingType);
//payMeetingVO.setTbMeetingType(type);
// 工作组项目查询工作组项目名
} 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();
for (PayMeeting meeting : pageList) {
//查询会议负责人
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO);
meetingType = meeting.getMeetingType().toString();
String meetingType1 = sysBaseApi.translateDict("meeting_type", meetingType);
String meetingType1 = sysBaseAPI.translateDict("meeting_type", meetingType);
payMeetingVO.setMeetingType(meetingType1);
payMeetingVO.setHotelContactsList(new ArrayList<>());
//标协会议查询酒店联系人列表
@@ -286,7 +286,7 @@ public class InternalMeetingController extends JeroController<PayMeeting, IPayMe
payMeetingVO.setHotelContactsList(payMeetingHotelContactsList);
//标协会议类型
String tbMeetingType = meeting.getTbMeetingType().toString();
String type = sysBaseApi.translateDict("standard_meeting_type", tbMeetingType);
String type = sysBaseAPI.translateDict("standard_meeting_type", tbMeetingType);
payMeetingVO.setTbMeetingType(type);
//保存数据
StandardsMeetingExcel standardsMeetingExcel = new StandardsMeetingExcel();
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java
+11 -11
View File
@@ -68,7 +68,7 @@ public class OtherMeetingController extends JeroController<PayMeeting, IPayMeeti
@Resource
private IPayMeetingService payMeetingService;
@Resource
private ISysBaseAPI sysBaseApi;
private ISysBaseAPI sysBaseAPI;
@Resource
private IPayMeetingHotelContactsService meetingHotelContactsService;
@Resource
@@ -114,8 +114,8 @@ public class OtherMeetingController extends JeroController<PayMeeting, IPayMeeti
IPage<PayMeeting> pageList = payMeetingService.page(page, queryWrapper);
for (PayMeeting meeting : pageList.getRecords()) {
//查询会议负责人
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
@@ -213,15 +213,15 @@ public class OtherMeetingController extends JeroController<PayMeeting, IPayMeeti
return Result.error("未找到对应数据");
}
//查询会议负责人
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO);
String meetingType = meeting.getMeetingType().toString();
//String meetingType1 = sysBaseApi.translateDict("meeting_type", meetingType);
//String meetingType1 = sysBaseAPI.translateDict("meeting_type", meetingType);
payMeetingVO.setMeetingType(meetingType);
payMeetingVO.setTbMeetingType(meeting.getMeetingType().toString());
//payMeetingVO.setHotelContactsList(new ArrayList<>());
@@ -233,7 +233,7 @@ public class OtherMeetingController extends JeroController<PayMeeting, IPayMeeti
payMeetingVO.setHotelContactsList(payMeetingHotelContactsList);
//标协会议类型
//String tbMeetingType = meeting.getTbMeetingType().toString();
//String type = sysBaseApi.translateDict("standard_meeting_type", tbMeetingType);
//String type = sysBaseAPI.translateDict("standard_meeting_type", tbMeetingType);
//payMeetingVO.setTbMeetingType(type);
// 工作组项目查询工作组项目名
} 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();
for (PayMeeting meeting : pageList) {
//查询会议负责人
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO);
meetingType = meeting.getMeetingType().toString();
String meetingType1 = sysBaseApi.translateDict("meeting_type", meetingType);
String meetingType1 = sysBaseAPI.translateDict("meeting_type", meetingType);
payMeetingVO.setMeetingType(meetingType1);
payMeetingVO.setHotelContactsList(new ArrayList<>());
//标协会议查询酒店联系人列表
@@ -286,7 +286,7 @@ public class OtherMeetingController extends JeroController<PayMeeting, IPayMeeti
payMeetingVO.setHotelContactsList(payMeetingHotelContactsList);
//标协会议类型
String tbMeetingType = meeting.getTbMeetingType().toString();
String type = sysBaseApi.translateDict("standard_meeting_type", tbMeetingType);
String type = sysBaseAPI.translateDict("standard_meeting_type", tbMeetingType);
payMeetingVO.setTbMeetingType(type);
//保存数据
StandardsMeetingExcel standardsMeetingExcel = new StandardsMeetingExcel();
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
+12 -12
View File
@@ -72,7 +72,7 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
@Resource
private IPayMeetingService payMeetingService;
@Resource
private ISysBaseAPI sysBaseApi;
private ISysBaseAPI sysBaseAPI;
@Resource
private IPayMeetingHotelContactsService meetingHotelContactsService;
@Resource
@@ -119,7 +119,7 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
IPage<PayMeeting> pageList = payMeetingService.page(page, queryWrapper);
for (PayMeeting meeting : pageList.getRecords()) {
//查询会议负责人
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
meeting.setDirectorName(user.getRealname());
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
@@ -211,8 +211,8 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
IPage<PayMeeting> pageList = payMeetingService.pageListContract(page, queryWrapper, now);
for (PayMeeting meeting : pageList.getRecords()) {
//查询会议负责人
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
@@ -303,15 +303,15 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
return Result.error("未找到对应数据");
}
//查询会议负责人
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO);
String meetingType = meeting.getMeetingType().toString();
//String meetingType1 = sysBaseApi.translateDict("meeting_type", meetingType);
//String meetingType1 = sysBaseAPI.translateDict("meeting_type", meetingType);
payMeetingVO.setMeetingType(meetingType);
payMeetingVO.setTbMeetingType(meeting.getMeetingType().toString());
//payMeetingVO.setHotelContactsList(new ArrayList<>());
@@ -323,7 +323,7 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
payMeetingVO.setHotelContactsList(payMeetingHotelContactsList);
//标协会议类型
//String tbMeetingType = meeting.getTbMeetingType().toString();
//String type = sysBaseApi.translateDict("standard_meeting_type", tbMeetingType);
//String type = sysBaseAPI.translateDict("standard_meeting_type", tbMeetingType);
//payMeetingVO.setTbMeetingType(type);
// 工作组项目查询工作组项目名
} 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();
for (PayMeeting meeting : pageList) {
//查询会议负责人
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO);
meetingType = meeting.getMeetingType().toString();
String meetingType1 = sysBaseApi.translateDict("meeting_type", meetingType);
String meetingType1 = sysBaseAPI.translateDict("meeting_type", meetingType);
payMeetingVO.setMeetingType(meetingType1);
payMeetingVO.setHotelContactsList(new ArrayList<>());
//标协会议查询酒店联系人列表
@@ -375,7 +375,7 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
payMeetingVO.setHotelContactsList(payMeetingHotelContactsList);
//标协会议类型
String tbMeetingType = meeting.getTbMeetingType().toString();
String type = sysBaseApi.translateDict("standard_meeting_type", tbMeetingType);
String type = sysBaseAPI.translateDict("standard_meeting_type", tbMeetingType);
payMeetingVO.setTbMeetingType(type);
//保存数据
StandardsMeetingExcel standardsMeetingExcel = new StandardsMeetingExcel();
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java
+11 -11
View File
@@ -68,7 +68,7 @@ public class StandardsMeetingController extends JeroController<PayMeeting, IPayM
@Resource
private IPayMeetingService payMeetingService;
@Resource
private ISysBaseAPI sysBaseApi;
private ISysBaseAPI sysBaseAPI;
@Resource
private IPayMeetingHotelContactsService meetingHotelContactsService;
@Resource
@@ -114,8 +114,8 @@ public class StandardsMeetingController extends JeroController<PayMeeting, IPayM
IPage<PayMeeting> pageList = payMeetingService.page(page, queryWrapper);
for (PayMeeting meeting : pageList.getRecords()) {
//查询会议负责人
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
@@ -213,15 +213,15 @@ public class StandardsMeetingController extends JeroController<PayMeeting, IPayM
return Result.error("未找到对应数据");
}
//查询会议负责人
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO);
String meetingType = meeting.getMeetingType().toString();
//String meetingType1 = sysBaseApi.translateDict("meeting_type", meetingType);
//String meetingType1 = sysBaseAPI.translateDict("meeting_type", meetingType);
payMeetingVO.setMeetingType(meetingType);
payMeetingVO.setTbMeetingType(meeting.getMeetingType().toString());
//payMeetingVO.setHotelContactsList(new ArrayList<>());
@@ -233,7 +233,7 @@ public class StandardsMeetingController extends JeroController<PayMeeting, IPayM
payMeetingVO.setHotelContactsList(payMeetingHotelContactsList);
//标协会议类型
//String tbMeetingType = meeting.getTbMeetingType().toString();
//String type = sysBaseApi.translateDict("standard_meeting_type", tbMeetingType);
//String type = sysBaseAPI.translateDict("standard_meeting_type", tbMeetingType);
//payMeetingVO.setTbMeetingType(type);
// 工作组项目查询工作组项目名
} 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();
for (PayMeeting meeting : pageList) {
//查询会议负责人
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO);
meetingType = meeting.getMeetingType().toString();
String meetingType1 = sysBaseApi.translateDict("meeting_type", meetingType);
String meetingType1 = sysBaseAPI.translateDict("meeting_type", meetingType);
payMeetingVO.setMeetingType(meetingType1);
payMeetingVO.setHotelContactsList(new ArrayList<>());
//标协会议查询酒店联系人列表
@@ -286,7 +286,7 @@ public class StandardsMeetingController extends JeroController<PayMeeting, IPayM
payMeetingVO.setHotelContactsList(payMeetingHotelContactsList);
//标协会议类型
String tbMeetingType = meeting.getTbMeetingType().toString();
String type = sysBaseApi.translateDict("standard_meeting_type", tbMeetingType);
String type = sysBaseAPI.translateDict("standard_meeting_type", tbMeetingType);
payMeetingVO.setTbMeetingType(type);
//保存数据
StandardsMeetingExcel standardsMeetingExcel = new StandardsMeetingExcel();
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java
+11 -11
View File
@@ -68,7 +68,7 @@ public class WorkGroupMeetingController extends JeroController<PayMeeting, IPayM
@Resource
private IPayMeetingService payMeetingService;
@Resource
private ISysBaseAPI sysBaseApi;
private ISysBaseAPI sysBaseAPI;
@Resource
private IPayMeetingHotelContactsService meetingHotelContactsService;
@Resource
@@ -114,8 +114,8 @@ public class WorkGroupMeetingController extends JeroController<PayMeeting, IPayM
IPage<PayMeeting> pageList = payMeetingService.page(page, queryWrapper);
for (PayMeeting meeting : pageList.getRecords()) {
//查询会议负责人
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
@@ -213,15 +213,15 @@ public class WorkGroupMeetingController extends JeroController<PayMeeting, IPayM
return Result.error("未找到对应数据");
}
//查询会议负责人
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO);
String meetingType = meeting.getMeetingType().toString();
//String meetingType1 = sysBaseApi.translateDict("meeting_type", meetingType);
//String meetingType1 = sysBaseAPI.translateDict("meeting_type", meetingType);
payMeetingVO.setMeetingType(meetingType);
payMeetingVO.setTbMeetingType(meeting.getMeetingType().toString());
//payMeetingVO.setHotelContactsList(new ArrayList<>());
@@ -233,7 +233,7 @@ public class WorkGroupMeetingController extends JeroController<PayMeeting, IPayM
payMeetingVO.setHotelContactsList(payMeetingHotelContactsList);
//标协会议类型
//String tbMeetingType = meeting.getTbMeetingType().toString();
//String type = sysBaseApi.translateDict("standard_meeting_type", tbMeetingType);
//String type = sysBaseAPI.translateDict("standard_meeting_type", tbMeetingType);
//payMeetingVO.setTbMeetingType(type);
// 工作组项目查询工作组项目名
} 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();
for (PayMeeting meeting : pageList) {
//查询会议负责人
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername());
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
List<String> departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername());
String departName = departNamesByUsername.get(0);
meeting.setDirectorName(user.getRealname() + "(" + departName + ")");
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO);
meetingType = meeting.getMeetingType().toString();
String meetingType1 = sysBaseApi.translateDict("meeting_type", meetingType);
String meetingType1 = sysBaseAPI.translateDict("meeting_type", meetingType);
payMeetingVO.setMeetingType(meetingType1);
payMeetingVO.setHotelContactsList(new ArrayList<>());
//标协会议查询酒店联系人列表
@@ -286,7 +286,7 @@ public class WorkGroupMeetingController extends JeroController<PayMeeting, IPayM
payMeetingVO.setHotelContactsList(payMeetingHotelContactsList);
//标协会议类型
String tbMeetingType = meeting.getTbMeetingType().toString();
String type = sysBaseApi.translateDict("standard_meeting_type", tbMeetingType);
String type = sysBaseAPI.translateDict("standard_meeting_type", tbMeetingType);
payMeetingVO.setTbMeetingType(type);
//保存数据
StandardsMeetingExcel standardsMeetingExcel = new StandardsMeetingExcel();
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
+5 -5
View File
@@ -68,7 +68,7 @@ import org.springframework.transaction.annotation.Transactional;
@Transactional(rollbackFor = Exception.class)
public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeeting> implements IPayMeetingService {
@Resource
private ISysBaseAPI sysBaseApi;
private ISysBaseAPI sysBaseAPI;
@Resource
private IPayMeetingHotelContactsService meetingHotelContactsService;
@Resource
@@ -224,7 +224,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
}
//判断会议类型
String meetingType = payMeetingVO.getMeetingType();
String type = sysBaseApi.translateDict("meeting_type", meetingType);
String type = sysBaseAPI.translateDict("meeting_type", meetingType);
if (StrUtil.isBlank(type)) {
throw new JeroBootException("会议类型不存在");
}else {
@@ -232,7 +232,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
}
//判断会议联系人
String directorId = payMeetingVO.getDirectorId();
LoginUser loginUser = sysBaseApi.getUserById(directorId);
LoginUser loginUser = sysBaseAPI.getUserById(directorId);
if (loginUser == null) {
throw new JeroBootException("会议负责人不存在");
}else{
@@ -261,7 +261,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
ValidUtil.validate(payMeetingVO, StandardMeeting.class);
//标协会议类型
String tbMeetingType = payMeetingVO.getTbMeetingType();
String standardMeetingType = sysBaseApi.translateDict("standard_meeting_type", tbMeetingType);
String standardMeetingType = sysBaseAPI.translateDict("standard_meeting_type", tbMeetingType);
if (standardMeetingType == null){
throw new JeroBootException("标协会议类型不存在");
}
@@ -450,7 +450,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
//发送消息
for (PayContactsManagement payContactsManagement : list) {
String directorId = payMeeting.getDirectorId();
LoginUser director = sysBaseApi.getUserById(directorId);
LoginUser director = sysBaseAPI.getUserById(directorId);
// 给企业联系人发送消息
String email = payContactsManagement.getEmail();
String phone = payContactsManagement.getPhone();