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

Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner

Browse Source
This commit is contained in:
zhangchenbiao
2023-06-21 18:01:55 +08:00
parent d388f55a8a ca35d4082d
commit 1f7d782d0a
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-model/src/main/java/com/cool/store/vo/LineFollowHistoryVO.java
View File

@@ -16,9 +16,9 @@ import java.util.Date;
public class LineFollowHistoryVO { public class LineFollowHistoryVO {
@ApiModelProperty("开始跟进时间") @ApiModelProperty("开始跟进时间")
private Date startTime; private String startTime;
@ApiModelProperty("结束跟进时间") @ApiModelProperty("结束跟进时间")
private Date closeTime; private String closeTime;
@ApiModelProperty("结束原因") @ApiModelProperty("结束原因")
private String closeCause; private String closeCause;

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

@@ -397,8 +397,8 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
lineFollowHistoryList.forEach(x->{ lineFollowHistoryList.forEach(x->{
LineFollowHistoryVO lineFollowHistoryVO = new LineFollowHistoryVO(); LineFollowHistoryVO lineFollowHistoryVO = new LineFollowHistoryVO();
lineFollowHistoryVO.setCloseCause(x.getRejectPublicReason()); lineFollowHistoryVO.setCloseCause(x.getRejectPublicReason());
lineFollowHistoryVO.setCloseTime(x.getCloseTime()); lineFollowHistoryVO.setCloseTime( DateUtil.format(x.getCloseTime(), CoolDateUtils.DATE_FORMAT_SEC));
lineFollowHistoryVO.setStartTime(x.getCreateTime()); lineFollowHistoryVO.setStartTime(DateUtil.format(x.getCreateTime(), CoolDateUtils.DATE_FORMAT_SEC));
result.add(lineFollowHistoryVO); result.add(lineFollowHistoryVO);
}); });
return result; return result;

2
coolstore-partner-webb/src/main/java/com/cool/store/controller/InterviewController.java
View File

@@ -41,7 +41,7 @@ public class InterviewController {
} }
@PostMapping("/queryByInterviewPlanId") @PostMapping("/queryByInterviewPlanId")
@ApiOperation("根据面试会议id查询面试信息") @ApiOperation("根据面试会议计划id查询面试信息")
public ResponseResult<InterviewVO> queryByInterviewPlanId(@RequestBody QueryByInterviewPlanIdReq request) { public ResponseResult<InterviewVO> queryByInterviewPlanId(@RequestBody QueryByInterviewPlanIdReq request) {
InterviewVO interviewVO = interviewService.getInterviewInfo(request); InterviewVO interviewVO = interviewService.getInterviewInfo(request);
return ResponseResult.success(interviewVO); return ResponseResult.success(interviewVO);