日历sql的修改

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)

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

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);
     }
 

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>