diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java index 47042856..a1b8e613 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java @@ -68,7 +68,7 @@ public class CommitteeMeetingController extends JeroController pageList = payMeetingService.page(page, queryWrapper); for (PayMeeting meeting : pageList.getRecords()) { //查询会议负责人 - LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId()); - List departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername()); + LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId()); + List 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 departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername()); + LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId()); + List 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 departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername()); + LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId()); + List 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 pageList = payMeetingService.page(page, queryWrapper); for (PayMeeting meeting : pageList.getRecords()) { //查询会议负责人 - LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId()); - List departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername()); + LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId()); + List 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 departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername()); + LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId()); + List 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 departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername()); + LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId()); + List 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 pageList = payMeetingService.page(page, queryWrapper); for (PayMeeting meeting : pageList.getRecords()) { //查询会议负责人 - LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId()); - List departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername()); + LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId()); + List 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 departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername()); + LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId()); + List 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 departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername()); + LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId()); + List 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 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 pageList = payMeetingService.pageListContract(page, queryWrapper, now); for (PayMeeting meeting : pageList.getRecords()) { //查询会议负责人 - LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId()); - List departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername()); + LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId()); + List 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 departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername()); + LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId()); + List 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 departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername()); + LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId()); + List 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 pageList = payMeetingService.page(page, queryWrapper); for (PayMeeting meeting : pageList.getRecords()) { //查询会议负责人 - LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId()); - List departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername()); + LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId()); + List 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 departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername()); + LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId()); + List 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 departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername()); + LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId()); + List 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 pageList = payMeetingService.page(page, queryWrapper); for (PayMeeting meeting : pageList.getRecords()) { //查询会议负责人 - LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId()); - List departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername()); + LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId()); + List 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 departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername()); + LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId()); + List 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 departNamesByUsername = sysBaseApi.getDepartNamesByUsername(user.getUsername()); + LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId()); + List 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 implements IPayMeetingService { @Resource - private ISysBaseAPI sysBaseApi; + private ISysBaseAPI sysBaseAPI; @Resource private IPayMeetingHotelContactsService meetingHotelContactsService; @Resource @@ -224,7 +224,7 @@ public class PayMeetingServiceImpl extends ServiceImpl