fix:bug

jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingQuestionController.java

@@ -19,10 +19,7 @@ import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.PasswordUtil;
 import com.jero.mail.commont.constant;
-import com.jero.meeting.entity.AllStandardQuestion;
+import com.jero.meeting.entity.*;
-import com.jero.meeting.entity.PayMeeting;
-import com.jero.meeting.entity.PayMeetingQuestion;
-import com.jero.meeting.entity.PayMeetingStandard;
 import com.jero.meeting.service.IPayMeetingQuestionService;
 import com.jero.meeting.service.IPayMeetingService;
 import com.jero.meeting.service.IPayMeetingStandardService;
@@ -69,8 +66,8 @@ public class PayMeetingQuestionController extends JeroController<PayMeetingQuest
      */
     @AutoLog(value = "征集问题-分页列表查询 -单个标准号")
     @ApiOperation(value = "征集问题-分页列表查询 -单个标准号", notes = "征集问题-分页列表查询 -单个标准号")
-    @GetMapping(value = "/list")
+    @GetMapping(value = "/listOne")
-    public Result<?> queryPageList(PayMeetingQuestion payMeetingQuestion,
+    public Result<?> listOne(PayMeetingQuestion payMeetingQuestion,
                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                    HttpServletRequest req) {
@@ -96,8 +93,8 @@ public class PayMeetingQuestionController extends JeroController<PayMeetingQuest
     }
     @AutoLog(value = "征集问题-分页列表查询 -一个会议所有标准号")
     @ApiOperation(value = "征集问题-分页列表查询 -一个会议所有标准号", notes = "征集问题-分页列表查询-一个会议所有标准号")
-    @GetMapping(value = "/listALL")
+    @GetMapping(value = "/list")
-    public Result<?> listALL(@RequestParam(name = "meetingId") String meetingId,
+    public Result<?> list(@RequestParam(name = "meetingId") String meetingId,
                              @RequestParam(name = "standardNumber",required = false) String standardNumber,
                              @RequestParam(name = "creater",required = false) String creater,
                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@@ -173,11 +170,9 @@ public class PayMeetingQuestionController extends JeroController<PayMeetingQuest
      * @param
      */
     @ApiOperation(value = "征集问题-导出", notes = "征集问题-导出")
-    @GetMapping(value = "/exportXls")
+    @PostMapping(value = "/exportXls")
     public void exportXls(HttpServletResponse response,
-                          @RequestParam(name = "meetingId") String meetingId,
+                          @RequestBody SearchStandard searchStandard) {
-                          @RequestParam(name = "standardNumber",required = false) String standardNumber,
-                          @RequestParam(name = "creater",required = false) String creater) {
         try {
             response.setContentType("application/ms-excel;charset=UTF-8");
             response.setContentType("application/x-download");
@@ -186,11 +181,8 @@ public class PayMeetingQuestionController extends JeroController<PayMeetingQuest
                     "attachment;filename=".concat(String.valueOf(URLEncoder.encode("征集问题.xls", "UTF-8"))));
 
             ServletOutputStream outputStream = response.getOutputStream();
-            if (StringUtils.isBlank(meetingId)) {
-                throw new JeroBootException("会议id不能为空！");
-            }
             QueryWrapper<AllStandardQuestion> queryWrapper = new QueryWrapper<>();
-            if (StringUtils.isBlank(meetingId)) {
+            if (StringUtils.isBlank(searchStandard.getMeetingId())) {
                 throw new JeroBootException("会议id不能为空！");
             }
 //        PayMeeting payMeeting = payMeetingService.getById(payMeetingQuestion.getMeetingId());
@@ -201,9 +193,9 @@ public class PayMeetingQuestionController extends JeroController<PayMeetingQuest
 //                lambdaQueryWrapper.eq(PayMeetingQuestion::getCreaterId, payMeetingQuestion.getMeetingId());
 //            }
 //        }
-            queryWrapper.eq(StringUtils.isNotBlank(standardNumber),"pms.standard_number", standardNumber);
+            queryWrapper.eq(StringUtils.isNotBlank(searchStandard.getStandardNumber()),"pms.standard_number", searchStandard.getStandardNumber());
-            queryWrapper.eq("pm.id", meetingId);
+            queryWrapper.eq("pm.id", searchStandard.getMeetingId());
-            queryWrapper.like(StringUtils.isNotBlank(creater),"pmq.creater", creater);
+            queryWrapper.like(StringUtils.isNotBlank(searchStandard.getCreater()),"pmq.creater", searchStandard.getCreater());
             queryWrapper.isNotNull("pmq.question_name");
             queryWrapper.orderByDesc("pmq.create_time");
             List<AllStandardQuestion> pageList = payMeetingQuestionService.pageList2(queryWrapper);

jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/SearchStandard.java

@@ -0,0 +1,27 @@
+package com.jero.meeting.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zhangqinlin
+ * @className: searchStandard
+ * @description:
+ * @date 2022/7/15 9:36
+ * @version：1.0
+ */
+@Data
+public class SearchStandard {
+
+    @ApiModelProperty(value = "会议id")
+    private java.lang.String meetingId;
+
+    @ApiModelProperty(value = "标准名称")
+    private java.lang.String standardNumber;
+
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String creater;
+
+
+
+}