diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
index 836f5276b..b41f58754 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
@@ -320,7 +320,7 @@
and investment_manager = #{userId}
- and close_time > #{lastMonthTodayDate} and close_time now
+ and close_time > #{lastMonthTodayDate} and close_time now()
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/DeskService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/DeskService.java
index c95b5b7e2..69d7382f3 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/DeskService.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/DeskService.java
@@ -28,7 +28,7 @@ public interface DeskService {
* @param selectedData
* @return
*/
- InterviewScheduleInfoVO interviewSchedule(String userId,Date selectedData);
+ InterviewScheduleInfoVO interviewSchedule(String userId,String selectedData);
/**
* 招商经理 各阶段 待处理 待跟进数量
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 e33bd2651..c27ad9bab 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
@@ -16,6 +16,7 @@ import com.cool.store.vo.InterviewPlanVO;
import com.cool.store.vo.InterviewScheduleInfoVO;
import com.cool.store.vo.StageCountVO;
import org.apache.commons.lang3.StringUtils;
+import org.apache.http.client.utils.DateUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -53,15 +54,17 @@ public class DeskServiceImpl implements DeskService {
}
@Override
- public InterviewScheduleInfoVO interviewSchedule(String userId,Date selectedData) {
+ public InterviewScheduleInfoVO interviewSchedule(String userId,String selectedData) {
if (StringUtils.isEmpty(userId)||selectedData==null){
throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED);
}
+ Date date = DateUtils.parseDate(selectedData);
InterviewScheduleInfoVO interviewScheduleInfoVO = new InterviewScheduleInfoVO();
//查询面试数量
- String currentDate = DateUtil.format(selectedData, CoolDateUtils.DATE_FORMAT_DAY);
- String startTime = DateUtil.format(selectedData, CoolDateUtils.DATE_FORMAT_SEC);
- String endTime = DateUtil.format(CoolDateUtils.getDateBefore(selectedData, 7), CoolDateUtils.DATE_FORMAT_SEC);
+
+ String currentDate = DateUtil.format(date, CoolDateUtils.DATE_FORMAT_DAY);
+ String startTime = DateUtil.format(date, CoolDateUtils.DATE_FORMAT_SEC);
+ String endTime = DateUtil.format(CoolDateUtils.getDateBefore(date, 7), CoolDateUtils.DATE_FORMAT_SEC);
SpecialDateRangeInterviewCountDTO interviewCount = hyPartnerInterviewPlanDAO.getInterviewCount(userId, currentDate, startTime, endTime);
interviewScheduleInfoVO.setCurrentDayInterviewCount(interviewCount.getCurrentDayInterviewCount());
diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java
index 8181e0ffd..988ee1317 100644
--- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java
+++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java
@@ -50,7 +50,7 @@ public class DeskController {
@GetMapping(path = "/interviewSchedule")
@ApiOperation("面试日程信息 面试信息有限 不做分页")
- public ResponseResult interviewSchedule(@RequestParam(value = "selectedData",required = false) Date selectedData){
+ public ResponseResult interviewSchedule(@RequestParam(value = "selectedData",required = false) String selectedData){
String userId = CurrentUserHolder.getUserId();
return ResponseResult.success(deskService.interviewSchedule(userId,selectedData));