From e091c97494612b0c6172ff1aaf388845a90e4d0e Mon Sep 17 00:00:00 2001
From: liuguijing <123456>
Date: Wed, 24 May 2023 16:23:57 +0800
Subject: [PATCH] =?UTF-8?q?RequestResultsDao.xml=20integer=20=20bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mappers/RequestResultsDao.xml   | 20 +++++++++----------
 .../impl/TerminalScheduleRuleServiceImpl.java |  1 +
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/xymanager_dao/src/main/resources/mappers/RequestResultsDao.xml b/xymanager_dao/src/main/resources/mappers/RequestResultsDao.xml
index 903ec16..40c57e8 100644
--- a/xymanager_dao/src/main/resources/mappers/RequestResultsDao.xml
+++ b/xymanager_dao/src/main/resources/mappers/RequestResultsDao.xml
@@ -9,7 +9,7 @@
         <result column="client_id" jdbcType="TINYINT" property="clientId"/>
         <result column="request_id" jdbcType="INTEGER" property="requestId"/>
         <result column="result" jdbcType="TINYINT" property="result"/>
-        <result column="request_schedule_status" jdbcType="INT" property="scheduleStatus"/>
+        <result column="request_schedule_status" jdbcType="INTEGER" property="scheduleStatus"/>
         <result column="request_time" jdbcType="BIGINT" property="requestTime"/>
         <result column="create_time" jdbcType="BIGINT" property="createTime"/>
         <result column="data" jdbcType="LONGVARCHAR" property="data"/>
@@ -32,15 +32,15 @@
         where request_id = #{requestId}
     </select>
 
-    <select id="selectByTypeAndStatus" resultMap="BaseResultMap">
-        select
-        <include refid="Base_Column_List"/>
-        from request_results
-        where request_type = #{requesttype}
-        and client_id = #{clientid}
-        and result = #{result}
-        and request_schedule_status = #{schedulestatus}
-    </select>
+<!--    <select id="selectByTypeAndStatus" resultMap="BaseResultMap">-->
+<!--        select-->
+<!--        <include refid="Base_Column_List"/>-->
+<!--        from request_results-->
+<!--        where request_type = #{requesttype}-->
+<!--        and client_id = #{clientid}-->
+<!--        and result = #{result}-->
+<!--        and request_schedule_status = #{schedulestatus}-->
+<!--    </select>-->
 
     <select id="selectByRequestIdList" resultMap="BaseResultMap">
         select
diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalScheduleRuleServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalScheduleRuleServiceImpl.java
index 2829589..8edbb40 100644
--- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalScheduleRuleServiceImpl.java
+++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalScheduleRuleServiceImpl.java
@@ -255,6 +255,7 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
         for (int j = 0; j < dtoList.size(); j++) {
             Integer span = dtoList.get(j).getSpan();
             Date startTime = dtoList.get(j).getStartTime();
+
             Short startHour = Short.parseShort(MyDateUtils.parseHourAndMinute(startTime).split("/")[0]);
             Short startMin = Short.parseShort(MyDateUtils.parseHourAndMinute(startTime).split("/")[1]);
             Date endTime = dtoList.get(j).getEndTime();