修改act和绕路

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

@@ -21,9 +21,9 @@ spring:
         # 从数据源开关/默认关闭
         enabled: true
 #        测试
-#        url: jdbc:firebirdsql://49.4.78.17:3050/C:\sealong\TMS\DataDemo\SLEMP-TMS.FB25?encoding=GB_2312
+        url: jdbc:firebirdsql://49.4.78.17:3050/C:\sealong\TMS\DataDemo\SLEMP-TMS.FB25?encoding=GB_2312
 #        正式
-        url: jdbc:firebirdsql://49.4.78.17:3050/C:\sealong\TMS\DataZBCD\SLEMP-TMS.FB25?encoding=GB_2312
+#        url: jdbc:firebirdsql://49.4.78.17:3050/C:\sealong\TMS\DataZBCD\SLEMP-TMS.FB25?encoding=GB_2312
 
         username: SYSDBA
         password: masterkey

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OrderBillsPlansServiceImpl.java

@@ -466,7 +466,7 @@ public class OrderBillsPlansServiceImpl implements IOrderBillsPlansService {
     @Override
     public AjaxResult upReceipts(Long orderNo,String actId,String entityId) {
         int i = orderBillsPlansMapper.upReceipts(orderNo);
-        orderBillsPlansMapper.approvedTaskListV1(actId,entityId,"2");
+        orderBillsPlansMapper.approvedTaskListV1("317",entityId,"2");
         orderBillsPlansMapper.approvedTaskListV1(actId,entityId,"6");
         if (i == 1) {
             return AjaxResult.success("ok");

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

@@ -24,9 +24,15 @@
 
 
         ifDetour = #{ifDetour},
-        detourEmptyMile = #{detourEmptyMile},
-        detourLoadMile = #{detourLoadMile},
-        detourDesc = #{detourDesc},
+        <if test="detourEmptyMile != null">
+            detourEmptyMile = #{detourEmptyMile},
+        </if>
+        <if test="detourLoadMile != null">
+            detourLoadMile = #{detourLoadMile},
+        </if>
+        <if test="detourDesc != null">
+            detourDesc = #{detourDesc},
+        </if>
 
         driverassdesc = #{driverassdesc}
         where sysId = '1'