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

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

@@ -113,4 +113,12 @@ public class ExportSuperviseSettlementExcelDto {
     @ExcelProperty(value = "对接人手机号")
     private String contactPersonPhone;
 
+    @Schema(description = "分支机构id")
+    @ExcelIgnore
+    private String partnerCompanyId;
+
+    @Schema(description = "分支机构名称")
+    @ExcelProperty(value = "分支机构名称")
+    private String partnerCompanyName;
+
 }

commons/src/main/java/com/jzg/commons/entity/finance/vo/SettlementQueryVo.java

@@ -25,7 +25,7 @@ public class SettlementQueryVo extends PageRequest {
     @Schema(description = "保险公司Id")
     private String companyId;
 
-    @Schema(description = "保险公司Id")
+    @Schema(description = "分支保险公司Id")
     private String partnerCompanyId;
 
     @Schema(description = "应收项")

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

@@ -5214,7 +5214,15 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
      * @param exportSuperviseSettlementExcelDtos
      */
     private void supplementaryListData(Page<ExportSuperviseSettlementExcelDto> exportSuperviseSettlementExcelDtos) {
+        HttpResult<Map<String, EsmInsCompany>> mapHttpResult = esmInsCompanyClient.queryAllCompanyMap();
+        Map<String, EsmInsCompany> data = mapHttpResult.getData();
+
         exportSuperviseSettlementExcelDtos.getRecords().forEach(dto -> {
+            if (StrUtil.isNotBlank(dto.getPartnerCompanyId())){
+                EsmInsCompany esmInsCompany = data.getOrDefault(dto.getPartnerCompanyId(), new EsmInsCompany());
+                dto.setPartnerCompanyName(esmInsCompany.getName());
+            }
+
             if ("1".equals(dto.getInvoiceParty())) {
                 dto.setInvoiceParty("我方开票");
             } else if ("2".equals(dto.getInvoiceParty())) {

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

@@ -609,12 +609,15 @@
         io.company_name,
         ipii.invoice_type,
         ipii.invoice_party,
+        ipii.invoice_risk_type,
         ipii.tax_point,
         ipiis.actual_received_amount,
         ipii.receivable_supervise_premium,
         ipiis.receive_payment_date,
         ipiis.create_by ,
-        ipiis.create_time, ipiis.settlement_payment_difference , ipiis.settlement_payment_reason
+        ipiis.create_time,
+        ipiis.settlement_payment_difference ,
+        ipiis.settlement_payment_reason
         FROM
         ins_ply_income_invoice_settlement ipiis
         LEFT JOIN ins_ply_income_invoice ipii ON ipii.id = ipiis.invoice_id AND ipii.is_delete = 0
@@ -694,10 +697,16 @@
         GROUP_CONCAT(DISTINCT ipii.invoice_party SEPARATOR ',') AS invoice_party,
         GROUP_CONCAT(DISTINCT ipii.tax_point SEPARATOR ',') AS tax_point,
         GROUP_CONCAT(DISTINCT ipi.order_no SEPARATOR ',') AS orderNo,
+        GROUP_CONCAT(DISTINCT ipi.partner_company_id SEPARATOR ',') AS partnerCompanyId,
         MAX(ipiis.actual_received_amount) AS actual_received_amount,
         MAX(ipiis.receive_payment_date) AS receive_payment_date,
         MAX(ipiis.create_by) AS create_by,
-        MAX(ipiis.create_time) AS create_time, ipiis.settlement_payment_difference , ipiis.settlement_payment_reason, ipii.receivable_supervise_premium,ipii.contact_person , ipii.contact_person_phone
+        MAX(ipiis.create_time) AS create_time,
+        ipiis.settlement_payment_difference,
+        ipiis.settlement_payment_reason,
+        ipii.receivable_supervise_premium,
+        ipii.contact_person,
+        ipii.contact_person_phone
         FROM ins_ply_income_invoice_settlement ipiis
         LEFT JOIN ins_ply_income_invoice ipii ON ipii.id = ipiis.invoice_id AND ipii.is_delete = 0
         LEFT JOIN ins_ply_income_invoice_link ipil ON ipil.invoice_id = ipiis.invoice_id AND ipil.is_delete = 0
@@ -725,6 +734,9 @@
             <if test="settlementQueryVo.companyId != null and settlementQueryVo.companyId != ''">
                 AND io.company_id = #{settlementQueryVo.companyId}
             </if>
+            <if test="settlementQueryVo.partnerCompanyId != null and settlementQueryVo.partnerCompanyId != ''">
+                AND ipi.partner_company_id = #{settlementQueryVo.partnerCompanyId}
+            </if>
             <if test="settlementQueryVo.invoiceParty != null and settlementQueryVo.invoiceParty != ''">
                 AND ipii.invoice_party = #{settlementQueryVo.invoiceParty}
             </if>