解决账单明细导出BUG

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehousebillsfeesController.java

@@ -128,8 +128,8 @@ public class TWarehousebillsfeesController extends BaseController {
      * 导出查询菜单列表
      */
     @GetMapping("/queryMenuExport")
-    public AjaxResult queryMenuExport(TWarehousebillsfees tWarehousebillsfees) throws Exception {
-        List<QueryMenu> list = tWarehousebillsfeesService.queryMenuExport(tWarehousebillsfees);
+    public AjaxResult queryMenuExport(TWarehousebillsfees tWarehousebillsfees) {
+        List<QueryMenu> list = tWarehousebillsfeesService.selectQueryMenuList(tWarehousebillsfees);
         ExcelUtil<QueryMenu> util = new ExcelUtil<>(QueryMenu.class);
         return util.exportExcel(list, "账单明细");
     }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/TWarehousebillsfeesMapper.java

@@ -157,5 +157,5 @@ public interface TWarehousebillsfeesMapper extends BaseMapper<TWarehousebillsfee
      * @param tWarehousebillsfees
      * @return
      */
-    public List<Map<String,Object>> selectQueryMenuList(TWarehousebillsfees tWarehousebillsfees);
+    public List<QueryMenu> selectQueryMenuList(TWarehousebillsfees tWarehousebillsfees);
 }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/ITWarehousebillsfeesService.java

@@ -87,12 +87,6 @@ public interface ITWarehousebillsfeesService {
      * @param tWarehousebillsfees
      * @return
      */
-    public List<Map<String, Object>> selectQueryMenuList(TWarehousebillsfees tWarehousebillsfees);
+    public List<QueryMenu> selectQueryMenuList(TWarehousebillsfees tWarehousebillsfees);
 
-    /**
-     *  获取查询菜单导出数据
-     * @param tWarehousebillsfees
-     * @return
-     */
-    public List<QueryMenu> queryMenuExport(TWarehousebillsfees tWarehousebillsfees) throws Exception;
 }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehousebillsfeesServiceImpl.java

@@ -187,13 +187,8 @@ public class TWarehousebillsfeesServiceImpl implements ITWarehousebillsfeesServi
     }
 
     @Override
-    public List<Map<String, Object>> selectQueryMenuList(TWarehousebillsfees tWarehousebillsfees) {
+    public List<QueryMenu> selectQueryMenuList(TWarehousebillsfees tWarehousebillsfees) {
         return tWarehousebillsfeesMapper.selectQueryMenuList(tWarehousebillsfees);
     }
 
-    @Override
-    public List<QueryMenu> queryMenuExport(TWarehousebillsfees tWarehousebillsfees) throws Exception {
-        List<Map<String, Object>> list = tWarehousebillsfeesMapper.selectQueryMenuList(tWarehousebillsfees);
-        return ListMapToBeanUtils.castMapToBean(list, QueryMenu.class);
-    }
 }

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

@@ -859,43 +859,36 @@
             LIMIT 10
     </select>
 
-    <select id="selectQueryMenuList" parameterType="TWarehousebillsfees" resultType="map">
-        SELECT tf.f_id AS fId,
-        tf.f_pid AS fPid,
-        tf.f_corpid AS fCorpid,
-        tc.f_no AS corpNo,
-        tc.f_cname AS corpCname,
-        tc.f_name AS corpName,
-        tf.f_mblno AS fMblno,
-        tf.f_bsdate AS fBsdate,
-        tf.f_review_date AS fReviewDate,
-        tf.f_feeid AS fFeeid,
-        te.f_no AS feeNo,
-        te.f_name AS feeName,
-        tf.f_dc AS fDc,
-        tf.f_amount AS fAmount,
-        tf.f_stlamount AS fStlamount,
-        tf.f_stlamount_date AS fStlamountDate,
-        tf.f_invamount AS fInvamount,
-        tf.f_invnos AS fInvnos,
-        tf.f_accamount AS fAccamount,
-        tf.f_accamount_date AS fAccamountDate,
-        tf.f_statement_no AS fStatementNo,
-        tf.f_feeUnitid AS fFeeUnitid,
-        tf.f_qty AS fQty,
-        tf.f_unitprice AS fUnitprice,
-        tf.f_billtype AS fBilltype,
-        tf.f_product_name AS fProductName,
-        tf.remark AS remark,
-        tf.price_date_remarks AS priceDateRemarks,
-        CASE
-        WHEN tf.f_billstatus = '1' THEN '录入'
-        WHEN tf.f_billstatus = '2' THEN '暂存'
-        WHEN tf.f_billstatus = '3' THEN '审批驳回'
-        WHEN tf.f_billstatus = '4' THEN '提交审核'
-        WHEN tf.f_billstatus = '5' THEN '审核中'
-        WHEN tf.f_billstatus = '6' THEN '审核通过'
-        END AS fBillstatusName
+    <select id="selectQueryMenuList" parameterType="TWarehousebillsfees" resultType="com.ruoyi.warehouseBusiness.excel.QueryMenu">
+        SELECT
+            tc.f_name AS corpName,
+            tf.f_mblno AS fMblno,
+            tf.f_bsdate AS fBsdate,
+            tf.f_review_date AS fReviewDate,
+            te.f_name AS feeName,
+            tf.f_dc AS fDc,
+            tf.f_amount AS fAmount,
+            tf.f_stlamount AS fStlamount,
+            tf.f_stlamount_date AS fStlamountDate,
+            tf.f_invamount AS fInvamount,
+            tf.f_invnos AS fInvnos,
+            tf.f_accamount AS fAccamount,
+            tf.f_accamount_date AS fAccamountDate,
+            tf.f_statement_no AS fStatementNo,
+            tf.f_feeUnitid AS fFeeUnitid,
+            tf.f_qty AS fQty,
+            tf.f_unitprice AS fUnitprice,
+            tf.f_billtype AS fBilltype,
+            tf.f_product_name AS fProductName,
+            tf.remark AS remark,
+            CASE
+                WHEN tf.f_billstatus = '1' THEN '录入'
+                WHEN tf.f_billstatus = '2' THEN '暂存'
+                WHEN tf.f_billstatus = '3' THEN '审批驳回'
+                WHEN tf.f_billstatus = '4' THEN '提交审核'
+                WHEN tf.f_billstatus = '5' THEN '审核中'
+                WHEN tf.f_billstatus = '6' THEN '审核通过'
+            END AS fBillstatusName
         FROM t_warehousebillsfees tf
         LEFT JOIN t_corps tc ON tc.f_id = tf.f_corpid
         LEFT JOIN t_fees te ON te.f_id = tf.f_feeid