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

update 会议分页查询根据controller分类查询

Browse Source
This commit is contained in:
lijiarao
2021-09-30 16:05:26 +08:00
parent 745bb480a3
commit c091d2e922
6 changed files with 9 additions and 380 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
+1 -85
View File
@@ -92,6 +92,7 @@ public class CommitteeMeetingController extends JeroController<PayMeeting, IPayM
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
payMeeting.setMeetingType(Integer.parseInt(MeetingCommon.COMMITTEE_MEETING));
QueryWrapper<PayMeeting> queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap());
String meetingStartTime = req.getParameter("meetingStartTime");
String meetingEndTime = req.getParameter("meetingEndTime");
@@ -130,91 +131,6 @@ public class CommitteeMeetingController extends JeroController<PayMeeting, IPayM
return Result.OK(pageList);
}
/**
* 企业端-会议-分页列表查询参会人的会议
*/
@ApiOperation(value = "企业端-会议-分页列表查询参会人的会议")
@GetMapping(value = "/pageContract")
public Result<?> queryPageListContract(PayMeeting payMeeting,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<PayMeeting> queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap());
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)
);
}
String meetingStatus = req.getParameter("meetingStatus");
String now = DateUtil.formatDate(new Date());
if (StringUtils.isNotBlank(meetingStatus)) {
switch (meetingStatus) {
case MeetingCommon.MEETING_STATUS_2:
queryWrapper.gt("date_format(start_time,'%Y-%m-%d')", now);
break;
case MeetingCommon.MEETING_STATUS_3:
queryWrapper.le("date_format(start_time,'%Y-%m-%d')", now);
queryWrapper.ge("date_format(end_time,'%Y-%m-%d')", now);
break;
case MeetingCommon.MEETING_STATUS_4:
queryWrapper.le("date_format(end_time,'%Y-%m-%d')", now);
break;
}
}
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String id = sysUser.getId();
//会议报名状态：1可报名/2已报名
String meetingSignUpType = req.getParameter("meetingSignUpType");
if (Objects.equals(meetingSignUpType,1+"")) {
queryWrapper.eq("pmrr.contact_id",id);
}else if (Objects.equals(meetingSignUpType,2+"")) {
queryWrapper.eq("pms.company_contact_id",id);
}else {
queryWrapper.and(
a -> a.eq("pms.company_contact_id",id)
.or()
.eq("pms.post_contact_id",id)
.or()
.eq("pmrr.contact_id",id)
);
}
Page<PayMeeting> page = new Page<>(pageNo, pageSize);
IPage<PayMeeting> pageList = payMeetingService.pageListContract(page, queryWrapper, now);
for (PayMeeting meeting : pageList.getRecords()) {
//查询会议负责人
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
meeting.setDirectorName(user.getUsername());
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(payMeetingVO, payMeeting);
}
return Result.OK(pageList);
}
/**
* 列表查询
*/
@RequiresPermissions("committeeMeeting:search")
@ApiOperation(value = "会议管理-列表查询", notes = "会议管理-列表查询")
@GetMapping(value = "/list")
public Result<List<PayMeeting>> queryList() {
List<PayMeeting> list = payMeetingService.queryList();
return Result.OK(list);
}
/**
* 添加
*/
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java
+1 -73
View File
@@ -92,6 +92,7 @@ public class InternalMeetingController extends JeroController<PayMeeting, IPayMe
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
payMeeting.setMeetingType(Integer.parseInt(MeetingCommon.INTERNATIONAL_MEETING));
QueryWrapper<PayMeeting> queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap());
String meetingStartTime = req.getParameter("meetingStartTime");
String meetingEndTime = req.getParameter("meetingEndTime");
@@ -130,79 +131,6 @@ public class InternalMeetingController extends JeroController<PayMeeting, IPayMe
return Result.OK(pageList);
}
/**
* 企业端-会议-分页列表查询参会人的会议
*/
@ApiOperation(value = "企业端-会议-分页列表查询参会人的会议")
@GetMapping(value = "/pageContract")
public Result<?> queryPageListContract(PayMeeting payMeeting,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<PayMeeting> queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap());
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)
);
}
String meetingStatus = req.getParameter("meetingStatus");
String now = DateUtil.formatDate(new Date());
if (StringUtils.isNotBlank(meetingStatus)) {
switch (meetingStatus) {
case MeetingCommon.MEETING_STATUS_2:
queryWrapper.gt("date_format(start_time,'%Y-%m-%d')", now);
break;
case MeetingCommon.MEETING_STATUS_3:
queryWrapper.le("date_format(start_time,'%Y-%m-%d')", now);
queryWrapper.ge("date_format(end_time,'%Y-%m-%d')", now);
break;
case MeetingCommon.MEETING_STATUS_4:
queryWrapper.le("date_format(end_time,'%Y-%m-%d')", now);
break;
}
}
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String id = sysUser.getId();
//会议报名状态：1可报名/2已报名
String meetingSignUpType = req.getParameter("meetingSignUpType");
if (Objects.equals(meetingSignUpType,1+"")) {
queryWrapper.eq("pmrr.contact_id",id);
}else if (Objects.equals(meetingSignUpType,2+"")) {
queryWrapper.eq("pms.company_contact_id",id);
}else {
queryWrapper.and(
a -> a.eq("pms.company_contact_id",id)
.or()
.eq("pms.post_contact_id",id)
.or()
.eq("pmrr.contact_id",id)
);
}
Page<PayMeeting> page = new Page<>(pageNo, pageSize);
IPage<PayMeeting> pageList = payMeetingService.pageListContract(page, queryWrapper, now);
for (PayMeeting meeting : pageList.getRecords()) {
//查询会议负责人
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
meeting.setDirectorName(user.getUsername());
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(payMeetingVO, payMeeting);
}
return Result.OK(pageList);
}
/**
* 列表查询
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java
+1 -74
View File
@@ -92,6 +92,7 @@ public class OtherMeetingController extends JeroController<PayMeeting, IPayMeeti
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
payMeeting.setMeetingType(Integer.parseInt(MeetingCommon.OTHER_MEETING));
QueryWrapper<PayMeeting> queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap());
String meetingStartTime = req.getParameter("meetingStartTime");
String meetingEndTime = req.getParameter("meetingEndTime");
@@ -130,80 +131,6 @@ public class OtherMeetingController extends JeroController<PayMeeting, IPayMeeti
return Result.OK(pageList);
}
/**
* 企业端-会议-分页列表查询参会人的会议
*/
@ApiOperation(value = "企业端-会议-分页列表查询参会人的会议")
@GetMapping(value = "/pageContract")
public Result<?> queryPageListContract(PayMeeting payMeeting,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<PayMeeting> queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap());
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)
);
}
String meetingStatus = req.getParameter("meetingStatus");
String now = DateUtil.formatDate(new Date());
if (StringUtils.isNotBlank(meetingStatus)) {
switch (meetingStatus) {
case MeetingCommon.MEETING_STATUS_2:
queryWrapper.gt("date_format(start_time,'%Y-%m-%d')", now);
break;
case MeetingCommon.MEETING_STATUS_3:
queryWrapper.le("date_format(start_time,'%Y-%m-%d')", now);
queryWrapper.ge("date_format(end_time,'%Y-%m-%d')", now);
break;
case MeetingCommon.MEETING_STATUS_4:
queryWrapper.le("date_format(end_time,'%Y-%m-%d')", now);
break;
}
}
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String id = sysUser.getId();
//会议报名状态：1可报名/2已报名
String meetingSignUpType = req.getParameter("meetingSignUpType");
if (Objects.equals(meetingSignUpType,1+"")) {
queryWrapper.eq("pmrr.contact_id",id);
}else if (Objects.equals(meetingSignUpType,2+"")) {
queryWrapper.eq("pms.company_contact_id",id);
}else {
queryWrapper.and(
a -> a.eq("pms.company_contact_id",id)
.or()
.eq("pms.post_contact_id",id)
.or()
.eq("pmrr.contact_id",id)
);
}
Page<PayMeeting> page = new Page<>(pageNo, pageSize);
IPage<PayMeeting> pageList = payMeetingService.pageListContract(page, queryWrapper, now);
for (PayMeeting meeting : pageList.getRecords()) {
//查询会议负责人
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
meeting.setDirectorName(user.getUsername());
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(payMeetingVO, payMeeting);
}
return Result.OK(pageList);
}
/**
* 列表查询
*/
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java
+1 -74
View File
@@ -92,6 +92,7 @@ public class StandardsMeetingController extends JeroController<PayMeeting, IPayM
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
payMeeting.setMeetingType(Integer.parseInt(MeetingCommon.STANDARD_MEETING));
QueryWrapper<PayMeeting> queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap());
String meetingStartTime = req.getParameter("meetingStartTime");
String meetingEndTime = req.getParameter("meetingEndTime");
@@ -130,80 +131,6 @@ public class StandardsMeetingController extends JeroController<PayMeeting, IPayM
return Result.OK(pageList);
}
/**
* 企业端-会议-分页列表查询参会人的会议
*/
@ApiOperation(value = "企业端-会议-分页列表查询参会人的会议")
@GetMapping(value = "/pageContract")
public Result<?> queryPageListContract(PayMeeting payMeeting,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<PayMeeting> queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap());
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)
);
}
String meetingStatus = req.getParameter("meetingStatus");
String now = DateUtil.formatDate(new Date());
if (StringUtils.isNotBlank(meetingStatus)) {
switch (meetingStatus) {
case MeetingCommon.MEETING_STATUS_2:
queryWrapper.gt("date_format(start_time,'%Y-%m-%d')", now);
break;
case MeetingCommon.MEETING_STATUS_3:
queryWrapper.le("date_format(start_time,'%Y-%m-%d')", now);
queryWrapper.ge("date_format(end_time,'%Y-%m-%d')", now);
break;
case MeetingCommon.MEETING_STATUS_4:
queryWrapper.le("date_format(end_time,'%Y-%m-%d')", now);
break;
}
}
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String id = sysUser.getId();
//会议报名状态：1可报名/2已报名
String meetingSignUpType = req.getParameter("meetingSignUpType");
if (Objects.equals(meetingSignUpType,1+"")) {
queryWrapper.eq("pmrr.contact_id",id);
}else if (Objects.equals(meetingSignUpType,2+"")) {
queryWrapper.eq("pms.company_contact_id",id);
}else {
queryWrapper.and(
a -> a.eq("pms.company_contact_id",id)
.or()
.eq("pms.post_contact_id",id)
.or()
.eq("pmrr.contact_id",id)
);
}
Page<PayMeeting> page = new Page<>(pageNo, pageSize);
IPage<PayMeeting> pageList = payMeetingService.pageListContract(page, queryWrapper, now);
for (PayMeeting meeting : pageList.getRecords()) {
//查询会议负责人
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
meeting.setDirectorName(user.getUsername());
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(payMeetingVO, payMeeting);
}
return Result.OK(pageList);
}
/**
* 列表查询
*/
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java
+1 -74
View File
@@ -92,6 +92,7 @@ public class WorkGroupMeetingController extends JeroController<PayMeeting, IPayM
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
payMeeting.setMeetingType(Integer.parseInt(MeetingCommon.WORKING_GROUP_MEETING));
QueryWrapper<PayMeeting> queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap());
String meetingStartTime = req.getParameter("meetingStartTime");
String meetingEndTime = req.getParameter("meetingEndTime");
@@ -130,80 +131,6 @@ public class WorkGroupMeetingController extends JeroController<PayMeeting, IPayM
return Result.OK(pageList);
}
/**
* 企业端-会议-分页列表查询参会人的会议
*/
@ApiOperation(value = "企业端-会议-分页列表查询参会人的会议")
@GetMapping(value = "/pageContract")
public Result<?> queryPageListContract(PayMeeting payMeeting,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<PayMeeting> queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap());
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)
);
}
String meetingStatus = req.getParameter("meetingStatus");
String now = DateUtil.formatDate(new Date());
if (StringUtils.isNotBlank(meetingStatus)) {
switch (meetingStatus) {
case MeetingCommon.MEETING_STATUS_2:
queryWrapper.gt("date_format(start_time,'%Y-%m-%d')", now);
break;
case MeetingCommon.MEETING_STATUS_3:
queryWrapper.le("date_format(start_time,'%Y-%m-%d')", now);
queryWrapper.ge("date_format(end_time,'%Y-%m-%d')", now);
break;
case MeetingCommon.MEETING_STATUS_4:
queryWrapper.le("date_format(end_time,'%Y-%m-%d')", now);
break;
}
}
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String id = sysUser.getId();
//会议报名状态：1可报名/2已报名
String meetingSignUpType = req.getParameter("meetingSignUpType");
if (Objects.equals(meetingSignUpType,1+"")) {
queryWrapper.eq("pmrr.contact_id",id);
}else if (Objects.equals(meetingSignUpType,2+"")) {
queryWrapper.eq("pms.company_contact_id",id);
}else {
queryWrapper.and(
a -> a.eq("pms.company_contact_id",id)
.or()
.eq("pms.post_contact_id",id)
.or()
.eq("pmrr.contact_id",id)
);
}
Page<PayMeeting> page = new Page<>(pageNo, pageSize);
IPage<PayMeeting> pageList = payMeetingService.pageListContract(page, queryWrapper, now);
for (PayMeeting meeting : pageList.getRecords()) {
//查询会议负责人
LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
meeting.setDirectorName(user.getUsername());
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(payMeetingVO, payMeeting);
}
return Result.OK(pageList);
}
/**
* 列表查询
*/
jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java
+4
View File
@@ -97,6 +97,10 @@ public class PayMeeting implements Serializable {
@ApiModelProperty(value = "分标委名称")
private String caseCommitteeName;
/**标协项目id*/
@ApiModelProperty(value = "标协项目id")
private String standardsId;
/**开始时间*/
@Excel(name = "开始时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")