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-10-08 14:14:14 +08:00
parent 4aaeaab24c
commit 7ecaa2ca56
6 changed files with 135 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingCommon.java
+20
View File
@@ -12,22 +12,42 @@ public class MeetingCommon {
* 工作组会议
*/
public final static String WORKING_GROUP_MEETING = "1";
/**
* 工作组会议
*/
public final static Integer WORKING_GROUP_MEETING_INT = 1;
/**
* 标协会议
*/
public final static String STANDARD_MEETING = "2";
/**
* 标协会议
*/
public final static Integer STANDARD_MEETING_INT = 2;
/**
* 国际研讨会
*/
public final static String INTERNATIONAL_MEETING = "3";
/**
* 国际研讨会
*/
public final static Integer INTERNATIONAL_MEETING_INT = 3;
/**
* 其他会议
*/
public final static String OTHER_MEETING = "4";
/**
* 其他会议
*/
public final static Integer OTHER_MEETING_INT = 4;
/**
* 分标委会议
*/
public final static String COMMITTEE_MEETING = "5";
/**
* 分标委会议
*/
public final static Integer COMMITTEE_MEETING_INT = 5;
/**
* 未提醒
*/
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java
+24 -6
View File
@@ -92,7 +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));
payMeeting.setMeetingType(MeetingCommon.COMMITTEE_MEETING_INT);
QueryWrapper<PayMeeting> queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap());
String meetingStartTime = req.getParameter("meetingStartTime");
String meetingEndTime = req.getParameter("meetingEndTime");
@@ -139,7 +139,10 @@ public class CommitteeMeetingController extends JeroController<PayMeeting, IPayM
@ApiOperation(value = "会议管理-添加", notes = "会议管理-添加")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody PayMeetingVO payMeetingVO) {
payMeetingVO.setMeetingType(MeetingCommon.COMMITTEE_MEETING);
String meetingType = payMeetingVO.getMeetingType();
if (!Objects.equals(meetingType, MeetingCommon.COMMITTEE_MEETING)){
throw new RuntimeException();
}
ValidUtil.validate(payMeetingVO);
payMeetingService.add(payMeetingVO);
return Result.OK("添加成功！");
@@ -153,13 +156,23 @@ public class CommitteeMeetingController extends JeroController<PayMeeting, IPayM
@ApiOperation(value = "会议管理-编辑", notes = "会议管理-编辑")
@PostMapping(value = "/edit")
public Result<?> edit(@RequestBody PayMeetingVO payMeetingVO) {
payMeetingVO.setMeetingType(MeetingCommon.COMMITTEE_MEETING);
String id = payMeetingVO.getId();
extracted(id);
ValidUtil.validate(payMeetingVO, UpdateGroup.class);
payMeetingService.editById(payMeetingVO);
return Result.OK("编辑成功!");
}
private void extracted(String id) {
PayMeeting payMeeting = payMeetingService.getById(id);
Integer meetingType = payMeeting.getMeetingType();
if (!Objects.equals(meetingType, MeetingCommon.COMMITTEE_MEETING_INT)){
throw new RuntimeException();
}
}
/**
*
* 通过id删除
*/
@RequiresPermissions("committeeMeeting:delete")
@@ -167,6 +180,7 @@ public class CommitteeMeetingController extends JeroController<PayMeeting, IPayM
@ApiOperation(value = "会议管理-通过id删除", notes = "会议管理-通过id删除")
@GetMapping(value = "/delete")
public Result<?> delete(@RequestParam(name = "id") String id) {
extracted(id);
payMeetingService.deleteById(id);
return Result.OK("删除成功!");
}
@@ -179,7 +193,11 @@ public class CommitteeMeetingController extends JeroController<PayMeeting, IPayM
@ApiOperation(value = "会议管理-批量删除", notes = "会议管理-批量删除")
@GetMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name = "ids") String ids) {
this.payMeetingService.deleteByIds(Arrays.asList(ids.split(",")));
List<String> idList = Arrays.asList(ids.split(","));
for (String id : idList) {
extracted(id);
}
this.payMeetingService.deleteByIds(idList);
return Result.OK("批量删除成功!");
}
@@ -190,7 +208,7 @@ public class CommitteeMeetingController extends JeroController<PayMeeting, IPayM
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name = "id") String id) {
PayMeeting meeting = payMeetingService.queryById(id);
if (meeting == null) {
if (meeting == null || !Objects.equals(meeting.getMeetingType(), MeetingCommon.COMMITTEE_MEETING_INT)) {
return Result.error("未找到对应数据");
}
//查询会议负责人
@@ -229,7 +247,7 @@ public class CommitteeMeetingController extends JeroController<PayMeeting, IPayM
@RequiresPermissions("committeeMeeting:export")
@GetMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, PayMeeting payMeeting) {
payMeeting.setMeetingType(Integer.parseInt(MeetingCommon.COMMITTEE_MEETING));
payMeeting.setMeetingType(MeetingCommon.COMMITTEE_MEETING_INT);
QueryWrapper<PayMeeting> queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, request.getParameterMap());
List<PayMeeting> pageList = payMeetingService.list(queryWrapper);
List<Object> exportList = new ArrayList<>();
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java
+23 -15
View File
@@ -92,7 +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));
payMeeting.setMeetingType(MeetingCommon.INTERNATIONAL_MEETING_INT);
QueryWrapper<PayMeeting> queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap());
String meetingStartTime = req.getParameter("meetingStartTime");
String meetingEndTime = req.getParameter("meetingEndTime");
@@ -131,18 +131,6 @@ public class InternalMeetingController extends JeroController<PayMeeting, IPayMe
return Result.OK(pageList);
}
/**
* 列表查询
*/
@RequiresPermissions("internalMeeting:search")
@ApiOperation(value = "会议管理-列表查询", notes = "会议管理-列表查询")
@GetMapping(value = "/list")
public Result<List<PayMeeting>> queryList() {
List<PayMeeting> list = payMeetingService.queryList();
return Result.OK(list);
}
/**
* 添加
*/
@@ -151,11 +139,23 @@ public class InternalMeetingController extends JeroController<PayMeeting, IPayMe
@ApiOperation(value = "会议管理-添加", notes = "会议管理-添加")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody PayMeetingVO payMeetingVO) {
String meetingType = payMeetingVO.getMeetingType();
if (!Objects.equals(meetingType, MeetingCommon.INTERNATIONAL_MEETING)){
throw new RuntimeException();
}
ValidUtil.validate(payMeetingVO);
payMeetingService.add(payMeetingVO);
return Result.OK("添加成功！");
}
private void extracted(String id) {
PayMeeting payMeeting = payMeetingService.getById(id);
Integer meetingType = payMeeting.getMeetingType();
if (!Objects.equals(meetingType, MeetingCommon.INTERNATIONAL_MEETING_INT)){
throw new RuntimeException();
}
}
/**
* 编辑
*/
@@ -164,6 +164,8 @@ public class InternalMeetingController extends JeroController<PayMeeting, IPayMe
@ApiOperation(value = "会议管理-编辑", notes = "会议管理-编辑")
@PostMapping(value = "/edit")
public Result<?> edit(@RequestBody PayMeetingVO payMeetingVO) {
String id = payMeetingVO.getId();
extracted(id);
ValidUtil.validate(payMeetingVO, UpdateGroup.class);
payMeetingService.editById(payMeetingVO);
return Result.OK("编辑成功!");
@@ -177,6 +179,7 @@ public class InternalMeetingController extends JeroController<PayMeeting, IPayMe
@ApiOperation(value = "会议管理-通过id删除", notes = "会议管理-通过id删除")
@GetMapping(value = "/delete")
public Result<?> delete(@RequestParam(name = "id") String id) {
extracted(id);
payMeetingService.deleteById(id);
return Result.OK("删除成功!");
}
@@ -189,7 +192,11 @@ public class InternalMeetingController extends JeroController<PayMeeting, IPayMe
@ApiOperation(value = "会议管理-批量删除", notes = "会议管理-批量删除")
@GetMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name = "ids") String ids) {
this.payMeetingService.deleteByIds(Arrays.asList(ids.split(",")));
List<String> idList = Arrays.asList(ids.split(","));
for (String id : idList) {
extracted(id);
}
this.payMeetingService.deleteByIds(idList);
return Result.OK("批量删除成功!");
}
@@ -200,7 +207,7 @@ public class InternalMeetingController extends JeroController<PayMeeting, IPayMe
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name = "id") String id) {
PayMeeting meeting = payMeetingService.queryById(id);
if (meeting == null) {
if (meeting == null || !Objects.equals(meeting.getMeetingType(), MeetingCommon.INTERNATIONAL_MEETING_INT)) {
return Result.error("未找到对应数据");
}
//查询会议负责人
@@ -239,6 +246,7 @@ public class InternalMeetingController extends JeroController<PayMeeting, IPayMe
@RequiresPermissions("internalMeeting:export")
@GetMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, PayMeeting payMeeting) {
payMeeting.setMeetingType(MeetingCommon.INTERNATIONAL_MEETING_INT);
QueryWrapper<PayMeeting> queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, request.getParameterMap());
List<PayMeeting> pageList = payMeetingService.list(queryWrapper);
List<Object> exportList = new ArrayList<>();
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java
+23 -14
View File
@@ -92,7 +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));
payMeeting.setMeetingType(MeetingCommon.OTHER_MEETING_INT);
QueryWrapper<PayMeeting> queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap());
String meetingStartTime = req.getParameter("meetingStartTime");
String meetingEndTime = req.getParameter("meetingEndTime");
@@ -131,17 +131,6 @@ public class OtherMeetingController extends JeroController<PayMeeting, IPayMeeti
return Result.OK(pageList);
}
/**
* 列表查询
*/
@RequiresPermissions("otherMeeting:search")
@ApiOperation(value = "会议管理-列表查询", notes = "会议管理-列表查询")
@GetMapping(value = "/list")
public Result<List<PayMeeting>> queryList() {
List<PayMeeting> list = payMeetingService.queryList();
return Result.OK(list);
}
/**
* 添加
*/
@@ -150,11 +139,23 @@ public class OtherMeetingController extends JeroController<PayMeeting, IPayMeeti
@ApiOperation(value = "会议管理-添加", notes = "会议管理-添加")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody PayMeetingVO payMeetingVO) {
String meetingType = payMeetingVO.getMeetingType();
if (!Objects.equals(meetingType, MeetingCommon.OTHER_MEETING)){
throw new RuntimeException();
}
ValidUtil.validate(payMeetingVO);
payMeetingService.add(payMeetingVO);
return Result.OK("添加成功！");
}
private void extracted(String id) {
PayMeeting payMeeting = payMeetingService.getById(id);
Integer meetingType = payMeeting.getMeetingType();
if (!Objects.equals(meetingType, MeetingCommon.OTHER_MEETING_INT)){
throw new RuntimeException();
}
}
/**
* 编辑
*/
@@ -163,6 +164,8 @@ public class OtherMeetingController extends JeroController<PayMeeting, IPayMeeti
@ApiOperation(value = "会议管理-编辑", notes = "会议管理-编辑")
@PostMapping(value = "/edit")
public Result<?> edit(@RequestBody PayMeetingVO payMeetingVO) {
String id = payMeetingVO.getId();
extracted(id);
ValidUtil.validate(payMeetingVO, UpdateGroup.class);
payMeetingService.editById(payMeetingVO);
return Result.OK("编辑成功!");
@@ -176,6 +179,7 @@ public class OtherMeetingController extends JeroController<PayMeeting, IPayMeeti
@ApiOperation(value = "会议管理-通过id删除", notes = "会议管理-通过id删除")
@GetMapping(value = "/delete")
public Result<?> delete(@RequestParam(name = "id") String id) {
extracted(id);
payMeetingService.deleteById(id);
return Result.OK("删除成功!");
}
@@ -188,7 +192,11 @@ public class OtherMeetingController extends JeroController<PayMeeting, IPayMeeti
@ApiOperation(value = "会议管理-批量删除", notes = "会议管理-批量删除")
@GetMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name = "ids") String ids) {
this.payMeetingService.deleteByIds(Arrays.asList(ids.split(",")));
List<String> idList = Arrays.asList(ids.split(","));
for (String id : idList) {
extracted(id);
}
this.payMeetingService.deleteByIds(idList);
return Result.OK("批量删除成功!");
}
@@ -199,7 +207,7 @@ public class OtherMeetingController extends JeroController<PayMeeting, IPayMeeti
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name = "id") String id) {
PayMeeting meeting = payMeetingService.queryById(id);
if (meeting == null) {
if (meeting == null || !Objects.equals(meeting.getMeetingType(), MeetingCommon.OTHER_MEETING_INT)) {
return Result.error("未找到对应数据");
}
//查询会议负责人
@@ -238,6 +246,7 @@ public class OtherMeetingController extends JeroController<PayMeeting, IPayMeeti
@RequiresPermissions("otherMeeting:export")
@GetMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, PayMeeting payMeeting) {
payMeeting.setMeetingType(MeetingCommon.OTHER_MEETING_INT);
QueryWrapper<PayMeeting> queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, request.getParameterMap());
List<PayMeeting> pageList = payMeetingService.list(queryWrapper);
List<Object> exportList = new ArrayList<>();
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java
+23 -14
View File
@@ -92,7 +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));
payMeeting.setMeetingType(MeetingCommon.STANDARD_MEETING_INT);
QueryWrapper<PayMeeting> queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap());
String meetingStartTime = req.getParameter("meetingStartTime");
String meetingEndTime = req.getParameter("meetingEndTime");
@@ -131,17 +131,6 @@ public class StandardsMeetingController extends JeroController<PayMeeting, IPayM
return Result.OK(pageList);
}
/**
* 列表查询
*/
@RequiresPermissions("standardsMeeting:search")
@ApiOperation(value = "会议管理-列表查询", notes = "会议管理-列表查询")
@GetMapping(value = "/list")
public Result<List<PayMeeting>> queryList() {
List<PayMeeting> list = payMeetingService.queryList();
return Result.OK(list);
}
/**
* 添加
*/
@@ -150,11 +139,23 @@ public class StandardsMeetingController extends JeroController<PayMeeting, IPayM
@ApiOperation(value = "会议管理-添加", notes = "会议管理-添加")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody PayMeetingVO payMeetingVO) {
String meetingType = payMeetingVO.getMeetingType();
if (!Objects.equals(meetingType, MeetingCommon.STANDARD_MEETING)){
throw new RuntimeException();
}
ValidUtil.validate(payMeetingVO);
payMeetingService.add(payMeetingVO);
return Result.OK("添加成功！");
}
private void extracted(String id) {
PayMeeting payMeeting = payMeetingService.getById(id);
Integer meetingType = payMeeting.getMeetingType();
if (!Objects.equals(meetingType, MeetingCommon.STANDARD_MEETING_INT)){
throw new RuntimeException();
}
}
/**
* 编辑
*/
@@ -163,6 +164,8 @@ public class StandardsMeetingController extends JeroController<PayMeeting, IPayM
@ApiOperation(value = "会议管理-编辑", notes = "会议管理-编辑")
@PostMapping(value = "/edit")
public Result<?> edit(@RequestBody PayMeetingVO payMeetingVO) {
String id = payMeetingVO.getId();
extracted(id);
ValidUtil.validate(payMeetingVO, UpdateGroup.class);
payMeetingService.editById(payMeetingVO);
return Result.OK("编辑成功!");
@@ -176,6 +179,7 @@ public class StandardsMeetingController extends JeroController<PayMeeting, IPayM
@ApiOperation(value = "会议管理-通过id删除", notes = "会议管理-通过id删除")
@GetMapping(value = "/delete")
public Result<?> delete(@RequestParam(name = "id") String id) {
extracted(id);
payMeetingService.deleteById(id);
return Result.OK("删除成功!");
}
@@ -188,7 +192,11 @@ public class StandardsMeetingController extends JeroController<PayMeeting, IPayM
@ApiOperation(value = "会议管理-批量删除", notes = "会议管理-批量删除")
@GetMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name = "ids") String ids) {
this.payMeetingService.deleteByIds(Arrays.asList(ids.split(",")));
List<String> idList = Arrays.asList(ids.split(","));
for (String id : idList) {
extracted(id);
}
this.payMeetingService.deleteByIds(idList);
return Result.OK("批量删除成功!");
}
@@ -199,7 +207,7 @@ public class StandardsMeetingController extends JeroController<PayMeeting, IPayM
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name = "id") String id) {
PayMeeting meeting = payMeetingService.queryById(id);
if (meeting == null) {
if (meeting == null || !Objects.equals(meeting.getMeetingType(), MeetingCommon.STANDARD_MEETING_INT)) {
return Result.error("未找到对应数据");
}
//查询会议负责人
@@ -238,6 +246,7 @@ public class StandardsMeetingController extends JeroController<PayMeeting, IPayM
@RequiresPermissions("standardsMeeting:export")
@GetMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, PayMeeting payMeeting) {
payMeeting.setMeetingType(MeetingCommon.STANDARD_MEETING_INT);
QueryWrapper<PayMeeting> queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, request.getParameterMap());
List<PayMeeting> pageList = payMeetingService.list(queryWrapper);
List<Object> exportList = new ArrayList<>();
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java
+22 -14
View File
@@ -92,7 +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));
payMeeting.setMeetingType(MeetingCommon.WORKING_GROUP_MEETING_INT);
QueryWrapper<PayMeeting> queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap());
String meetingStartTime = req.getParameter("meetingStartTime");
String meetingEndTime = req.getParameter("meetingEndTime");
@@ -131,17 +131,6 @@ public class WorkGroupMeetingController extends JeroController<PayMeeting, IPayM
return Result.OK(pageList);
}
/**
* 列表查询
*/
@RequiresPermissions("workGroupMeeting:search")
@ApiOperation(value = "会议管理-列表查询", notes = "会议管理-列表查询")
@GetMapping(value = "/list")
public Result<List<PayMeeting>> queryList() {
List<PayMeeting> list = payMeetingService.queryList();
return Result.OK(list);
}
/**
* 添加
*/
@@ -150,10 +139,21 @@ public class WorkGroupMeetingController extends JeroController<PayMeeting, IPayM
@ApiOperation(value = "会议管理-添加", notes = "会议管理-添加")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody PayMeetingVO payMeetingVO) {
String meetingType = payMeetingVO.getMeetingType();
if (!Objects.equals(meetingType, MeetingCommon.WORKING_GROUP_MEETING)){
throw new RuntimeException();
}
ValidUtil.validate(payMeetingVO);
payMeetingService.add(payMeetingVO);
return Result.OK("添加成功！");
}
private void extracted(String id) {
PayMeeting payMeeting = payMeetingService.getById(id);
Integer meetingType = payMeeting.getMeetingType();
if (!Objects.equals(meetingType, MeetingCommon.WORKING_GROUP_MEETING_INT)){
throw new RuntimeException();
}
}
/**
* 编辑
@@ -163,6 +163,8 @@ public class WorkGroupMeetingController extends JeroController<PayMeeting, IPayM
@ApiOperation(value = "会议管理-编辑", notes = "会议管理-编辑")
@PostMapping(value = "/edit")
public Result<?> edit(@RequestBody PayMeetingVO payMeetingVO) {
String id = payMeetingVO.getId();
extracted(id);
ValidUtil.validate(payMeetingVO, UpdateGroup.class);
payMeetingService.editById(payMeetingVO);
return Result.OK("编辑成功!");
@@ -176,6 +178,7 @@ public class WorkGroupMeetingController extends JeroController<PayMeeting, IPayM
@ApiOperation(value = "会议管理-通过id删除", notes = "会议管理-通过id删除")
@GetMapping(value = "/delete")
public Result<?> delete(@RequestParam(name = "id") String id) {
extracted(id);
payMeetingService.deleteById(id);
return Result.OK("删除成功!");
}
@@ -188,7 +191,11 @@ public class WorkGroupMeetingController extends JeroController<PayMeeting, IPayM
@ApiOperation(value = "会议管理-批量删除", notes = "会议管理-批量删除")
@GetMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name = "ids") String ids) {
this.payMeetingService.deleteByIds(Arrays.asList(ids.split(",")));
List<String> idList = Arrays.asList(ids.split(","));
for (String id : idList) {
extracted(id);
}
this.payMeetingService.deleteByIds(idList);
return Result.OK("批量删除成功!");
}
@@ -199,7 +206,7 @@ public class WorkGroupMeetingController extends JeroController<PayMeeting, IPayM
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name = "id") String id) {
PayMeeting meeting = payMeetingService.queryById(id);
if (meeting == null) {
if (meeting == null || !Objects.equals(meeting.getMeetingType(), MeetingCommon.WORKING_GROUP_MEETING_INT)) {
return Result.error("未找到对应数据");
}
//查询会议负责人
@@ -238,6 +245,7 @@ public class WorkGroupMeetingController extends JeroController<PayMeeting, IPayM
@RequiresPermissions("workGroupMeeting:export")
@GetMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, PayMeeting payMeeting) {
payMeeting.setMeetingType(MeetingCommon.WORKING_GROUP_MEETING_INT);
QueryWrapper<PayMeeting> queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, request.getParameterMap());
List<PayMeeting> pageList = payMeetingService.list(queryWrapper);
List<Object> exportList = new ArrayList<>();