Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/plugin/CcbController.java

ruoyi-admin/src/main/java/com/ruoyi/web/controller/shipping/finance/FinancialController.java

@@ -173,6 +173,10 @@ public class FinancialController  extends BaseController {
     }
     /**
      * 导出对账明细
+     *
+     * 2022/6/22
+     * 修改 导出的excel名称改为结算单位
+     *
      */
     @GetMapping("/exportItems/{fId}")
     public AjaxResult exportItems(@PathVariable("fId") Long fId) {

ruoyi-warehouse/src/main/java/com/ruoyi/finance/service/impl/TFeeServiceImpl.java

@@ -1465,7 +1465,8 @@ public class TFeeServiceImpl implements ITFeeService {
     @Override
     public String findCtrlcorpid(Long fId) {
         TFee tFee = tFeeMapper.selectTFeeById(fId);
-        String exportName = tFee.getfCtrlcorpid() + "-" + tFee.getfBillno();
+        //String exportName = tFee.getfCtrlcorpid() + "-" + tFee.getfBillno();
+        String exportName = tFee.getfCorpidName() + "-" + tFee.getfBillno();
         return exportName;
     }
 

ruoyi-warehouse/src/main/resources/mapper/finance/TFeeMapper.xml

@@ -448,8 +448,53 @@
     </select>
 
     <select id="selectTFeeById" parameterType="Long" resultMap="TFeeResult">
-        <include refid="selectTFeeVo"/>
-        where f_id = #{fId}
+        select f.f_id,
+        f.f_billno,
+        f.f_ctrlcorpid,
+        f.f_act_id,
+        f.f_corpid,
+        c.f_name AS fCorpidName,
+        f.t_mblno,
+        f.f_trans_act_id,
+        f.f_amtdr,
+        f.f_amtcr,
+        f.f_billtype,
+        f.f_billstatus,
+        f.f_remarks,
+        f.f_from_date,
+        f.f_to_date,
+        f.f_accbilldate,
+        f.f_ref_no,
+        f.del_flag,
+        f.create_by,
+        f.f_deptid,
+        f.create_time,
+        f.update_by,
+        f.update_time,
+        f.charging_method,
+        f.f_totalamount,
+        f.invoice_no,
+        f.bank,
+        f.water_bill_no,
+        f.f_system_type,
+        f.f_tracking_number,
+        f.f_invoice_rise,
+        f.f_sign,
+        f.f_send_Time,
+        f.f_apply_money,
+        f.f_account_id,
+        f.f_make,
+        f.f_vslid,
+        f.f_voyid,
+        f.f_loadportid,
+        f.f_destportid,
+        f.f_dc,
+        f.f_bank_number,
+        f.f_reconciliation,
+        f.invoice_remarks
+        from t_fee AS f
+        LEFT JOIN t_corps AS c ON f.f_corpid = c.f_id
+        where f.f_id = #{fId}
     </select>
     <select id="selectTFeeByIdNew" parameterType="Long" resultMap="TFeeResult">
         SELECT f.f_id,