From e9b55938ed91af3ab7f41c921d623b6004196ac6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 21 Jun 2023 17:47:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=BA=BF=E7=B4=A2=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cool/store/vo/LineFollowHistoryVO.java | 4 ++-- .../cool/store/service/impl/HyPartnerLineInfoServiceImpl.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/LineFollowHistoryVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/LineFollowHistoryVO.java index 850ebc93d..acdd84729 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/LineFollowHistoryVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/LineFollowHistoryVO.java @@ -16,9 +16,9 @@ import java.util.Date; public class LineFollowHistoryVO { @ApiModelProperty("开始跟进时间") - private Date startTime; + private String startTime; @ApiModelProperty("结束跟进时间") - private Date closeTime; + private String closeTime; @ApiModelProperty("结束原因") private String closeCause; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java index f3b5b047f..3417d39e2 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java @@ -394,8 +394,8 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { lineFollowHistoryList.forEach(x->{ LineFollowHistoryVO lineFollowHistoryVO = new LineFollowHistoryVO(); lineFollowHistoryVO.setCloseCause(x.getRejectPublicReason()); - lineFollowHistoryVO.setCloseTime(x.getCloseTime()); - lineFollowHistoryVO.setStartTime(x.getCreateTime()); + lineFollowHistoryVO.setCloseTime( DateUtil.format(x.getCloseTime(), CoolDateUtils.DATE_FORMAT_SEC)); + lineFollowHistoryVO.setStartTime(DateUtil.format(x.getCreateTime(), CoolDateUtils.DATE_FORMAT_SEC)); result.add(lineFollowHistoryVO); }); return result; From 520a5d60ae3213a99bba5e92dd201a87b8468164 Mon Sep 17 00:00:00 2001 From: pserimal Date: Wed, 21 Jun 2023 17:56:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=91=98=E5=B7=A5=E7=AB=AF=E9=9D=A2?= =?UTF-8?q?=E8=AF=95=E7=AE=A1=E7=90=86=E6=8E=A5=E5=8F=A3=E4=BD=BF=E7=94=A8?= =?UTF-8?q?Body=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/controller/InterviewController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/InterviewController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/InterviewController.java index 0740ddc92..4f613c16d 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/InterviewController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/InterviewController.java @@ -41,7 +41,7 @@ public class InterviewController { } @PostMapping("/queryByInterviewPlanId") - @ApiOperation("根据面试会议id查询面试信息") + @ApiOperation("根据面试会议计划id查询面试信息") public ResponseResult queryByInterviewPlanId(@RequestBody QueryByInterviewPlanIdReq request) { InterviewVO interviewVO = interviewService.getInterviewInfo(request); return ResponseResult.success(interviewVO);