优化单票分析查询数据作业类型问题

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsMapper.xml

@@ -1814,15 +1814,14 @@
         WHERE
             w.f_corpid = #{fCorpid}
             AND item.f_mblno = #{fMblno}
-            AND d.dict_type = 'st_in_type'
-            AND IF(item.f_billtype = 'CKDB' and ware.f_charg = 0, w.f_id = '', w.f_id != '')
+            AND IF( item.f_billtype = 'SJRK', d.dict_type = 'st_in_type', IF(item.f_billtype = 'SJCK', d.dict_type = 'st_out_type', d.dict_type = 'st_trans_type'))
             <if test='bsdateList != null and bsdateList[0] != null and bsdateList[0]!= ""'>
                 AND item.f_bsdate &gt;= #{bsdateList[0]}
             </if>
             <if test='bsdateList != null and bsdateList[1] != null and bsdateList[1]!= ""'>
                 AND item.f_bsdate &lt;= #{bsdateList[1]}
             </if>
-        order by item.f_bsdate desc
+        order by item.f_bsdate asc
     </select>
 
     <select id="selectSingleAnalysisFees" parameterType="com.ruoyi.reportManagement.domain.SingleAnalysisFeesExcel" resultType="com.ruoyi.reportManagement.domain.SingleAnalysisFeesExcel">
@@ -1845,15 +1844,14 @@
             LEFT JOIN sys_dict_data d ON d.dict_value = f.f_business_type
         WHERE
             item.f_mblno = #{fMblno}
-            AND d.dict_type = 'st_in_type'
-            AND IF(item.f_billtype = 'CKDB' and ware.f_charg = 0, w.f_id = '', w.f_id != '')
+            AND IF( item.f_billtype = 'SJRK', d.dict_type = 'st_in_type', IF(item.f_billtype = 'SJCK', d.dict_type = 'st_out_type', d.dict_type = 'st_trans_type'))
             <if test='bsdateList != null and bsdateList[0] != null and bsdateList[0]!= ""'>
                 AND item.f_bsdate &gt;= #{bsdateList[0]}
             </if>
             <if test='bsdateList != null and bsdateList[1] != null and bsdateList[1]!= ""'>
                 AND item.f_bsdate &lt;= #{bsdateList[1]}
             </if>
-        order by f.create_time desc
+        order by f.create_time asc
     </select>
 
 </mapper>