修改排序

zh-baseversion-system/src/main/resources/mapper/system/TLpgAirChargeFilesMapper.xml

@@ -37,6 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="vaseCode != null  and vaseCode != ''"> and f_vase_code like concat('%', #{vaseCode}, '%') </if>
             <if test="barCode != null  and barCode != ''"> and f_bar_code like concat('%', #{barCode}, '%') </if>
         </where>
+        order by files.f_fill_statr_time desc
     </select>
     <select id="queryAllForExport" resultMap="TLpgAirChargeFilesResult">
         <include refid="selectTLpgAirChargeFilesVo"/>

zh-baseversion-system/src/main/resources/mapper/system/TLpgDeliveryRecordMapper.xml

@@ -53,8 +53,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deliveryAddress != null  and deliveryAddress != ''"> and delivery.delivery_address = #{deliveryAddress}</if>
             <if test="deliveryDate != null "> and delivery.delivery_date = #{deliveryDate}</if>
             <if test="isDel != null  and isDel != ''"> and delivery.is_del = #{isDel}</if>
-            <if test="bottleCode != null  and bottleCode != ''"> and bottle.f_bottle_code like concat('%', #{bottleCode}, '%')</if>
+            <if test="bottleCode != null  and bottleCode != ''"> and delivery.f_bottle_code like concat('%', #{bottleCode}, '%')</if>
         </where>
+        order by  delivery_date desc
     </select>
     <select id="queryAllByBottleCodeLimit2" resultMap="TLpgDeliveryRecordResult">
         <include refid="selectTLpgDeliveryRecordVo"></include>