fix 修改没有部门后会议查不出来的bug
This commit is contained in:
lijiarao
+1
-35
@@ -93,41 +93,7 @@ public class CommitteeMeetingController extends JeroController<PayMeeting, IPayM
|
|||||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||||
HttpServletRequest req) {
|
HttpServletRequest req) {
|
||||||
payMeeting.setMeetingType(MeetingCommon.COMMITTEE_MEETING_INT);
|
payMeeting.setMeetingType(MeetingCommon.COMMITTEE_MEETING_INT);
|
||||||
QueryWrapper<PayMeeting> queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap());
|
IPage<PayMeeting> pageList = payMeetingService.queryPageList(payMeeting,pageNo,pageSize,req);
|
||||||
String meetingStartTime = req.getParameter("meetingStartTime");
|
|
||||||
String meetingEndTime = req.getParameter("meetingEndTime");
|
|
||||||
if (ObjectUtil.isNotEmpty(meetingStartTime) && ObjectUtil.isNotEmpty(meetingEndTime)) {
|
|
||||||
queryWrapper.not(
|
|
||||||
a -> a.gt("start_time", meetingEndTime).or().lt("end_time", meetingStartTime)
|
|
||||||
);
|
|
||||||
} else if (ObjectUtil.isNotEmpty(meetingStartTime)) {
|
|
||||||
queryWrapper.not(
|
|
||||||
a -> a.lt("end_time", meetingStartTime)
|
|
||||||
);
|
|
||||||
} else if (ObjectUtil.isNotEmpty(meetingEndTime)) {
|
|
||||||
queryWrapper.not(
|
|
||||||
a -> a.gt("start_time", meetingEndTime)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
Page<PayMeeting> page = new Page<>(pageNo, pageSize);
|
|
||||||
IPage<PayMeeting> pageList = payMeetingService.page(page, queryWrapper);
|
|
||||||
for (PayMeeting meeting : pageList.getRecords()) {
|
|
||||||
//查询会议负责人
|
|
||||||
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
|
|
||||||
|
|
||||||
meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")");
|
|
||||||
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
|
|
||||||
PayMeetingVO payMeetingVO = new PayMeetingVO();
|
|
||||||
BeanUtils.copyProperties(payMeetingVO, payMeeting);
|
|
||||||
//查询酒店联系人列表
|
|
||||||
if (meeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) {
|
|
||||||
LambdaQueryWrapper<PayMeetingHotelContacts> wrapper = new LambdaQueryWrapper<>();
|
|
||||||
wrapper.eq(PayMeetingHotelContacts::getMeetingId, meeting.getId());
|
|
||||||
List<PayMeetingHotelContacts> payMeetingHotelContactsList = meetingHotelContactsService.list(wrapper);
|
|
||||||
meeting.setHotelContactsList(payMeetingHotelContactsList);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return Result.OK(pageList);
|
return Result.OK(pageList);
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-34
@@ -93,40 +93,7 @@ public class InternalMeetingController extends JeroController<PayMeeting, IPayMe
|
|||||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||||
HttpServletRequest req) {
|
HttpServletRequest req) {
|
||||||
payMeeting.setMeetingType(MeetingCommon.INTERNATIONAL_MEETING_INT);
|
payMeeting.setMeetingType(MeetingCommon.INTERNATIONAL_MEETING_INT);
|
||||||
QueryWrapper<PayMeeting> queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap());
|
IPage<PayMeeting> pageList = payMeetingService.queryPageList(payMeeting,pageNo,pageSize,req);
|
||||||
String meetingStartTime = req.getParameter("meetingStartTime");
|
|
||||||
String meetingEndTime = req.getParameter("meetingEndTime");
|
|
||||||
if (ObjectUtil.isNotEmpty(meetingStartTime) && ObjectUtil.isNotEmpty(meetingEndTime)) {
|
|
||||||
queryWrapper.not(
|
|
||||||
a -> a.gt("start_time", meetingEndTime).or().lt("end_time", meetingStartTime)
|
|
||||||
);
|
|
||||||
} else if (ObjectUtil.isNotEmpty(meetingStartTime)) {
|
|
||||||
queryWrapper.not(
|
|
||||||
a -> a.lt("end_time", meetingStartTime)
|
|
||||||
);
|
|
||||||
} else if (ObjectUtil.isNotEmpty(meetingEndTime)) {
|
|
||||||
queryWrapper.not(
|
|
||||||
a -> a.gt("start_time", meetingEndTime)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
Page<PayMeeting> page = new Page<>(pageNo, pageSize);
|
|
||||||
IPage<PayMeeting> pageList = payMeetingService.page(page, queryWrapper);
|
|
||||||
for (PayMeeting meeting : pageList.getRecords()) {
|
|
||||||
//查询会议负责人
|
|
||||||
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
|
|
||||||
meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")");
|
|
||||||
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
|
|
||||||
PayMeetingVO payMeetingVO = new PayMeetingVO();
|
|
||||||
BeanUtils.copyProperties(payMeetingVO, payMeeting);
|
|
||||||
//查询酒店联系人列表
|
|
||||||
if (meeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) {
|
|
||||||
LambdaQueryWrapper<PayMeetingHotelContacts> wrapper = new LambdaQueryWrapper<>();
|
|
||||||
wrapper.eq(PayMeetingHotelContacts::getMeetingId, meeting.getId());
|
|
||||||
List<PayMeetingHotelContacts> payMeetingHotelContactsList = meetingHotelContactsService.list(wrapper);
|
|
||||||
meeting.setHotelContactsList(payMeetingHotelContactsList);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return Result.OK(pageList);
|
return Result.OK(pageList);
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-35
@@ -93,41 +93,7 @@ public class OtherMeetingController extends JeroController<PayMeeting, IPayMeeti
|
|||||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||||
HttpServletRequest req) {
|
HttpServletRequest req) {
|
||||||
payMeeting.setMeetingType(MeetingCommon.OTHER_MEETING_INT);
|
payMeeting.setMeetingType(MeetingCommon.OTHER_MEETING_INT);
|
||||||
QueryWrapper<PayMeeting> queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap());
|
IPage<PayMeeting> pageList = payMeetingService.queryPageList(payMeeting,pageNo,pageSize,req);
|
||||||
String meetingStartTime = req.getParameter("meetingStartTime");
|
|
||||||
String meetingEndTime = req.getParameter("meetingEndTime");
|
|
||||||
if (ObjectUtil.isNotEmpty(meetingStartTime) && ObjectUtil.isNotEmpty(meetingEndTime)) {
|
|
||||||
queryWrapper.not(
|
|
||||||
a -> a.gt("start_time", meetingEndTime).or().lt("end_time", meetingStartTime)
|
|
||||||
);
|
|
||||||
} else if (ObjectUtil.isNotEmpty(meetingStartTime)) {
|
|
||||||
queryWrapper.not(
|
|
||||||
a -> a.lt("end_time", meetingStartTime)
|
|
||||||
);
|
|
||||||
} else if (ObjectUtil.isNotEmpty(meetingEndTime)) {
|
|
||||||
queryWrapper.not(
|
|
||||||
a -> a.gt("start_time", meetingEndTime)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
Page<PayMeeting> page = new Page<>(pageNo, pageSize);
|
|
||||||
IPage<PayMeeting> pageList = payMeetingService.page(page, queryWrapper);
|
|
||||||
for (PayMeeting meeting : pageList.getRecords()) {
|
|
||||||
//查询会议负责人
|
|
||||||
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
|
|
||||||
|
|
||||||
meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")");
|
|
||||||
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
|
|
||||||
PayMeetingVO payMeetingVO = new PayMeetingVO();
|
|
||||||
BeanUtils.copyProperties(payMeetingVO, payMeeting);
|
|
||||||
//查询酒店联系人列表
|
|
||||||
if (meeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) {
|
|
||||||
LambdaQueryWrapper<PayMeetingHotelContacts> wrapper = new LambdaQueryWrapper<>();
|
|
||||||
wrapper.eq(PayMeetingHotelContacts::getMeetingId, meeting.getId());
|
|
||||||
List<PayMeetingHotelContacts> payMeetingHotelContactsList = meetingHotelContactsService.list(wrapper);
|
|
||||||
meeting.setHotelContactsList(payMeetingHotelContactsList);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return Result.OK(pageList);
|
return Result.OK(pageList);
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-34
@@ -97,40 +97,7 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
|
|||||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||||
HttpServletRequest req) {
|
HttpServletRequest req) {
|
||||||
QueryWrapper<PayMeeting> queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap());
|
IPage<PayMeeting> pageList = payMeetingService.queryPageList(payMeeting,pageNo,pageSize,req);
|
||||||
String meetingStartTime = req.getParameter("meetingStartTime");
|
|
||||||
String meetingEndTime = req.getParameter("meetingEndTime");
|
|
||||||
if (ObjectUtil.isNotEmpty(meetingStartTime) && ObjectUtil.isNotEmpty(meetingEndTime)) {
|
|
||||||
queryWrapper.not(
|
|
||||||
a -> a.gt("start_time", meetingEndTime).or().lt("end_time", meetingStartTime)
|
|
||||||
);
|
|
||||||
} else if (ObjectUtil.isNotEmpty(meetingStartTime)) {
|
|
||||||
queryWrapper.not(
|
|
||||||
a -> a.lt("end_time", meetingStartTime)
|
|
||||||
);
|
|
||||||
} else if (ObjectUtil.isNotEmpty(meetingEndTime)) {
|
|
||||||
queryWrapper.not(
|
|
||||||
a -> a.gt("start_time", meetingEndTime)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
Page<PayMeeting> page = new Page<>(pageNo, pageSize);
|
|
||||||
IPage<PayMeeting> pageList = payMeetingService.page(page, queryWrapper);
|
|
||||||
for (PayMeeting meeting : pageList.getRecords()) {
|
|
||||||
//查询会议负责人
|
|
||||||
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
|
|
||||||
meeting.setDirectorName(user.getRealname());
|
|
||||||
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
|
|
||||||
PayMeetingVO payMeetingVO = new PayMeetingVO();
|
|
||||||
BeanUtils.copyProperties(payMeetingVO, payMeeting);
|
|
||||||
//查询酒店联系人列表
|
|
||||||
if (meeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) {
|
|
||||||
LambdaQueryWrapper<PayMeetingHotelContacts> wrapper = new LambdaQueryWrapper<>();
|
|
||||||
wrapper.eq(PayMeetingHotelContacts::getMeetingId, meeting.getId());
|
|
||||||
List<PayMeetingHotelContacts> payMeetingHotelContactsList = meetingHotelContactsService.list(wrapper);
|
|
||||||
meeting.setHotelContactsList(payMeetingHotelContactsList);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return Result.OK(pageList);
|
return Result.OK(pageList);
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-35
@@ -93,41 +93,7 @@ public class StandardsMeetingController extends JeroController<PayMeeting, IPayM
|
|||||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||||
HttpServletRequest req) {
|
HttpServletRequest req) {
|
||||||
payMeeting.setMeetingType(MeetingCommon.STANDARD_MEETING_INT);
|
payMeeting.setMeetingType(MeetingCommon.STANDARD_MEETING_INT);
|
||||||
QueryWrapper<PayMeeting> queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap());
|
IPage<PayMeeting> pageList = payMeetingService.queryPageList(payMeeting,pageNo,pageSize,req);
|
||||||
String meetingStartTime = req.getParameter("meetingStartTime");
|
|
||||||
String meetingEndTime = req.getParameter("meetingEndTime");
|
|
||||||
if (ObjectUtil.isNotEmpty(meetingStartTime) && ObjectUtil.isNotEmpty(meetingEndTime)) {
|
|
||||||
queryWrapper.not(
|
|
||||||
a -> a.gt("start_time", meetingEndTime).or().lt("end_time", meetingStartTime)
|
|
||||||
);
|
|
||||||
} else if (ObjectUtil.isNotEmpty(meetingStartTime)) {
|
|
||||||
queryWrapper.not(
|
|
||||||
a -> a.lt("end_time", meetingStartTime)
|
|
||||||
);
|
|
||||||
} else if (ObjectUtil.isNotEmpty(meetingEndTime)) {
|
|
||||||
queryWrapper.not(
|
|
||||||
a -> a.gt("start_time", meetingEndTime)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
Page<PayMeeting> page = new Page<>(pageNo, pageSize);
|
|
||||||
IPage<PayMeeting> pageList = payMeetingService.page(page, queryWrapper);
|
|
||||||
for (PayMeeting meeting : pageList.getRecords()) {
|
|
||||||
//查询会议负责人
|
|
||||||
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
|
|
||||||
|
|
||||||
meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")");
|
|
||||||
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
|
|
||||||
PayMeetingVO payMeetingVO = new PayMeetingVO();
|
|
||||||
BeanUtils.copyProperties(payMeetingVO, payMeeting);
|
|
||||||
//查询酒店联系人列表
|
|
||||||
if (meeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) {
|
|
||||||
LambdaQueryWrapper<PayMeetingHotelContacts> wrapper = new LambdaQueryWrapper<>();
|
|
||||||
wrapper.eq(PayMeetingHotelContacts::getMeetingId, meeting.getId());
|
|
||||||
List<PayMeetingHotelContacts> payMeetingHotelContactsList = meetingHotelContactsService.list(wrapper);
|
|
||||||
meeting.setHotelContactsList(payMeetingHotelContactsList);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return Result.OK(pageList);
|
return Result.OK(pageList);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user