From ea62735280bfd65e74179a29344962ef3a213fc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Mon, 3 Jul 2023 09:57:11 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9D=A2=E8=AF=95=E6=9F=A5=E8=AF=A2=E6=97=B6?= =?UTF-8?q?=E9=97=B4=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/utils/CoolDateUtils.java | 4 ++-- .../java/com/cool/store/service/impl/DeskServiceImpl.java | 4 ++-- .../cool/store/service/impl/HyPartnerLineInfoServiceImpl.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/utils/CoolDateUtils.java b/coolstore-partner-common/src/main/java/com/cool/store/utils/CoolDateUtils.java index 4aecc64d6..06d0446a3 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/utils/CoolDateUtils.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/utils/CoolDateUtils.java @@ -72,8 +72,8 @@ public class CoolDateUtils { * @param day * @return */ - public static Date getDateFormatDay(int day){ - LocalDate today = LocalDate.now(); + public static Date getDateFormatDay(Date date,int day){ + LocalDate today = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); LocalDate thirdDay = today.plusDays(day); LocalDateTime thirdDayMidnight = LocalDateTime.of(thirdDay, LocalTime.MIDNIGHT); LocalDateTime thirdDay235959 = thirdDayMidnight.with(LocalTime.MAX); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java index 5efb7d1bb..4f309ea13 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java @@ -66,11 +66,11 @@ public class DeskServiceImpl implements DeskService { String currentDate = DateUtil.format(dateTime, CoolDateUtils.DATE_FORMAT_DAY); String startTime = DateUtil.format(CoolDateUtils.getDateFormatDayMinTime(dateTime,1), CoolDateUtils.DATE_FORMAT_SEC); - String endTime = DateUtil.format(CoolDateUtils.getDateFormatDay(7), CoolDateUtils.DATE_FORMAT_SEC); + String endTime = DateUtil.format(CoolDateUtils.getDateFormatDay(dateTime,6), CoolDateUtils.DATE_FORMAT_SEC); SpecialDateRangeInterviewCountDTO interviewCount = hyPartnerInterviewPlanDAO.getInterviewCount(userId, currentDate, startTime, endTime); interviewScheduleInfoVO.setCurrentDayInterviewCount(interviewCount.getCurrentDayInterviewCount()); - interviewScheduleInfoVO.setLastSevenDayInterviewCount(interviewCount.getLastSevenDayInterviewCount()); + interviewScheduleInfoVO.setLastSevenDayInterviewCount(interviewCount.getCurrentDayInterviewCount()+interviewCount.getLastSevenDayInterviewCount()); //查询面试列表 //当天时间 与入参无关 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 8628e8cc5..f5d960d05 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 @@ -334,7 +334,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { if ("pass".equals(closeFollowRequest.getType())){ hyPartnerLineInfoDO.setWorkflowStage(WorkflowStageEnum.RESERVATION.getCode()); hyPartnerLineInfoDO.setWorkflowStatus(WorkflowStatusEnum.RESERVATION_0.getCode()); - hyPartnerLineInfoDO.setDeadline(CoolDateUtils.getDateFormatDay(2)); + hyPartnerLineInfoDO.setDeadline(CoolDateUtils.getDateFormatDay(new Date(),2)); hyPartnerLineInfoDO.setPassReason(closeFollowRequest.getPassReason()); if (CollectionUtils.isNotEmpty(closeFollowRequest.getCertifyFile())){ hyPartnerLineInfoDO.setCertifyFile(JSONObject.toJSONString(closeFollowRequest.getCertifyFile()));