bug修改

src/main/resources/mybatis/wisdom/RkInfoMapper.xml

@@ -1228,7 +1228,9 @@
     <select id="selectAllRkInfo"
             parameterType="com.zg.project.wisdom.domain.RkInfo"
             resultMap="RkInfoResult">
+
         <include refid="selectRkInfoVo"/>
+
         <where>
             (ri.is_delete = '0' OR ri.is_delete = 0 OR ri.is_delete IS NULL)
 
@@ -1242,25 +1244,29 @@
                     #{item}
                 </foreach>
             </if>
+
             <if test="(isChukuList == null or isChukuList.size() == 0)
-          and isChuku != null">
+                  and isChuku != null">
                 AND ri.is_chuku = #{isChuku}
             </if>
+
             <if test="warehouseCode != null and warehouseCode != ''">
                 AND ri.cangku = #{warehouseCode}
             </if>
+
             <if test="parentWarehouseCode != null and parentWarehouseCode != ''">
                 AND wh.parent_warehouse_code = #{parentWarehouseCode}
             </if>
 
-            <!-- Date 类型：只能判 null，别再判 '' -->
+            <!-- 入库时间 -->
             <if test="startTime != null">
                 AND ri.rk_time <![CDATA[ >= ]]> #{startTime}
             </if>
             <if test="endTime != null">
-                AND ri.rk_time <![CDATA[ <= ]]> #{endTime}
+                AND ri.rk_time <![CDATA[ < ]]> DATE_ADD(#{endTime}, INTERVAL 1 SECOND)
             </if>
 
+            <!-- 归还时间 -->
             <if test="statDate != null">
                 AND ri.return_time <![CDATA[ >= ]]> #{statDate}
             </if>
@@ -1271,16 +1277,17 @@
             <if test="rkType != null and rkType != ''">
                 AND ri.rk_type = #{rkType}
             </if>
+
             <if test="wlType != null and wlType != ''">
                 AND ri.wl_type = #{wlType}
             </if>
 
-            <!-- Date 类型：只能判 null -->
+            <!-- 出库时间 -->
             <if test="lyStartTime != null">
                 AND ri.ly_time <![CDATA[ >= ]]> #{lyStartTime}
             </if>
             <if test="lyEndTime != null">
-                AND ri.ly_time <![CDATA[ <= ]]> #{lyEndTime}
+                AND ri.ly_time <![CDATA[ < ]]> DATE_ADD(#{lyEndTime}, INTERVAL 1 SECOND)
             </if>
 
             <if test="xmNo != null and xmNo != ''">
@@ -1323,9 +1330,15 @@
                 AND ri.fycde_2 LIKE CONCAT('%', #{fycde2}, '%')
             </if>
         </where>
-        ORDER BY ri.create_time DESC, ri.id DESC
+
+        <!-- ✅ 核心排序规则 -->
+        ORDER BY
+        COALESCE(ri.ly_time, ri.rk_time) DESC,
+        ri.id DESC
+
     </select>
 
+
     <select id="selectDeliveryCkList"
             parameterType="com.zg.project.wisdom.domain.RkInfo"
             resultMap="RkInfoResult">