diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingQuestionController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingQuestionController.java index 9be1cb17..313b2495 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingQuestionController.java +++ b/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.PayMeeting; -import com.jero.meeting.entity.PayMeetingQuestion; -import com.jero.meeting.entity.PayMeetingStandard; +import com.jero.meeting.entity.*; 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 queryPageList(PayMeetingQuestion payMeetingQuestion, + @GetMapping(value = "/listOne") + 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 listALL(@RequestParam(name = "meetingId") String meetingId, + @GetMapping(value = "/list") + 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 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 pageList = payMeetingQuestionService.pageList2(queryWrapper); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/SearchStandard.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/SearchStandard.java new file mode 100644 index 00000000..ae4c3403 --- /dev/null +++ b/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; + + + +}