凯和财务优化

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

@@ -293,7 +293,6 @@
         AS fBillstatusName,
         f.f_remarks AS fRemarks,
         f.create_by AS createBy,
-        tp.f_name AS createName,
         f.create_time AS createTime,
         f.update_by AS updateBy,
         f.update_time AS updateTime,
@@ -314,10 +313,6 @@
         FROM
         t_fee AS f
         LEFT JOIN t_corps AS c ON f.f_corpid = c.f_id
-        left join sys_user u on f.create_by = u.user_name
-        left join sys_dept d on f.f_deptid = d.dept_id
-        LEFT JOIN t_customer_contact tc ON tc.f_tel = u.phonenumber
-        LEFT JOIN t_corps tp ON tp.f_id = tc.f_pid
         LEFT JOIN sys_dict_data pro ON pro.dict_value = f.charging_method and pro.dict_type = 'data_settlement_type'
         LEFT JOIN t_vessel tv ON f.f_vslid = tv.f_id
         LEFT JOIN t_voyage ty ON f.f_voyid = ty.f_id
@@ -2218,13 +2213,13 @@
     </select>
     <!--凯和查询财务主表数据-->
     <select id="selectFinancialTFeeId" parameterType="TFee" resultType="com.ruoyi.finance.shipping.FinancialTFee">
-        SELECT
+         SELECT
         f.f_id AS fId,
-        f.f_billno AS srcBillNo,
+        f.f_billno AS fBillno,
         f.f_ctrlcorpid AS fCtrlcorpid,
         pro.dict_label AS chargingMethod,
         f.invoice_no AS invoiceNo,
-        f.bank AS  fBank,
+        f.bank AS fBank,
         f.water_bill_no AS waterBillNo,
         f.f_corpid AS fCorpid,
         c.f_name AS fCorpidName,
@@ -2246,7 +2241,6 @@
         AS fBillstatusName,
         f.f_remarks AS fRemarks,
         f.create_by AS createBy,
-        tp.f_name AS createName,
         f.create_time AS createTime,
         f.update_by AS updateBy,
         f.update_time AS updateTime,
@@ -2255,30 +2249,27 @@
         tre.f_name AS loadportName,
         ts.f_name AS destportName,
         f.f_bank_number AS fBankNumber,
-        f.f_loadportid AS fLoadportid,
-        f.f_destportid AS fDestportid,
-        f.f_vslid AS fVslid,
-        f.f_voyid AS  fVoyid,
-        f.f_from_date AS fFromDate,
-        f.f_to_date AS fToDate,
-        f.f_dc As fDc,
-        f.f_reconciliation AS fReconciliation,
         f.bank AS bank,
         f.invoice_remarks AS invoiceRemarks,
+        f.f_loadportid AS fLoadportid,
+        f.f_destportid AS fDestportid,
+        f.f_billno AS srcBillNo,
         CASE
 
         WHEN f.f_dc = 'D' THEN
         '收'
         WHEN f.f_dc = 'C' THEN
         '付'
-        END AS fSrcdcName
+        END AS fSrcdcName,
+        f.f_vslid AS fVslid,
+        f.f_voyid AS fVoyid,
+        f.f_from_date AS fFromDate,
+        f.f_to_date AS fToDate,
+        f.f_reconciliation AS fReconciliation,
+        f.f_dc AS fDc
         FROM
         t_fee AS f
         LEFT JOIN t_corps AS c ON f.f_corpid = c.f_id
-        left join sys_user u on f.create_by = u.user_name
-        left join sys_dept d on f.f_deptid = d.dept_id
-        LEFT JOIN t_customer_contact tc ON tc.f_tel = u.phonenumber
-        LEFT JOIN t_corps tp ON tp.f_id = tc.f_pid
         LEFT JOIN sys_dict_data pro ON pro.dict_value = f.charging_method and pro.dict_type = 'data_settlement_type'
         LEFT JOIN t_vessel tv ON f.f_vslid = tv.f_id
         LEFT JOIN t_voyage ty ON f.f_voyid = ty.f_id