From 0d446446b0c55f67018e032ef5dc4b60e9888bcf Mon Sep 17 00:00:00 2001 From: guohb Date: Fri, 12 Apr 2024 14:27:32 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A8=BD=E6=A0=B82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/response/CheckListResponse.java | 4 ++-- .../cool/store/service/AuditStatusService.java | 3 ++- .../service/impl/AuditStatusServiceImpl.java | 4 ++-- .../controller/webb/AuditStatusController.java | 18 ++++++++++-------- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/CheckListResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/CheckListResponse.java index 9fb3a2aac..231ed3e95 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/CheckListResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/CheckListResponse.java @@ -37,7 +37,7 @@ public class CheckListResponse { private String intervieweeName; @ApiModelProperty("面审通过时间") - private Date intervieweePassTime; + private String intervieweePassTime; @ApiModelProperty("稽核状态 0：未稽核 1：合格 2：不合格") private Integer checkStatus; @@ -52,7 +52,7 @@ public class CheckListResponse { private String checkUser; @ApiModelProperty("稽核时间") - private Date checkTime; + private String checkTime; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/AuditStatusService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/AuditStatusService.java index b189cf378..e95f66b4d 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/AuditStatusService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/AuditStatusService.java @@ -4,6 +4,7 @@ import com.cool.store.entity.AuditStatusDO; import com.cool.store.request.AuditCheckRequest; import com.cool.store.request.AuditDetailRequest; import com.cool.store.response.AuditDetailResponse; +import com.cool.store.response.CheckListResponse; import com.github.pagehelper.PageInfo; import java.util.Date; @@ -39,5 +40,5 @@ public interface AuditStatusService { * @param pageSize * @return */ - PageInfo checkList(String partnerNameOrPhone, Date startTime, Date endTime, String region, Integer checkStatus, Integer checkStage, Integer pageNum, Integer pageSize); + PageInfo checkList(String partnerNameOrPhone, Date startTime, Date endTime, String region, Integer checkStatus, Integer checkStage, Integer pageNum, Integer pageSize); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditStatusServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditStatusServiceImpl.java index dea410e20..37de3a7f4 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditStatusServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditStatusServiceImpl.java @@ -119,7 +119,7 @@ public class AuditStatusServiceImpl implements AuditStatusService { } @Override - public PageInfo checkList(String partnerNameOrPhone, + public PageInfo checkList(String partnerNameOrPhone, Date startTime, Date endTime, String region, @@ -148,7 +148,7 @@ public class AuditStatusServiceImpl implements AuditStatusService { x.setInvestmentName(investmentIdMap.get(x.getIntervieweeId())); }); - PageInfo pageInfo = new PageInfo<>(checkListResponses); + PageInfo pageInfo = new PageInfo<>(checkListResponses); return pageInfo; } } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/AuditStatusController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/AuditStatusController.java index 39e3be5cf..9680ac16f 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/AuditStatusController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/AuditStatusController.java @@ -3,8 +3,10 @@ package com.cool.store.controller.webb; import com.cool.store.request.AuditCheckRequest; import com.cool.store.request.AuditDetailRequest; +import com.cool.store.response.CheckListResponse; import com.cool.store.response.ResponseResult; import com.cool.store.service.AuditStatusService; +import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; @@ -35,14 +37,14 @@ public class AuditStatusController { @ApiOperation("稽核列表") @GetMapping("/checkList") - public ResponseResult checkList(@RequestParam(value = "partnerNameOrPhone",required = false) String partnerNameOrPhone, - @RequestParam(value = "startTime",required = false) Date startTime, - @RequestParam(value = "endTime",required = false) Date endTime, - @RequestParam(value = "region",required = false) String region, - @RequestParam(value = "checkStatus",required = false) Integer checkStatus, - @RequestParam(value = "checkStage",defaultValue = "1") Integer checkStage, - @RequestParam(value = "pageNum",defaultValue = "1") Integer pageNum, - @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize) { + public ResponseResult> checkList(@RequestParam(value = "partnerNameOrPhone",required = false) String partnerNameOrPhone, + @RequestParam(value = "startTime",required = false) Date startTime, + @RequestParam(value = "endTime",required = false) Date endTime, + @RequestParam(value = "region",required = false) String region, + @RequestParam(value = "checkStatus",required = false) Integer checkStatus, + @RequestParam(value = "checkStage",defaultValue = "1") Integer checkStage, + @RequestParam(value = "pageNum",defaultValue = "1") Integer pageNum, + @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize) { return ResponseResult.success(auditStatusService.checkList(partnerNameOrPhone,startTime,endTime,region,checkStatus,checkStage,pageNum,pageSize)); }