Merge remote-tracking branch 'origin/master'

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;
+
     /**
      * 保司订单号
      */

commons/src/main/java/com/jzg/commons/entity/vo/IncomeAndExpenseVo.java

@@ -50,5 +50,8 @@ public class IncomeAndExpenseVo {
 
         @Schema(description = "审核状态 0-待审核 1-审核通过 2-审核驳回")
         private String status;
+
+        @Schema(description = "银行名称")
+        private String bankName;
     }
 }

tenant/insurance/quotation-hengbang/src/main/java/com/jzg/quotation/hengbang/crawler/entity/request/HbCrawlerCalculationRequest.java

@@ -77,7 +77,7 @@ public class HbCrawlerCalculationRequest extends HbBaseRequest {
     @Serial
     private static final long serialVersionUID = -6130320344004620564L;
 
-    public HbCrawlerCalculationRequest(QuoteVo quoteVo, String plyappno) {
+    public HbCrawlerCalculationRequest(QuoteVo quoteVo, String plyappno, String depreciationPrice) {
         this.clauseType = "2";
         List<KindInfoVo> kindInfoVoList = quoteVo.getKindInfoVo();
         this.risktype = "0";
@@ -88,12 +88,11 @@ public class HbCrawlerCalculationRequest extends HbBaseRequest {
             this.risktype = "1";
         }
         if (CollUtil.isNotEmpty(kindInfoVoList)) {
-            this.epersonliabilityList = getEpersonliabilityList(kindInfoVoList);
+            this.epersonliabilityList = getEpersonliabilityList(kindInfoVoList, depreciationPrice);
             this.begintimeBi = DateUtil.toUtcDateTime(quoteVo.getBiRiskInfoVo().getStartDate());
             this.begintimeAccident = DateUtil.toUtcDateTime(quoteVo.getBiRiskInfoVo().getStartDate());
             this.risktype = "2";
         } else {
-//            this.begintimeBi = DateUtil.toUtcDateTime(quoteVo.getCiRiskInfoVo().getStartDate());
             this.epersonliabilityList = new ArrayList<>();
         }
         this.plyappno = plyappno;
@@ -107,18 +106,34 @@ public class HbCrawlerCalculationRequest extends HbBaseRequest {
         this.effectfLag = null;
         this.ecarChargingPosts = new ArrayList<>();
         this.carInsureDevices = new ArrayList<>();
+        this.outofwarrantytype = "N";
+        this.drivingtype = "";
+        this.endtimeAccident = "";
         this.accidentInsuranceList = getAccidentInsuranceList(quoteVo.getBiRiskInfoVo(), quoteVo.getAccidentalDrivings());
     }
 
-    public List<EpersonliabilityDTO> getEpersonliabilityList(List<KindInfoVo> kindInfoVoList) {
+    public List<EpersonliabilityDTO> getEpersonliabilityList(List<KindInfoVo> kindInfoVoList, String depreciationPrice) {
         List<EpersonliabilityDTO> epersonliabilityDTOList = new ArrayList<>();
         for (KindInfoVo kindInfoVo : kindInfoVoList) {
             EpersonliabilityDTO epersonliabilityDTO = new EpersonliabilityDTO();
             epersonliabilityDTO.setKindcode(kindInfoVo.getKindCode());
             epersonliabilityDTO.setLiabname(kindInfoVo.getKindName());
-            epersonliabilityDTO.setLiabamt(kindInfoVo.getAmount());
-            epersonliabilityDTO.setQuantity(kindInfoVo.getQuantity());
-            epersonliabilityDTO.setUnitAmount(kindInfoVo.getUnitAmount());
+            // kindcode "101"（机动车损失保险）的保额必须使用车辆折旧价（实际价值），
+            // 否则保司会校验"协商价格范围建议在实际价值上下30%浮动"并拒绝
+            if ("101".equals(kindInfoVo.getKindCode()) && depreciationPrice != null) {
+                epersonliabilityDTO.setLiabamt(depreciationPrice);
+                epersonliabilityDTO.setUnitAmount(depreciationPrice);
+            } else if (!"116".equals(kindInfoVo.getKindCode())) {
+                // kindcode "116"不需要liabamt和unitAmount
+                epersonliabilityDTO.setLiabamt(kindInfoVo.getAmount());
+                epersonliabilityDTO.setUnitAmount(kindInfoVo.getUnitAmount());
+            }
+            if ("116".equals(kindInfoVo.getKindCode())) {
+                // 道路救援服务特约条款：只需要serviceTimes字段
+                epersonliabilityDTO.setServiceTimes(kindInfoVo.getServiceTimes() != null ? kindInfoVo.getServiceTimes() : "2");
+            } else {
+                epersonliabilityDTO.setQuantity(kindInfoVo.getQuantity() != null ? kindInfoVo.getQuantity() : "4");
+            }
             epersonliabilityDTOList.add(epersonliabilityDTO);
         }
         return epersonliabilityDTOList;
@@ -300,6 +315,7 @@ public class HbCrawlerCalculationRequest extends HbBaseRequest {
         private String liabname;
         private String model = "0";
         private String quantity;
+        private String serviceTimes;
         private String unitAmount;
     }
 

tenant/insurance/quotation-hengbang/src/main/java/com/jzg/quotation/hengbang/crawler/service/Impl/HengBangCrawlerRequestImpl.java

@@ -148,7 +148,7 @@ public class HengBangCrawlerRequestImpl implements HengBangCrawlerRequest {
         HbCrawlerQuoteimmediatelyRequest quoteimmediatelyRequest = new HbCrawlerQuoteimmediatelyRequest(quoteVo, salesInfo, depreciationPrice, parameters, contentDTO);
         String plyappno = hbCrawlerRequestComponent.quoteImmediately(quoteimmediatelyRequest, headers);
         // 5.1 报价第二步，提交报价数据，返回是否重复投保，脱保等提示信息,用于页面展示
-        HbCrawlerCalculationRequest calculationRequest = new HbCrawlerCalculationRequest(quoteVo, plyappno);
+        HbCrawlerCalculationRequest calculationRequest = new HbCrawlerCalculationRequest(quoteVo, plyappno, depreciationPrice);
         // 非车信息匹配核心
         matchingAccident(quoteVo, headers, plyappno, calculationRequest);
         String resJson = hbCrawlerRequestComponent.getCalculationResult(calculationRequest, headers);

tenant/insurance/quotation-zhongmei/src/main/java/com/jzg/quotation/zhongmei/crawler/service/Impl/ZhongMeiCrawlerRequestImpl.java

@@ -198,7 +198,7 @@ public class ZhongMeiCrawlerRequestImpl implements ZhongMeiCrawlerRequest {
                 quotedPriceResponse = zmCrawlerRequestComponent.quotedPrice(quotedPriceRequest);
             }
         }
-        if (!quotedPriceResponse.getHead().getReturnCode().equals("0") ) {
+        if (quotedPriceResponse.getHead().getReturnCode().equals("0") ) {
             // 商业险重复投保提示
             ZmCrawlerQuotedPriceResponse.BussinessMainDTO.ContractDTO contract =
                     quotedPriceResponse.getBussinessMain().getContract().stream()

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

@@ -8,20 +8,14 @@ import com.jzg.commons.entity.dto.AgreementRulesAddParam;
 import com.jzg.commons.entity.dto.AgreementRulesEditParam;
 import com.jzg.commons.entity.dto.CostAgreementParam;
 import com.jzg.commons.entity.dto.RulesGroupParam;
-import com.jzg.commons.entity.po.PtlAgreementUndwrtRules;
-import com.jzg.commons.entity.po.PtlAgreementUndwrtRulesAttr;
-import com.jzg.commons.entity.po.PtlAgreementUndwrtRulesAttrLink;
-import com.jzg.commons.entity.po.PtlAgreementUndwrtRulesDictLabal;
+import com.jzg.commons.entity.po.*;
 import com.jzg.commons.entity.vo.AgreementRulesVo;
 import com.jzg.commons.entity.vo.CostListVo;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.commons.util.idgen.IdGenerate;
 import com.jzg.organization.mapper.PtlAgreementUndwrtRulesAttrLinkMapper;
 import com.jzg.organization.mapper.PtlAgreementUndwrtRulesMapper;
-import com.jzg.organization.service.PtlAgreementCostService;
-import com.jzg.organization.service.PtlAgreementUndwrtRulesAttrLinkService;
-import com.jzg.organization.service.PtlAgreementUndwrtRulesAttrService;
-import com.jzg.organization.service.PtlAgreementUndwrtRulesService;
+import com.jzg.organization.service.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -62,6 +56,9 @@ public class PtlAgreementUndwrtRulesServiceImpl extends ServiceImpl<PtlAgreement
     @Autowired
     private PtlAgreementCostService ptlAgreementCostService;
 
+    @Autowired
+    private PtlAgreementService ptlAgreementService;
+
     /**
      * 协议规则列表
      *
@@ -352,12 +349,15 @@ public class PtlAgreementUndwrtRulesServiceImpl extends ServiceImpl<PtlAgreement
     @Override
     public AgreementRulesVo rulesGet(String ruleId) {
         PtlAgreementUndwrtRules rules = baseMapper.selectById(ruleId);
+        PtlAgreement agreement = ptlAgreementService.getById(rules.getAgreementId());
         AgreementRulesVo rulesVo = new AgreementRulesVo();
         BeanUtils.copyProperties(rules, rulesVo);
 
         // 获取费用因子属性（公共逻辑，仅查询一次）
         List<PtlAgreementUndwrtRulesAttr> attrList = agreementUndwrtRulesAttrService.getUndwrtRulesAttrList();
         Map<String, PtlAgreementUndwrtRulesAttr> attrMap = attrList.stream()
+                .filter(attr -> attr.getCompanyIds().equals("all"))
+                .filter(attr -> attr.getCompanyIds().equals(agreement.getCompanyId()))
                 .collect(Collectors.toMap(PtlAgreementUndwrtRulesAttr::getAttrCode, attr -> attr));
 
         // 确定需要处理的规则ID列表

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/java/com/jzg/organization/service/impl/SysUserAccountServiceImpl.java

@@ -294,6 +294,7 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
             item.setCreateTime(auditing.getCreateTime());
             item.setStatus(auditing.getAuditingStatus().toString());
             item.setRemark("提现支出");
+            item.setBankName(auditing.getBankName());
             allRecords.add(item);
         }
         // 处理收入记录
@@ -305,6 +306,7 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
             item.setStatus(null);
             item.setRemark("车险收入");
             item.setLicenseNo(insFeeOrders.getLicenseNo());
+            item.setBankName(null);
             allRecords.add(item);
         }
         // 处理分销收入记录
@@ -322,6 +324,7 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
             item.setStatus(null);
             item.setRemark("分销收入");
             item.setLicenseNo(insFeeOrders.getLicenseNo());
+            item.setBankName(null);
             allRecords.add(item);
         }
         // 排序

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