路口信号方案周期，特殊日期时bug修改

signal-optimize-service/src/main/java/net/wanji/opt/dao/mapper/judgeanalysis/CrossSignalPlanMapper.java

@@ -7,7 +7,7 @@ import java.util.Map;
 
 public interface CrossSignalPlanMapper {
 
-    List<Map<String, String>> getSpecialDate(@Param("crossId") String crossId);
+    List<Map<String, String>> getSpecialDate(@Param("crossId") String crossId,@Param("startTime") String startTime,@Param("endTime") String endTime);
 
     List<Map<String, String>> getByDateScope(@Param("crossId") String crossId,@Param("weekNumber") Integer weekNumber);
 

signal-optimize-service/src/main/java/net/wanji/opt/servicev2/judgeanalysis/impl/CrossSignalPlanServiceImpl.java

@@ -24,7 +24,7 @@ public class CrossSignalPlanServiceImpl implements CrossSignalPlanService {
 
         List<String> dateRange = generateDateRange(startTime, endTime);
         //查询路口特殊日期
-        List<Map<String,String>> specialDates = crossSignalPlanMapper.getSpecialDate(crossId);
+        List<Map<String,String>> specialDates = crossSignalPlanMapper.getSpecialDate(crossId,startTime,endTime);
         List<Map<String,String>> result = new ArrayList<>();
         dateRange.forEach(x->{
             //非特殊日期周期查询

signal-optimize-service/src/main/resources/mapper/judgeanalysis/CrossSignalPlanMapper.xml

@@ -6,7 +6,13 @@
     </select>
 
     <select id="getSpecialDate" resultType="java.util.Map">
-        SELECT special_date,plan_id FROM t_base_cross_schedules_plan where cross_id = #{crossId} and week = 0
+        SELECT DATE_FORMAT(special_date, '%Y-%m-%d %H:%i:%s') AS special_date, plan_id
+        FROM t_base_cross_schedules_plan
+        WHERE cross_id = #{crossId}
+          <if test="endTime != null and endTime != '' and startTime != null and startTime !='' ">
+              and special_date between #{startTime} and #{endTime}
+          </if>
+          AND week = 0
     </select>
     <select id="getSpecialByDateScope" resultType="java.util.Map">
         SELECT b.start_time as startTime,b.end_time as endTime,cycle from t_base_cross_section as b LEFT JOIN t_base_cross_scheme as c on b.scheme_id = c.id  where b.cross_id = #{crossId} and b.plan_id = #{planId} ORDER BY start_time