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

commons/src/main/java/com/jzg/commons/entity/finance/dto/ExportSuperviseSettlementDetailExcelDto.java

@@ -105,4 +105,11 @@ public class ExportSuperviseSettlementDetailExcelDto {
     @ExcelProperty(value = "结算时间")
     private LocalDateTime settlementTime;
 
+    @Schema(description = "对接人")
+    @ExcelProperty(value = "对接人")
+    private String contactPerson;
+
+    @Schema(description = "对接人手机号")
+    @ExcelProperty(value = "对接人手机号")
+    private  String contactPersonPhone;
 }

commons/src/main/java/com/jzg/commons/entity/quote/vo/base/OrderBase.java

@@ -31,6 +31,11 @@ public class OrderBase implements Serializable {
      */
     private String quoteNo;
 
+    /**
+     * 订单来源 0 pc  1 app
+     */
+    private String orderSource;
+
     /**
      * 保司订单号
      */

tenant/organization/src/main/java/com/jzg/organization/service/impl/ReceivableServiceImpl.java

@@ -3104,6 +3104,11 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
             log.info(msg);
             return HttpResult.error(msg, Collections.emptyList());
         }
+        // add by lipf, 前端保险公司的查询条件未生效，进行bug修复
+        if(StrUtil.isNotEmpty(queryVo.getCompanyId())){
+            allCompaniesIncomeDatas = allCompaniesIncomeDatas.stream()
+                    .filter(action-> queryVo.getCompanyId().equals(action.getCompanyId())).toList();
+        }
         // 2. 汇总后，计算得到已开票，未开票，已结算，未结算的数据
         allCompaniesIncomeDatas = this.calStatisAmount(allCompaniesIncomeDatas, queryVo, systemCode);
         // 3. 填充保险公司的父级保险公司

tenant/organization/src/main/resources/mapper/ReceivableMapper.xml

@@ -462,7 +462,7 @@
         ipi.agreement_name as agreementName,
         io.entry_status as entryStatus,
         ipi.license_no as licenseNo,
-        (ipi.jq_receivable_premium + ipi.sy_receivable_premium + ipi.jy_receivable_premium) as receivableAmount,
+        (COALESCE(ipi.jq_receivable_premium,0)  + COALESCE(ipi.sy_receivable_premium,0)  + COALESCE(ipi.jy_receivable_premium,0) ) as receivableAmount,
         io.product_name as productName,
         iocui.name AS insuredPerson,
         ipi.jy_premium as jqPremium,
@@ -728,7 +728,7 @@
     </select>
 
     <select id="getSuperviseSettlementDetailExcelDtos" resultType="com.jzg.commons.entity.finance.dto.ExportSuperviseSettlementDetailExcelDto">
-        select
+        select ipi.contact_person, ipi.contact_person_phone,
         ipiis.id as settlementId,
         ipiis.invoice_id as invoiceId,
         io.company_name as companyName,
@@ -739,7 +739,7 @@
         ipii.invoice_type as invoiceType,
         ipii.invoice_party as invoiceParty,
         ipii.tax_point as taxPoint,
-        (ipi.jq_supervise_costs_premiums + ipi.sy_supervise_costs_premiums + ipi.jy_supervise_costs_premiums) as receivableSuperviseCosts,
+        (COALESCE(ipi.jq_supervise_costs_premiums,0)  + COALESCE(ipi.sy_supervise_costs_premiums,0)  + COALESCE(ipi.jy_supervise_costs_premiums,0) ) as receivableSuperviseCosts,
         ipi.jq_premium as jqPremium,
         ipi.jq_supervise_costs_proportion as jqSuperviseCostsProportion,
         ipi.jq_policy_no as jqPolicyNo,
@@ -810,7 +810,7 @@
         ipii.invoice_type as invoiceType,
         ipii.invoice_party as invoiceParty,
         ipii.tax_point as taxPoint,
-        (ipi.jq_supervise_costs_premiums + ipi.sy_supervise_costs_premiums + ipi.jy_supervise_costs_premiums) as receivableSuperviseCosts,
+        (COALESCE(ipi.jq_supervise_costs_premiums,0) + COALESCE(ipi.sy_supervise_costs_premiums,0) + COALESCE(ipi.jy_supervise_costs_premiums,0)) as receivableSuperviseCosts,
         ipi.jy_premium as jqPremium,
         ipi.jy_supervise_costs_proportion as jySuperviseCostsProportion,
         ipi.jy_policy_no as jqPolicyNo,
