From 4d1565d4f5b500e1f3716812ea0d4aae1f6eb675 Mon Sep 17 00:00:00 2001
From: rui_li <877258667@qq.com>
Date: Tue, 29 Mar 2022 14:14:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=8E=86sql=E7=9A=84=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/schedule/controller/ScheduleController.java     | 2 +-
 .../gaotao/modules/schedule/service/ScheduleService.java    | 2 +-
 .../modules/schedule/service/impl/ScheduleServiceImpl.java  | 6 +++++-
 src/main/resources/mapper/schedule/ScheduleMapper.xml       | 6 +++---
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java b/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java
index ba81fb2..b4f806c 100644
--- a/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java
+++ b/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java
@@ -1218,7 +1218,7 @@ public class ScheduleController {
      * @return com.gaotao.common.utils.R
      **/
     @RequestMapping(value = "getScheduleShiftWithSelect")
-    public R getScheduleShiftWithSelect(@RequestBody SearchScheduleData inData) {
+    public R getScheduleShiftWithSelect(@RequestBody SearchScheduleData inData) throws ParseException {
        List< Map<String, Object>> resultList = scheduleService.getScheduleShiftWithSelect(inData);
         return R.ok()
                 .put("code", 200)
diff --git a/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java b/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java
index 317e5be..10a1065 100644
--- a/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java
+++ b/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java
@@ -717,7 +717,7 @@ public interface ScheduleService {
      * @Param [inData]
      * @return java.util.List<java.util.Map < java.lang.String, java.lang.Object>>
      **/
-    List<Map<String, Object>> getScheduleShiftWithSelect(SearchScheduleData inData);
+    List<Map<String, Object>> getScheduleShiftWithSelect(SearchScheduleData inData) throws ParseException;
 
     /**
      * TODO 获取当前的calendarId
diff --git a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
index a1f252f..88e0fe2 100644
--- a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
@@ -3630,7 +3630,11 @@ public class ScheduleServiceImpl implements ScheduleService {
     }
 
     @Override
-    public List<Map<String, Object>> getScheduleShiftWithSelect(SearchScheduleData inData) {
+    public List<Map<String, Object>> getScheduleShiftWithSelect(SearchScheduleData inData) throws ParseException {
+        //公共参数
+        String reportedTime = inData.getReportedTime();
+        Date scheduledDate = DateUtil.getDateByParten(reportedTime.substring(0, 10), "yyyy-MM-dd");
+        inData.setScheduleDate(scheduledDate);
         return scheduleMapper.getScheduleShiftWithSelect(inData);
     }
 
diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml
index ef595aa..d9f4687 100644
--- a/src/main/resources/mapper/schedule/ScheduleMapper.xml
+++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml
@@ -1045,9 +1045,9 @@
         AND CE.Site=CES.Site and CE.CalendarID=CES.CalendarID and CE.ScheduleDate=CES.ScheduleDate
         AND WR.Site = #{site}
         AND WR.ResourceID = #{resourceId}
-        AND CONVERT(DECIMAL(20,6),CE.ScheduleDate)<![CDATA[>=]]>CONVERT(DECIMAL(20,6), CONVERT(datetime, #{reportedTime})) - 1
-        AND CONVERT(DECIMAL(20,6),CE.ScheduleDate)<![CDATA[<=]]>CONVERT(DECIMAL(20,6), CONVERT(datetime,  #{reportedTime})) + 1
-        AND (CONVERT(DECIMAL(20,6),CE.ScheduleDate) + CONVERT(DECIMAL(20,6), CES.StartTime / 24.0)) <![CDATA[<=]]>(CONVERT(DECIMAL(20,6),CONVERT(datetime,  #{reportedTime})) +
+        AND CONVERT(DECIMAL(20,6),CE.ScheduleDate)<![CDATA[>=]]>CONVERT(DECIMAL(20,6), CONVERT(datetime, #{scheduledDate})) - 1
+        AND CONVERT(DECIMAL(20,6),CE.ScheduleDate)<![CDATA[<=]]>CONVERT(DECIMAL(20,6), CONVERT(datetime,  #{scheduledDate})) + 1
+        AND (CONVERT(DECIMAL(20,6),CE.ScheduleDate) + CONVERT(DECIMAL(20,6), CES.StartTime / 24.0)) <![CDATA[<=]]>(CONVERT(DECIMAL(20,6),CONVERT(datetime,  #{scheduledDate})) +
         (CONVERT(DECIMAL(20,6),CONVERT(datetime,  #{reportedTime})) - floor(CONVERT(DECIMAL(20,6),CONVERT(datetime,  #{reportedTime})))))
         ORDER BY CE.ScheduleDate,CES.Starttime
     </select>