suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

稽核2

Browse Source
This commit is contained in:
guohb
2024-04-12 14:27:32 +08:00
parent 6342edbf55
commit 0d446446b0
4 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-model/src/main/java/com/cool/store/response/CheckListResponse.java
View File

@@ -37,7 +37,7 @@ public class CheckListResponse {
private String intervieweeName; private String intervieweeName;
@ApiModelProperty("面审通过时间") @ApiModelProperty("面审通过时间")
private Date intervieweePassTime; private String intervieweePassTime;
@ApiModelProperty("稽核状态 0：未稽核 1：合格 2：不合格") @ApiModelProperty("稽核状态 0：未稽核 1：合格 2：不合格")
private Integer checkStatus; private Integer checkStatus;
@@ -52,7 +52,7 @@ public class CheckListResponse {
private String checkUser; private String checkUser;
@ApiModelProperty("稽核时间") @ApiModelProperty("稽核时间")
private Date checkTime; private String checkTime;

3
coolstore-partner-service/src/main/java/com/cool/store/service/AuditStatusService.java
View File

@@ -4,6 +4,7 @@ import com.cool.store.entity.AuditStatusDO;
import com.cool.store.request.AuditCheckRequest; import com.cool.store.request.AuditCheckRequest;
import com.cool.store.request.AuditDetailRequest; import com.cool.store.request.AuditDetailRequest;
import com.cool.store.response.AuditDetailResponse; import com.cool.store.response.AuditDetailResponse;
import com.cool.store.response.CheckListResponse;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import java.util.Date; import java.util.Date;
@@ -39,5 +40,5 @@ public interface AuditStatusService {
* @param pageSize * @param pageSize
* @return * @return
*/ */
PageInfo checkList(String partnerNameOrPhone, Date startTime, Date endTime, String region, Integer checkStatus, Integer checkStage, Integer pageNum, Integer pageSize); PageInfo<CheckListResponse> checkList(String partnerNameOrPhone, Date startTime, Date endTime, String region, Integer checkStatus, Integer checkStage, Integer pageNum, Integer pageSize);
} }

4
coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditStatusServiceImpl.java
View File

@@ -119,7 +119,7 @@ public class AuditStatusServiceImpl implements AuditStatusService {
} }
@Override @Override
public PageInfo checkList(String partnerNameOrPhone, public PageInfo<CheckListResponse> checkList(String partnerNameOrPhone,
Date startTime, Date startTime,
Date endTime, Date endTime,
String region, String region,
@@ -148,7 +148,7 @@ public class AuditStatusServiceImpl implements AuditStatusService {
x.setInvestmentName(investmentIdMap.get(x.getIntervieweeId())); x.setInvestmentName(investmentIdMap.get(x.getIntervieweeId()));
}); });
PageInfo pageInfo = new PageInfo<>(checkListResponses); PageInfo<CheckListResponse> pageInfo = new PageInfo<>(checkListResponses);
return pageInfo; return pageInfo;
} }
} }

18
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/AuditStatusController.java
View File

@@ -3,8 +3,10 @@ package com.cool.store.controller.webb;
import com.cool.store.request.AuditCheckRequest; import com.cool.store.request.AuditCheckRequest;
import com.cool.store.request.AuditDetailRequest; import com.cool.store.request.AuditDetailRequest;
import com.cool.store.response.CheckListResponse;
import com.cool.store.response.ResponseResult; import com.cool.store.response.ResponseResult;
import com.cool.store.service.AuditStatusService; import com.cool.store.service.AuditStatusService;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@@ -35,14 +37,14 @@ public class AuditStatusController {
@ApiOperation("稽核列表") @ApiOperation("稽核列表")
@GetMapping("/checkList") @GetMapping("/checkList")
public ResponseResult checkList(@RequestParam(value = "partnerNameOrPhone",required = false) String partnerNameOrPhone, public ResponseResult<PageInfo<CheckListResponse>> checkList(@RequestParam(value = "partnerNameOrPhone",required = false) String partnerNameOrPhone,
@RequestParam(value = "startTime",required = false) Date startTime, @RequestParam(value = "startTime",required = false) Date startTime,
@RequestParam(value = "endTime",required = false) Date endTime, @RequestParam(value = "endTime",required = false) Date endTime,
@RequestParam(value = "region",required = false) String region, @RequestParam(value = "region",required = false) String region,
@RequestParam(value = "checkStatus",required = false) Integer checkStatus, @RequestParam(value = "checkStatus",required = false) Integer checkStatus,
@RequestParam(value = "checkStage",defaultValue = "1") Integer checkStage, @RequestParam(value = "checkStage",defaultValue = "1") Integer checkStage,
@RequestParam(value = "pageNum",defaultValue = "1") Integer pageNum, @RequestParam(value = "pageNum",defaultValue = "1") Integer pageNum,
@RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize) { @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize) {
return ResponseResult.success(auditStatusService.checkList(partnerNameOrPhone,startTime,endTime,region,checkStatus,checkStage,pageNum,pageSize)); return ResponseResult.success(auditStatusService.checkList(partnerNameOrPhone,startTime,endTime,region,checkStatus,checkStage,pageNum,pageSize));
} }