@@ -870,7 +870,7 @@
         ipi.agreement_name as agreementName,
         io.entry_status as entryStatus,
         ipi.license_no as licenseNo,
-        (ipi.jq_other_costs_premiums + ipi.sy_other_costs_premiums + ipi.jy_other_costs_premiums) as receivableAmount,
+        (COALESCE(ipi.jq_other_costs_premiums,0)  + COALESCE(ipi.sy_other_costs_premiums,0)  + COALESCE(ipi.jy_other_costs_premiums,0) ) as receivableAmount,
         io.product_name as productName,
         iocui.name AS insuredPerson,
         ipi.jq_premium as jqPremium,
@@ -931,7 +931,7 @@
         ipi.agreement_name as agreementName,
         io.entry_status as entryStatus,
         ipi.license_no as licenseNo,
-        (ipi.jq_other_costs_premiums + ipi.sy_other_costs_premiums + ipi.jy_other_costs_premiums) as receivableAmount,
+        (COALESCE(ipi.jq_other_costs_premiums,0)  + COALESCE(ipi.sy_other_costs_premiums,0)  + COALESCE(ipi.jy_other_costs_premiums,0) ) as receivableAmount,
         ipi.product_name as productName,
         iocui.name AS insuredPerson,
         ipi.jy_premium as jyPremium,
@@ -1027,7 +1027,7 @@
         ipii.invoice_type as invoiceType,
         ipii.invoice_party as invoiceParty,
         ipii.tax_point as taxPoint,
-        (ipi.jq_other_costs_premiums + ipi.sy_other_costs_premiums + ipi.jy_other_costs_premiums) as receivableOtherCosts,
+        (COALESCE(ipi.jq_other_costs_premiums,0)  + COALESCE(ipi.sy_other_costs_premiums,0)  + COALESCE(ipi.jy_other_costs_premiums,0) ) as receivableOtherCosts,
         ipi.jq_premium as jqPremium,
         ipi.jq_other_costs_proportion as jqOtherCostsProportion,
         ipi.jq_policy_no as jqPolicyNo,
@@ -1092,7 +1092,7 @@
         ipii.invoice_type as invoiceType,
         ipii.invoice_party as invoiceParty,
         ipii.tax_point as taxPoint,
-        (ipi.jq_other_costs_premiums + ipi.sy_other_costs_premiums + ipi.jy_other_costs_premiums) as receivableSuperviseCosts,
+        (COALESCE(ipi.jq_other_costs_premiums,0)  + COALESCE(ipi.sy_other_costs_premiums,0)  + COALESCE(ipi.jy_other_costs_premiums,0) ) as receivableSuperviseCosts,
         ipi.jy_premium as jqPremium,
         ipi.jy_other_costs_proportion as jqOtherCostsProportion,
         ipi.jy_policy_no as jqPolicyNo,
@@ -1308,9 +1308,9 @@
         eic.id as company_id,
         eic.parent_id,
         eic.name as company_name,
-        COALESCE(SUM(ipi.jq_receivable_premium + ipi.sy_receivable_premium + ipi.jy_receivable_premium), 0) as total_receivable,
-        COALESCE(SUM(ipi.jq_supervise_costs_premiums + ipi.sy_supervise_costs_premiums + ipi.jy_supervise_costs_premiums), 0) as supervise_fee,
-        COALESCE(SUM(ipi.jq_other_costs_premiums + ipi.sy_other_costs_premiums + ipi.jy_other_costs_premiums), 0) as follow_fee,
+        COALESCE(SUM(COALESCE(ipi.jq_receivable_premium,0)  + COALESCE(ipi.sy_receivable_premium,0)  + COALESCE(ipi.jy_receivable_premium,0) ), 0) as total_receivable,
+        COALESCE(SUM(COALESCE(ipi.jq_supervise_costs_premiums,0)  + COALESCE(ipi.sy_supervise_costs_premiums,0)  + COALESCE(ipi.jy_supervise_costs_premiums,0) ), 0) as supervise_fee,
+        COALESCE(SUM(COALESCE(ipi.jq_other_costs_premiums,0)  + COALESCE(ipi.sy_other_costs_premiums,0)  +COALESCE(ipi.jy_other_costs_premiums,0) ), 0) as follow_fee,
         COALESCE(SUM(invoice_summary.total_invoice), 0) as invoiced_amount,
         COALESCE(SUM(invoice_summary.settled_invoice), 0) as settled_amount,
         COALESCE(SUM(invoice_summary.unsettled_invoice), 0) as un_settled_amount
