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

Merge remote-tracking branch 'xfsg/cc_partner_init' into cc_partner_init

Browse Source
This commit is contained in:
苏竹红
2024-04-12 16:12:36 +08:00
parent d06b51c149 a642d99919
commit 81ebd36508
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
coolstore-partner-model/src/main/java/com/cool/store/response/AuditDetailResponse.java
View File

@@ -6,12 +6,13 @@ import lombok.Data;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
@Data
public class AuditDetailResponse {
@ApiModelProperty("视频链接")
private String videoUrl;
private List<String> videoUrl;
private String startTime;

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

@@ -1,5 +1,6 @@
package com.cool.store.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.cool.store.context.CurrentUserHolder;
import com.cool.store.context.LoginUserInfo;
import com.cool.store.dao.EnterpriseUserDAO;
@@ -102,7 +103,7 @@ public class AuditStatusServiceImpl implements AuditStatusService {
AuditStatusDO auditStatusDO = auditStatusMapper.selectByPrimaryKey(request.getCheckId());
LineInterviewDO lineInterviewDO = lineInterviewMapper.selectByPrimaryKey(auditStatusDO.getInterviewId());
LineAuditInfoDO auditInfo = lineAuditInfoDAO.getAuditInfo(auditStatusDO.getAuditId());
response.setVideoUrl(lineInterviewDO.getVideoUrl());
response.setVideoUrl(JSONObject.parseArray(lineInterviewDO.getVideoUrl(), String.class));
response.setStartTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, lineInterviewDO.getActualStartTime()));
response.setEndTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, lineInterviewDO.getActualEndTime()));

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

@@ -3,6 +3,7 @@ package com.cool.store.controller.webb;
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.cool.store.response.ResponseResult;
import com.cool.store.service.AuditStatusService;
@@ -24,13 +25,13 @@ public class AuditStatusController {
@ApiOperation("稽核")
@PostMapping("/check")
public ResponseResult check(@RequestBody AuditCheckRequest request) {
public ResponseResult<Boolean> check(@RequestBody AuditCheckRequest request) {
return ResponseResult.success(auditStatusService.audit(request));
}
@ApiOperation("查看/稽核按钮")
@PostMapping("/detail")
public ResponseResult detail(@RequestBody AuditDetailRequest request) {
public ResponseResult<AuditDetailResponse> detail(@RequestBody AuditDetailRequest request) {
return ResponseResult.success(auditStatusService.detail(request));
}