合并读取私有非车， 私有车险，平台数据的Listener为一个公共的Listener

.gitignore

@@ -85,4 +85,5 @@ tenant/insurance/quotation-zhongmei/outPath/
 tenant/insurance/quotation-zijin/outPath/
 tenant/organization/outPath/
 
-.reasonix
+.reasonix
+reasonix.toml

tenant/organization/src/main/java/com/jzg/organization/excel/listener/InsuranceData.java

@@ -1,7 +0,0 @@
-package com.jzg.organization.excel.listener;
-
-
-public interface InsuranceData {
-
-    public String getLicenseNo();
-}

tenant/organization/src/main/java/com/jzg/organization/excel/listener/InvoiceReceivbleExcel4AllListener.java

@@ -0,0 +1,40 @@
+package com.jzg.organization.excel.listener;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.jzg.commons.entity.finance.vo.importimcome.InsuranceData;
+import lombok.Getter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Excel 数据统一读取监听器。
+ * <p>
+ * 该监听器为泛型设计，可统一处理所有实现了 {@link InsuranceData} 的实体，
+ * 例如车险/非车险/平台应收等不同实体：{@code ExcelContent4PrivateSuperviseCar}、
+ * {@code ExcelContent4PrivateSuperviseNoCar}、{@code ExcelContent4Platform} 等。
+ * </p>
+ *
+ * @author lipf
+ * @date 2026/8/17 15:40
+ */
+@Getter
+public class InvoiceReceivbleExcel4AllListener<T extends InsuranceData> extends AnalysisEventListener<T> {
+
+    private final List<T> dataList = new ArrayList<>();
+
+    @Override
+    public void invoke(T data, AnalysisContext context) {
+        dataList.add(data);
+    }
+
+    @Override
+    public void doAfterAllAnalysed(AnalysisContext context) {
+        System.out.println("Total rows: " + dataList.size());
+    }
+
+    public List<T> getDataList() {
+        return dataList;
+    }
+}

tenant/organization/src/main/java/com/jzg/organization/excel/listener/InvoiceReceivbleExcel4PlatformListener.java

@@ -1,25 +0,0 @@
-package com.jzg.organization.excel.listener;
-
-import com.alibaba.excel.context.AnalysisContext;
-import com.alibaba.excel.event.AnalysisEventListener;
-import com.jzg.commons.entity.finance.vo.importimcome.ExcelContent4Platform;
-import lombok.Getter;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Getter
-public class InvoiceReceivbleExcel4PlatformListener extends AnalysisEventListener<ExcelContent4Platform> {
-    private final List<ExcelContent4Platform> dataList = new ArrayList<>();
-
-    @Override
-    public void invoke(ExcelContent4Platform data, AnalysisContext context) {
-        dataList.add(data);
-    }
-
-    @Override
-    public void doAfterAllAnalysed(AnalysisContext context) {
-        System.out.println("Total rows: " + dataList.size());
-    }
-
-}

tenant/organization/src/main/java/com/jzg/organization/excel/listener/InvoiceReceivbleExcel4PrivateListenerCar.java

@@ -1,36 +0,0 @@
-package com.jzg.organization.excel.listener;
-
-import com.alibaba.excel.context.AnalysisContext;
-import com.alibaba.excel.event.AnalysisEventListener;
-import com.jzg.commons.entity.finance.vo.importimcome.ExcelContent4PrivateSuperviseCar;
-import com.jzg.commons.entity.finance.vo.importimcome.ExcelContent4PrivateSuperviseNoCar;
-import lombok.Getter;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 私有的车险数据读取
- *
- * @author lipf
- * @date 2026/8/17 15:40
- */
-@Getter
-public class InvoiceReceivbleExcel4PrivateListenerCar extends AnalysisEventListener<ExcelContent4PrivateSuperviseCar> {
-
-    private final List<ExcelContent4PrivateSuperviseCar> dataList = new ArrayList<>();
-
-    @Override
-    public void invoke(ExcelContent4PrivateSuperviseCar data, AnalysisContext context) {
-        dataList.add(data);
-    }
-
-    @Override
-    public void doAfterAllAnalysed(AnalysisContext context) {
-        System.out.println("Total rows: " + dataList.size());
-    }
-
-    public List<ExcelContent4PrivateSuperviseCar> getDataList() {
-        return dataList;
-    }
-}

tenant/organization/src/main/java/com/jzg/organization/excel/listener/InvoiceReceivbleExcel4PrivateListenerNoCar.java

@@ -1,33 +0,0 @@
-package com.jzg.organization.excel.listener;
-
-import com.alibaba.excel.context.AnalysisContext;
-import com.alibaba.excel.event.AnalysisEventListener;
-import com.jzg.commons.entity.finance.vo.importimcome.ExcelContent4PrivateSuperviseNoCar;
-import lombok.Getter;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 私有的非车险数据读取
- * @author lipf
- * @date 2026/8/17 15:40
- */
-@Getter
-public class InvoiceReceivbleExcel4PrivateListenerNoCar extends AnalysisEventListener<ExcelContent4PrivateSuperviseNoCar> {
-    private final List<ExcelContent4PrivateSuperviseNoCar> dataList = new ArrayList<>();
-
-    @Override
-    public void invoke(ExcelContent4PrivateSuperviseNoCar data, AnalysisContext context) {
-        dataList.add(data);
-    }
-
-    @Override
-    public void doAfterAllAnalysed(AnalysisContext context) {
-        System.out.println("Total rows: " + dataList.size());
-    }
-
-    public List<ExcelContent4PrivateSuperviseNoCar> getDataList() {
-        return dataList;
-    }
-}

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