@@ -1343,7 +1343,7 @@
         LEFT JOIN (
         SELECT
         ifo.order_no,
-        SUM(DISTINCT (ifo.jq_commission_premium + ifo.sy_commission_premium + ifo.jy_commission_premium)) as total_commission
+        SUM(DISTINCT (COALESCE(ifo.jq_commission_premium,0)  + COALESCE(ifo.sy_commission_premium,0)  + COALESCE(ifo.jy_commission_premium,0) )) as total_commission
         FROM ins_fee_orders ifo
         WHERE ifo.is_delete = 0
         GROUP BY ifo.order_no
@@ -1361,7 +1361,7 @@
                 )
             </if>
         </where>
-        GROUP BY eic.id, eic.name, eic.parent_id;
+        GROUP BY eic.id, eic.name, eic.parent_id
     </select>
 
 
@@ -1370,9 +1370,9 @@
         eic.id AS company_id,
         eic.parent_id AS parent_id,
         eic.NAME AS company_name,
-        COALESCE ( SUM( ipi.jq_receivable_premium + ipi.sy_receivable_premium + ipi.jy_receivable_premium ), 0 ) AS total_receivable,
-        COALESCE ( SUM( ipi.jq_supervise_costs_premiums + ipi.sy_supervise_costs_premiums + ipi.jy_supervise_costs_premiums ), 0 ) AS supervise_fee,
-        COALESCE ( SUM( ipi.jq_other_costs_premiums + ipi.sy_other_costs_premiums + ipi.jy_other_costs_premiums ), 0 ) AS follow_fee,
+        COALESCE ( SUM( COALESCE(ipi.jq_receivable_premium,0)  + COALESCE(ipi.sy_receivable_premium,0)  +  COALESCE(ipi.jy_receivable_premium,0)  ), 0 ) AS total_receivable,
+        COALESCE ( SUM( COALESCE(ipi.jq_supervise_costs_premiums,0)  + COALESCE(ipi.sy_supervise_costs_premiums,0)  + COALESCE(ipi.jy_supervise_costs_premiums,0)  ), 0 ) AS supervise_fee,
+        COALESCE ( SUM( COALESCE(ipi.jq_other_costs_premiums,0)  + COALESCE(ipi.sy_other_costs_premiums,0)  + COALESCE(ipi.jy_other_costs_premiums,0)  ), 0 ) AS follow_fee,
         COALESCE ( SUM( invoice_summary.total_invoice ), 0 ) AS invoiced_amount,
         COALESCE ( SUM( invoice_summary.settled_invoice ), 0 ) AS settled_amount,
         COALESCE ( SUM( invoice_summary.unsettled_invoice ), 0 ) AS un_settled_amount
@@ -1417,9 +1417,9 @@
         SELECT
         eic.id as company_id,
         eic.name as company_name,
-        COALESCE(SUM(ipi.jq_receivable_premium + ipi.sy_receivable_premium + ipi.jy_receivable_premium), 0) as total_receivable,
-        COALESCE(SUM(ipi.jq_supervise_costs_premiums + ipi.sy_supervise_costs_premiums + ipi.jy_supervise_costs_premiums), 0) as supervise_fee,
-        COALESCE(SUM(ipi.jq_other_costs_premiums + ipi.sy_other_costs_premiums + ipi.jy_other_costs_premiums), 0) as follow_fee,
+        COALESCE(SUM(COALESCE(ipi.jq_receivable_premium,0)  + COALESCE(ipi.sy_receivable_premium,0)  + COALESCE(ipi.jy_receivable_premium,0) ), 0) as total_receivable,
+        COALESCE(SUM(COALESCE(ipi.jq_supervise_costs_premiums,0)  +COALESCE(ipi.sy_supervise_costs_premiums,0)  +COALESCE(ipi.jy_supervise_costs_premiums,0) ), 0) as supervise_fee,
+        COALESCE(SUM(COALESCE(ipi.jq_other_costs_premiums,0) + COALESCE(ipi.sy_other_costs_premiums,0) + COALESCE(ipi.jy_other_costs_premiums,0)), 0) as follow_fee,
         COALESCE(SUM(invoice_summary.total_invoice), 0) as invoiced_amount,
         COALESCE(SUM(fee_summary.total_commission) - SUM(invoice_summary.total_invoice), 0) as un_invoiced_amount,
         COALESCE(SUM(invoice_summary.settled_invoice), 0) as settled_amount,
