修改bug

src/main/java/com/steerinfo/dil/service/impl/OmstruckOrderSeparateServiceImpl.java

@@ -550,6 +550,7 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
     public List<Map<String, Object>> getAllLoadUnloadResult(@RequestBody(required = false) Map<String, Object> map){
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         map.put("limitTime", sdf.format(new Date(new Date().getTime() - 43200000)));
-        return omstruckOrderSeparateMapper.getAllLoaderLoadingOrder(map);
+        List<Map<String, Object>> allLoaderLoadingOrder = omstruckOrderSeparateMapper.getAllLoaderLoadingOrder(map);
+        return allLoaderLoadingOrder;
     }
 }

src/main/resources/application-dev.yml

@@ -13,7 +13,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8083}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
+    url: ${TMSTRUCKFEIGN_URL:localhost:8008}
   AmsFeign:
     url: ${AMSFEIGN_URL:172.16.33.162:8015}
   ImFeign:

src/main/resources/com/steerinfo/dil/mapper/OmstruckOrderMapper.xml

@@ -2773,9 +2773,12 @@
         <if test="status == null">
             AND OO.ORDER_STATUS in (4, 5, 6)
         </if>
-        <if test="status != null">
+        <if test="status == 2">
             AND OO.ORDER_STATUS = 2
         </if>
+        <if test="status == 22">
+            AND OO.ORDER_STATUS in (2, 4, 5, 6)
+        </if>
     </select>
 
 <!--查询采购零星物资信息给app 12 -->
@@ -2801,9 +2804,12 @@
         <if test="status == null">
             AND OO.ORDER_STATUS in (4, 5, 6)
         </if>
-        <if test="status != null">
+        <if test="status == 2">
             AND OO.ORDER_STATUS = 2
         </if>
+        <if test="status == 22">
+            AND OO.ORDER_STATUS in (2, 4, 5, 6)
+        </if>
     </select>
 
     <!--  查询内转运输订单给APP 9 10 11-->
@@ -2834,9 +2840,12 @@
         <if test="status == null">
             AND OO.ORDER_STATUS in (4, 5, 6)
         </if>
-        <if test="status != null">
+        <if test="status == 2">
             AND OO.ORDER_STATUS = 2
         </if>
+        <if test="status == 22">
+            AND OO.ORDER_STATUS in (2, 4, 5, 6)
+        </if>
         <if test="orderStatus == 4">
             AND AIP.PLAN_EABLE_STATUS = 1
         </if>
@@ -2896,12 +2905,15 @@
                  LEFT JOIN RMS_RECEIVE_ADDRESS RDA
                            ON RDA.ADDRESS_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
         WHERE OO.ORDER_ID = #{orderId}
-          <if test="status == null">
-              AND OO.ORDER_STATUS in (4, 5, 6)
-          </if>
-          <if test="status != null">
-              AND OO.ORDER_STATUS = 2
-          </if>
+        <if test="status == null">
+            AND OO.ORDER_STATUS in (4, 5, 6)
+        </if>
+        <if test="status == 2">
+            AND OO.ORDER_STATUS = 2
+        </if>
+        <if test="status == 22">
+            AND OO.ORDER_STATUS in (2, 4, 5, 6)
+        </if>
     </select>
 
 

src/main/resources/com/steerinfo/dil/mapper/OmstruckOrderSeparateMapper.xml

@@ -600,21 +600,27 @@
             left join RMS_PERSONNEL RP
             on RP.PERSONNEL_ID = TLR.LOADER_ID
         </if>
-        <if test="loaderSsoId != null">
+        <if test="unLoaderSsoId != null">
             left join TMSTRUCK_UNLOAD_RESULT TUR
             on TUR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
             left join RMS_PERSONNEL RP
             on RP.PERSONNEL_ID = TUR.UNLOADER_ID
         </if>
 
-        where RP.PERSONNEL_SSO_ID = #{loaderSsoId}
-        <if test="loaderSsoId != null">
-            and TLR.RESULT_LOAD_END_TIME >= to_date(#{limitTime}, 'yyyy-mm-dd')
-            order by TLR.RESULT_LOAD_END_TIME desc
-        </if>
-        <if test="unLoaderSsoId != null">
-            and TUR.RESULT_END_TIME >= to_date(#{limitTime}, 'yyyy-mm-dd')
-            order by TUR.RESULT_END_TIME desc
-        </if>
+        <where>
+            <if test="loaderSsoId != null">
+                RP.PERSONNEL_SSO_ID = #{loaderSsoId}
+                and TLR.RESULT_LOAD_END_TIME >= to_date(#{limitTime}, 'yyyy-mm-dd')
+                order by TLR.RESULT_LOAD_END_TIME desc
+            </if>
+            <if test="unLoaderSsoId != null">
+                RP.PERSONNEL_SSO_ID = #{unLoaderSsoId}
+                and TUR.RESULT_END_TIME >= to_date(#{limitTime}, 'yyyy-mm-dd')
+                order by TUR.RESULT_END_TIME desc
+            </if>
+            <if test="loaderSsoId == null and unLoaderSsoId == null">
+                rownum &lt; 100
+            </if>
+        </where>
     </select>
 </mapper>