@@ -2552,7 +2552,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
             throw new SystemException("数据不能为空,导入失败");
         }
         AssertionUtils.isEmpty(excelContents, "车险应收数据处理失败,导入失败");
-        List<ImportContentExt> datas = importIncomeService.fillExcelContent4Private(excelContents);
+        //List<ImportContentExt> datas = importIncomeService.fillExcelContent4Private(excelContents);
 
 
         return null;

tenant/organization/src/main/java/com/jzg/organization/service/impl/importincome/ImportIncomeServiceImpl.java

@@ -16,9 +16,7 @@ import com.jzg.commons.entity.vo.AgreementVo;
 import com.jzg.commons.entity.vo.InsFeeOrdersVo;
 import com.jzg.commons.util.idgen.IdGenerate;
 import com.jzg.organization.client.InsOrdersClient;
-import com.jzg.organization.excel.listener.InvoiceReceivbleExcel4PlatformListener;
-import com.jzg.organization.excel.listener.InvoiceReceivbleExcel4PrivateListenerCar;
-import com.jzg.organization.excel.listener.InvoiceReceivbleExcel4PrivateListenerNoCar;
+import com.jzg.organization.excel.listener.InvoiceReceivbleExcel4AllListener;
 import com.jzg.organization.mapper.InsOrdersPolicyMapper;
 import com.jzg.organization.mapper.InsPlyIncomeMapper;
 import com.jzg.organization.mapper.PtlAgreementMapper;
@@ -248,9 +246,11 @@ public class ImportIncomeServiceImpl implements ImportIncomeService {
                     ext.setSigningTime(data.getSigningTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
                 }
                 String agreementId = data.getAgreementId();
-                AgreementVo agreementVo = ptlAgreementMapper.queryById(agreementId);
-                if(agreementVo != null){
-                    ext.setPartnerCompanyId(agreementVo.getPartnerCompanyId());
+                if(StrUtil.isNotEmpty(agreementId)){
+                    AgreementVo agreementVo = ptlAgreementMapper.queryById(agreementId);
+                    if(agreementVo != null){
+                        ext.setPartnerCompanyId(agreementVo.getPartnerCompanyId());
+                    }
                 }
                 InsFeeOrdersVo feeOrdersVo = data.getFeeOrdersVo();
                 if(BeanUtil.isEmpty(feeOrdersVo)){
@@ -272,14 +272,14 @@ public class ImportIncomeServiceImpl implements ImportIncomeService {
      * @date 2026/8/4 9:07
      */
     public List<ExcelContent4Platform> parseImportExcel4Platform(MultipartFile file) {
-        InvoiceReceivbleExcel4PlatformListener listener = new InvoiceReceivbleExcel4PlatformListener();
+        InvoiceReceivbleExcel4AllListener<ExcelContent4Platform> listener = new InvoiceReceivbleExcel4AllListener<>();
         try (InputStream inputStream = file.getInputStream()) {
             EasyExcel.read(inputStream, ExcelContent4Platform.class, listener)
                     .sheet()
                     .doRead();
             return listener.getDataList();
         } catch (Exception e) {
-            log.error("InvoiceReceivbleExcel4PlatformListenery读取文件异常",e);
+            log.error("InvoiceReceivbleExcel4AllListener处理平台应收数据读取文件异常",e);
             return null;
         }
     }
@@ -291,14 +291,14 @@ public class ImportIncomeServiceImpl implements ImportIncomeService {
      * @date 2026/8/4 9:07
      */
     public List<ExcelContent4PrivateSuperviseNoCar> parseImportExcel4PrivateNoCar(MultipartFile file) {
-        InvoiceReceivbleExcel4PrivateListenerNoCar listener = new InvoiceReceivbleExcel4PrivateListenerNoCar();
+        InvoiceReceivbleExcel4AllListener<ExcelContent4PrivateSuperviseNoCar> listener = new InvoiceReceivbleExcel4AllListener<>();
         try (InputStream inputStream = file.getInputStream()) {
             EasyExcel.read(inputStream, ExcelContent4PrivateSuperviseNoCar.class, listener)
                     .sheet()
                     .doRead();
             return listener.getDataList();
         } catch (Exception e) {
-            log.error("InvoiceReceivbleExcel4PlatformListenery读取文件异常",e);
+            log.error("InvoiceReceivbleExcel4AllListener处理私有非车险数据读取文件异常",e);
             return null;
         }
     }
@@ -312,7 +312,7 @@ public class ImportIncomeServiceImpl implements ImportIncomeService {
      */
     @Override
     public List<ExcelContent4PrivateSuperviseCar> parseImportExcel4PrivateCar(MultipartFile file) {
-        InvoiceReceivbleExcel4PrivateListenerCar listener = new InvoiceReceivbleExcel4PrivateListenerCar();
+        InvoiceReceivbleExcel4AllListener<ExcelContent4PrivateSuperviseCar> listener = new InvoiceReceivbleExcel4AllListener<>();
         try (InputStream inputStream = file.getInputStream()) {
             EasyExcel.read(inputStream, ExcelContent4PrivateSuperviseCar.class, listener)
                     .sheet()