2026.2.4

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

@@ -6,9 +6,9 @@ spring:
         druid:
             #主数据信息
             master:
-                url: jdbc:sqlserver://172.16.2.170:1433;databaseName=FT546-wcs;
+                url: jdbc:sqlserver://127.0.0.1:1433;databaseName=FT546-WCS;
                 username: sa
-                password: Flrd0914.
+                password: 123456
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

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

@@ -68,7 +68,7 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 172.16.2.170
+    host: 127.0.0.1
     # 端口，默认为6379
     port: 6379
     # 数据库索引

ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml

@@ -67,6 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectMydoJobByTaskNo" parameterType="String" resultMap="MydoJobResult">
             <include refid="selectMydoJobVo"/>
             where task_no = #{taskNo}
+        and execution_phase != '2'
     </select>
     <select id="ddjTaskFinish" parameterType="java.util.Map" statementType="CALLABLE">
         {call proc_mydojob_finish(