@@ -1453,7 +1453,7 @@
         LEFT JOIN (
         SELECT
         ifo.order_no,
-        SUM(DISTINCT (ifo.jq_commission_premium + ifo.sy_commission_premium + ifo.jy_commission_premium)) as total_commission
+        SUM(DISTINCT (COALESCE(ifo.jq_commission_premium,0)  + COALESCE(ifo.sy_commission_premium,0)  + COALESCE(ifo.jy_commission_premium,0) )) as total_commission
         FROM ins_fee_orders ifo
         WHERE ifo.is_delete = 0
         GROUP BY ifo.order_no
@@ -1474,7 +1474,7 @@
         </where>
         GROUP BY
         eic.id,
-        eic.name;
+        eic.name
     </select>
 
     <!-- 获取子公司 -->
@@ -1482,8 +1482,8 @@
         SELECT
         eic.id as company_id,
         eic.name as company_name,
-        COALESCE(SUM(ipi.jq_receivable_premium + ipi.sy_receivable_premium + ipi.jy_receivable_premium), 0) as total_receivable,
-        COALESCE(SUM(ipi.jq_supervise_costs_premiums + ipi.sy_supervise_costs_premiums + ipi.jy_supervise_costs_premiums), 0) as supervise_fee,
+        COALESCE(SUM(COALESCE(ipi.jq_receivable_premium,0)  + COALESCE(ipi.sy_receivable_premium,0)  + COALESCE(ipi.jy_receivable_premium,0) ), 0) as total_receivable,
+        COALESCE(SUM(COALESCE(ipi.jq_supervise_costs_premiums,0) +COALESCE(ipi.sy_supervise_costs_premiums,0) + COALESCE(ipi.jy_supervise_costs_premiums,0) ), 0) as supervise_fee,
         COALESCE(SUM(invoice_summary.total_invoice), 0) as invoiced_amount,
         COALESCE(SUM(invoice_summary.settled_invoice), 0) as settled_amount,
         COALESCE(SUM(invoice_summary.unsettled_invoice), 0) as un_settled_amount
@@ -1529,7 +1529,7 @@
         </where>
         GROUP BY
         eic.id,
-        eic.name;
+        eic.name
     </select>
 
 
@@ -1552,18 +1552,18 @@
         SELECT
         ipi.contact_person AS receiver,
         ipi.company_id,
-        SUM(ipi.jq_supervise_costs_premiums + ipi.sy_supervise_costs_premiums + ipi.jy_supervise_costs_premiums) AS superviseFee,
-        SUM(ipi.jq_other_costs_premiums + ipi.sy_other_costs_premiums + ipi.jy_other_costs_premiums) AS followFee,
+        SUM(COALESCE(ipi.jq_supervise_costs_premiums,0)  +COALESCE(ipi.sy_supervise_costs_premiums,0)  +COALESCE(ipi.jy_supervise_costs_premiums,0) ) AS superviseFee,
+        SUM(COALESCE(ipi.jq_other_costs_premiums,0) + COALESCE(ipi.sy_other_costs_premiums,0) +COALESCE(ipi.jy_other_costs_premiums,0) ) AS followFee,
         SUM(
-        (ipi.jq_supervise_costs_premiums + ipi.sy_supervise_costs_premiums + ipi.jy_supervise_costs_premiums) +
-        (ipi.jq_other_costs_premiums + ipi.sy_other_costs_premiums + ipi.jy_other_costs_premiums)
+        (COALESCE(ipi.jq_supervise_costs_premiums,0) + COALESCE(ipi.sy_supervise_costs_premiums,0) + COALESCE(ipi.jy_supervise_costs_premiums,0)) +
+        (COALESCE(ipi.jq_other_costs_premiums,0) + COALESCE(ipi.sy_other_costs_premiums,0) + COALESCE(ipi.jy_other_costs_premiums,0))
         ) AS totalReceivable,
-        SUM(CASE WHEN ipii.`status` = 1 AND ipii.invoice_type in (1,3) THEN ipii.receivable_supervise_premium ELSE 0 END) AS settledSuperviseFee,
-        SUM(CASE WHEN ipii.`status` = 1 AND ipii.invoice_type in (2,4) THEN ipii.receivable_supervise_premium ELSE 0 END) AS settledFollowFee,
-        SUM(CASE WHEN ipii.`status` = 1 AND ipii.invoice_type IN (1,2) THEN ipii.receivable_supervise_premium ELSE 0 END) AS settledAmount,
-        SUM(CASE WHEN ipii.`status` = 0 AND ipii.invoice_type in (1,3) THEN ipii.receivable_supervise_premium ELSE 0 END) AS unSettledSuperviseFee,
-        SUM(CASE WHEN ipii.`status` = 0 AND ipii.invoice_type in (2,4) THEN ipii.receivable_supervise_premium ELSE 0 END) AS unSettledFollowFee,
-        SUM(CASE WHEN ipii.`status` = 0 AND ipii.invoice_type IN (1,2) THEN ipii.receivable_supervise_premium ELSE 0 END) AS unSettledAmount
+        --SUM(CASE WHEN ipii.`status` = 1 AND ipii.invoice_type in (5,6) THEN ipii.receivable_supervise_premium ELSE 0 END) AS settledSuperviseFee,
+        -- SUM(CASE WHEN ipii.`status` = 1 AND ipii.invoice_type in (5,6) THEN ipii.receivable_supervise_premium ELSE 0 END) AS settledFollowFee,
+        SUM(CASE WHEN ipii.`status` = 1 AND ipii.invoice_type IN (5,6) THEN ipii.receivable_supervise_premium ELSE 0 END) AS settledAmount,
+        --SUM(CASE WHEN ipii.`status` = 0 AND ipii.invoice_type in (5,6) THEN ipii.receivable_supervise_premium ELSE 0 END) AS unSettledSuperviseFee
+        -- ,SUM(CASE WHEN ipii.`status` = 0 AND ipii.invoice_type in (5,6) THEN ipii.receivable_supervise_premium ELSE 0 END) AS unSettledFollowFee,
+        SUM(CASE WHEN ipii.`status` = 0 AND ipii.invoice_type IN (5,6) THEN ipii.receivable_supervise_premium ELSE 0 END) AS unSettledAmount
         FROM
         ins_ply_income ipi
         LEFT JOIN ins_ply_income_invoice_link ipil ON ipi.id = ipil.income_id AND ipil.is_delete = 0
@@ -1602,9 +1602,9 @@
         eic.parent_id,
         ipi.company_id,
         ipi.system_code,
-        sum(COALESCE(ipi.jq_supervise_costs_premiums, 0)+ COALESCE(ipi.sy_supervise_costs_premiums,0)+coalesce(ipi.jy_supervise_costs_proportion,0 )+COALESCE(ipi.jq_other_costs_premiums, 0)+ COALESCE(ipi.sy_other_costs_premiums,0)+coalesce(ipi.jy_other_costs_premiums,0 )) as totalReceivable ,
-        sum(COALESCE(ipi.jq_supervise_costs_premiums, 0)+ COALESCE(ipi.sy_supervise_costs_premiums,0)+coalesce(ipi.jy_supervise_costs_proportion,0 )+COALESCE(ipi.jq_other_costs_premiums, 0)+ COALESCE(ipi.sy_other_costs_premiums,0)+coalesce(ipi.jy_other_costs_premiums,0 )) as totalFollowFee,
-        sum(COALESCE(ipi.jq_supervise_costs_premiums, 0)+ COALESCE(ipi.sy_supervise_costs_premiums,0)+coalesce(ipi.jy_supervise_costs_proportion,0 )) as superviseFee,
+        sum(COALESCE(ipi.jq_supervise_costs_premiums, 0)+ COALESCE(ipi.sy_supervise_costs_premiums,0)+coalesce(ipi.jy_supervise_costs_premiums,0 )+COALESCE(ipi.jq_other_costs_premiums, 0)+ COALESCE(ipi.sy_other_costs_premiums,0)+coalesce(ipi.jy_other_costs_premiums,0 )) as totalReceivable ,
+        sum(COALESCE(ipi.jq_supervise_costs_premiums, 0)+ COALESCE(ipi.sy_supervise_costs_premiums,0)+coalesce(ipi.jy_supervise_costs_premiums,0 )+COALESCE(ipi.jq_other_costs_premiums, 0)+ COALESCE(ipi.sy_other_costs_premiums,0)+coalesce(ipi.jy_other_costs_premiums,0 )) as totalFollowFee,
+        sum(COALESCE(ipi.jq_supervise_costs_premiums, 0)+ COALESCE(ipi.sy_supervise_costs_premiums,0)+coalesce(ipi.jy_supervise_costs_premiums,0 )) as superviseFee,
         sum(COALESCE(ipi.jq_other_costs_premiums, 0)+ COALESCE(ipi.sy_other_costs_premiums,0)+coalesce(ipi.jy_other_costs_premiums,0 )) as followFee
         from
         ins_ply_income ipi