change - 任务记录查询修改

ruoyi-admin/src/main/resources/application-druid.yml

@@ -6,12 +6,12 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:oracle:thin:@124.70.0.226:1521:ORCL
-                username: system
-                password: 123456
-#                url: jdbc:oracle:thin:@10.100.71.119:1521:ORCL
+#                url: jdbc:oracle:thin:@124.70.0.226:1521:ORCL
 #                username: system
-#                password: aucma
+#                password: 123456
+                url: jdbc:oracle:thin:@10.100.71.119:1521:ORCL
+                username: system
+                password: aucma
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

ruoyi-admin/src/main/resources/application.yml

@@ -140,4 +140,4 @@ swagger:
 
 #可视化看板服务器地址
 scadavisual:
-  address: http://10.100.71.119:8012
+  address: http://127.0.0.1:8012

ruoyi-system/src/main/resources/mapper/system/PrepareOutstoreInfoMapper.xml

@@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <sql id="orderByRecordDate">
-        order by record_time desc
+        order by begin_time desc
     </sql>
 
     <select id="selectPrepareOutstoreInfoList" parameterType="PrepareOutstoreInfo" resultMap="PrepareOutstoreInfoResult">
@@ -38,8 +38,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="operationType != null"> and operation_type = #{operationType}</if>
             <if test="outstoreStauts != null"> and outstore_stauts = #{outstoreStauts}</if>
             <if test="storeCode != null  and storeCode != ''"> and store_code = #{storeCode}</if>
-            <if test="params.beginRecordTime != null and params.beginRecordTime != '' and params.endRecordTime != null and params.endRecordTime != '' "> and TO_CHAR(record_time,'yyyy-MM-dd HH24:mm:ss') between #{params.beginRecordTime} and #{params.endRecordTime}</if>
+            <if test="params.beginRecordTime != null and params.beginRecordTime != '' and params.endRecordTime != null and params.endRecordTime != '' "> and TO_CHAR(begin_time,'yyyy-MM-dd HH24:mm:ss') between #{params.beginRecordTime} and #{params.endRecordTime}</if>
         </where>
+        order by begin_time desc
     </select>
     
     <select id="selectPrepareOutstoreInfoByObjid" parameterType="String" resultMap="PrepareOutstoreInfoResult">

ruoyi-system/src/main/resources/mapper/system/RecordTaskMapper.xml

@@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <sql id="orderByRecordDate">
-        order by record_time desc
+        order by begin_time desc
     </sql>
 
     <select id="selectRecordTaskList" parameterType="RecordTask" resultMap="RecordTaskResult">
@@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="taskStatus != null"> and task_status like concat(concat('%', #{taskStatus}), '%')</if>
             <if test="operationType != null "> and operation_type = #{operationType}</if>
             <if test="taskType != null "> and task_type = #{taskType}</if>
-            <if test="params.beginRecordTime != null and params.beginRecordTime != '' and params.endRecordTime != null and params.endRecordTime != '' "> and TO_CHAR(record_time,'yyyy-MM-dd HH24:mm:ss') between #{params.beginRecordTime} and #{params.endRecordTime}</if>
+            <if test="params.beginRecordTime != null and params.beginRecordTime != '' and params.endRecordTime != null and params.endRecordTime != '' "> and TO_CHAR(begin_time,'yyyy-MM-dd HH24:mm:ss') between #{params.beginRecordTime} and #{params.endRecordTime}</if>
         </where>
         <include refid="orderByRecordDate"/>
     </select>