装卸货显示最近30条数据。

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

@@ -702,7 +702,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)));
+        //map.put("limitTime", sdf.format(new Date(new Date().getTime() - 43200000)));
         List<Map<String, Object>> allLoaderLoadingOrder = omstruckOrderSeparateMapper.getAllLoaderLoadingOrder(map);
         return allLoaderLoadingOrder;
     }

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

@@ -2942,7 +2942,7 @@
             || '   ' || (
             CASE WHEN ams.DELETED IS NOT NULL
             THEN '取消装货'
-            ELSE decode(OOM.MATERIAL_PRIORITY, 71, '', RW.WAREHOUSE_NAME)
+            ELSE RW.WAREHOUSE_NAME
             end
             )
         </if>
@@ -2996,7 +2996,7 @@
                     CASE
                         WHEN ams.DELETED IS NOT NULL
                             THEN '取消装货'
-                        ELSE decode(OOM.MATERIAL_PRIORITY, 71, '', RW.WAREHOUSE_NAME)
+                        ELSE RW.WAREHOUSE_NAME
                         END
                     )
                                                                                             "materialName",
@@ -4176,9 +4176,9 @@
                       LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
                                 ON TWR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
              where TLR.CAPACITY_REMARK IS NOT NULL and TLR.CAPACITY_REMARK=#{userName}
-               and TLR.RESULT_LOAD_END_TIME >= to_date(#{limitTime}, 'yyyy-mm-dd')
+              <!-- and TLR.RESULT_LOAD_END_TIME >= to_date(#{limitTime}, 'yyyy-mm-dd') -->
              GROUP BY TLR.CAPACITY_REMARK
-            )
+            ) where rownum &lt;= 30
     </select>
 
     <select id="getLineSeq" parameterType="DECIMAL" resultType="DECIMAL" >
@@ -4646,7 +4646,7 @@
                     CASE
                         WHEN ams.DELETED IS NOT NULL
                             THEN '取消装货'
-                        ELSE decode(oom.MATERIAL_PRIORITY, 71, '', RW.WAREHOUSE_NAME)
+                        ELSE RW.WAREHOUSE_NAME
                         END
                     )
                                                                                             "materialName",

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

@@ -622,20 +622,21 @@
     </update>
     <!--  通过装卸工SSOID查询装过的订单信息  -->
     <select id="getAllLoaderLoadingOrder" parameterType="map" resultType="java.util.Map">
-        select OO.ORDER_ID  "orderId",
-               OO.ORDER_NUMBER "orderNumber",
-               RC.CAPACITY_NUMBER   "capacityNumber",
-               TWR.RESULT_NET_WEIGHT "netWeight",
-               RM.MATERIAL_NAME "materialName"
+        SELECT * FROM (
+        select OO.ORDER_ID "orderId",
+        OO.ORDER_NUMBER "orderNumber",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        TWR.RESULT_NET_WEIGHT "netWeight",
+        RM.MATERIAL_NAME "materialName"
         from OMSTRUCK_ORDER OO
         left join TMSTRUCK_TOTAL_RESULT TTR
-            on TTR.ORDER_ID = OO.ORDER_ID
+        on TTR.ORDER_ID = OO.ORDER_ID
         left join RMS_CAPACITY RC
-            on RC.CAPACITY_ID = OO.CAPACITY_ID
+        on RC.CAPACITY_ID = OO.CAPACITY_ID
         left join TMSTRUCK_WEIGHT_RESULT TWR
-            on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         left join RMS_MATERIAL RM
-            on RM.MATERIAL_ID = TWR.MATERIAL_ID
+        on RM.MATERIAL_ID = TWR.MATERIAL_ID
         <if test="loaderSsoId != null">
             left join TMSTRUCK_LOAD_RESULT TLR
             on TLR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
@@ -652,19 +653,17 @@
         <where>
             <if test="loaderSsoId != null">
                 RP.PERSONNEL_SSO_ID = #{loaderSsoId}
-                and TLR.RESULT_LOAD_END_TIME >= to_date(#{limitTime}, 'yyyy-mm-dd')
+                <!--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')
+                <!--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>  
+        ) where rownum &lt;= 30
+    </select>
   	<select id="getOrderPlanEnable" resultType="java.lang.Integer">
         SELECT  AIP.PLAN_EABLE_STATUS
         FROM