Преглед изворни кода

缺失功能:
私有应收-跟单 差额原因不显示

jiakai пре 2 месеци
родитељ
комит
539f7cc874

+ 5 - 0
commons/src/main/java/com/jzg/commons/entity/finance/vo/FollowCompanyFeeVO.java

@@ -69,4 +69,9 @@ public class FollowCompanyFeeVO {
      */
     private String followId;
 
+    /**
+     * 开票类型  1、手续费  2、跟单费  3、驾意险手续费 4、驾意险跟单费 5、平台应收-车险 6、平台应收-非车险
+     */
+    private String invoiceType;
+
 }

+ 1 - 0
tenant/organization/src/main/resources/mapper/InsFeeFollowOrderMapper.xml

@@ -51,6 +51,7 @@
         ffo.id AS followId,
         ffo.year,
         ffo.month,
+        ffo.invoice_type,
         inv.id AS invoiceId,
         sett.id AS settlementId
         FROM ins_fee_follow_order ffo

+ 1 - 1
tenant/organization/src/main/resources/mapper/ReceivableMapper.xml

@@ -1552,7 +1552,7 @@
         eic.name_simple as companyNameSimple,
         sum( ipiis.actual_received_amount ) AS actual_received_amount,
         ipii.status,
-        ipii.payment_reason,
+        GROUP_CONCAT(DISTINCT iffo.falsely_increased_reason SEPARATOR ',') as paymentReason,
         GROUP_CONCAT(DISTINCT iffo.year SEPARATOR ',') AS year,
         GROUP_CONCAT(DISTINCT iffo.month SEPARATOR ',') AS month,
         iffo.partner_company_id,