diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/LicenseListRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/LicenseListRequest.java index 78922eaf6..76ccd2b73 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/LicenseListRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/LicenseListRequest.java @@ -8,7 +8,7 @@ import lombok.Data; import java.util.Date; @Data -public class LicenseListRequest extends PageBasicInfo { +public class LicenseListRequest extends PageBasicInfo{ @ApiModelProperty("门店名称") private String storeName; @@ -21,5 +21,13 @@ public class LicenseListRequest extends PageBasicInfo { @ApiModelProperty("审核状态 1:待通过 2:未通过 3:已通过") private Integer status; - + public LicenseListRequest(Integer pageNum,Integer pageSize,String storeName, Long submitStartTime, Long submitEndTime, String regionId, Integer status) { + setPageNum(pageNum); + setPageSize(pageSize); + this.storeName = storeName; + this.submitStartTime = submitStartTime; + this.submitEndTime = submitEndTime; + this.regionId = regionId; + this.status = status; + } } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCApplyLicenseController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCApplyLicenseController.java index e06db86a1..38bf7edac 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCApplyLicenseController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCApplyLicenseController.java @@ -29,7 +29,15 @@ public class PCApplyLicenseController { @GetMapping(path = "/licenseList") @ApiOperation("证照审批列表") - public ResponseResult> licenseList(LicenseListRequest request) { + public ResponseResult> licenseList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber, + @RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize, + @RequestParam(value = "storeName",required = false)String storeName, + @RequestParam(value = "submitStartTime",required = false)Long submitStartTime, + @RequestParam(value = "submitEndTime",required = false)Long submitEndTime, + @RequestParam(value = "regionId",required = false)String regionId, + @RequestParam(value = "status",required = false)Integer status) { + LicenseListRequest request = + new LicenseListRequest(pageNumber,pageSize, storeName, submitStartTime, submitEndTime, regionId, status); return ResponseResult.success(applyLicenseService.licenseList(request)); }