1. 导入需求 如果表头不一样则会阻止

src/main/java/com/ydtech/modules/fnc/service/impl/ImportAsyncServiceImpl.java

@@ -116,13 +116,7 @@ public class ImportAsyncServiceImpl extends ServiceImpl<ImportAsyncMapper, Impor
                     if (insPlyIncome.getCommissionFeevalue() != null && insPlyIncome.getCommissionFeevalue().compareTo(BigDecimal.ZERO) != 0) {
                         totalAmount = totalAmount.add(insPlyIncome.getCommissionFeevalue());  //添加总手续费
                     }
-                    if (excelItem.getJqSuperviseCostsPremiums() != null && excelItem.getJqSuperviseCostsPremiums().compareTo(BigDecimal.ZERO) != 0 && excelItem.getJqSuperviseCostsPremiums().compareTo(insPlyIncome.getJqSuperviseCostsPremiums()) != 0) {
-                        params.put("jqSuperviseCostsPremiums", excelItem.getJqSuperviseCostsPremiums());
-                        InsPlyIncome byBxLicenseno = insPlyIncomeMapper.findByBxLicenseno(params);
-                        if (ObjectUtils.isEmpty(byBxLicenseno)) {
-                            reason = "该数据交强手续费金额有问题";
-                        }
-                    }
+
                     if (excelItem.getJqSuperviseCostsProportion() != null && excelItem.getJqSuperviseCostsProportion().compareTo(BigDecimal.ZERO) != 0 && excelItem.getJqSuperviseCostsProportion().compareTo(insPlyIncome.getJqSuperviseCostsProportion()) != 0) {
                         params.put("jqSuperviseCostsProportion", excelItem.getJqSuperviseCostsProportion());
                         InsPlyIncome byBxLicenseno = insPlyIncomeMapper.findByBxLicenseno(params);
@@ -137,28 +131,6 @@ public class ImportAsyncServiceImpl extends ServiceImpl<ImportAsyncMapper, Impor
                             reason = "该数据商业手续费比例有问题";
                         }
                     }
-
-                    if (excelItem.getSySuperviseCostsPremiums() != null && excelItem.getSySuperviseCostsPremiums().compareTo(BigDecimal.ZERO) != 0 && excelItem.getSySuperviseCostsPremiums().compareTo(insPlyIncome.getSySuperviseCostsPremiums()) != 0) {
-                        params.put("sySuperviseCostsPremiums", excelItem.getSySuperviseCostsPremiums());
-                        InsPlyIncome byBxLicenseno = insPlyIncomeMapper.findByBxLicenseno(params);
-                        if (ObjectUtils.isEmpty(byBxLicenseno)) {
-                            reason = "该数据商业手续费金额有问题";
-                        }
-                    }
-                    if (excelItem.getJqPremium() != null && excelItem.getJqPremium().compareTo(BigDecimal.ZERO) != 0 && excelItem.getJqPremium().compareTo(insPlyIncome.getJqPremium()) != 0 ) {
-                        params.put("jqPremium", excelItem.getJqPremium());
-                        InsPlyIncome byBxLicenseno = insPlyIncomeMapper.findByBxLicenseno(params);
-                        if (ObjectUtils.isEmpty(byBxLicenseno)) {
-                            reason = "该数据交强保费有问题";
-                        }
-                    }
-                    if (excelItem.getSyPremium() != null && excelItem.getSyPremium().compareTo(BigDecimal.ZERO) != 0 && excelItem.getSyPremium().compareTo(insPlyIncome.getSyPremium()) != 0 ) {
-                        params.put("syPremium", excelItem.getSyPremium());
-                        InsPlyIncome byBxLicenseno = insPlyIncomeMapper.findByBxLicenseno(params);
-                        if (ObjectUtils.isEmpty(byBxLicenseno)) {
-                            reason = "该数据商业保费有问题";
-                        }
-                    }
                 } else {
                     reason = "查询不到该车辆";
                 }

src/main/java/com/ydtech/modules/fnc/service/impl/InsPlyIncomeServiceImpl.java

@@ -915,13 +915,7 @@ handlingProportion,
                         }
                     }
 
-                    if (excelItem.getJqSuperviseCostsPremiums() != null && excelItem.getJqSuperviseCostsPremiums().compareTo(BigDecimal.ZERO) != 0) {
-                        params.put("jqSuperviseCostsPremiums", excelItem.getJqSuperviseCostsPremiums());
-                        InsPlyIncome byBxLicenseno = baseMapper.findByBxLicenseno(params);
-                        if (ObjectUtils.isEmpty(byBxLicenseno)) {
-                            reason = "该数据交强手续费金额有问题";
-                        }
-                    }
+
                     if (excelItem.getJqSuperviseCostsProportion() != null && excelItem.getJqSuperviseCostsProportion().compareTo(BigDecimal.ZERO) != 0) {
                         params.put("jqSuperviseCostsProportion", excelItem.getJqSuperviseCostsProportion());
                         InsPlyIncome byBxLicenseno = baseMapper.findByBxLicenseno(params);
@@ -937,27 +931,6 @@ handlingProportion,
                         }
                     }
 
-                    if (excelItem.getSySuperviseCostsPremiums() != null && excelItem.getSySuperviseCostsPremiums().compareTo(BigDecimal.ZERO) != 0) {
-                        params.put("sySuperviseCostsPremiums", excelItem.getSySuperviseCostsPremiums());
-                        InsPlyIncome byBxLicenseno = baseMapper.findByBxLicenseno(params);
-                        if (ObjectUtils.isEmpty(byBxLicenseno)) {
-                            reason = "该数据商业手续费金额有问题";
-                        }
-                    }
-                    if (excelItem.getJqPremium() != null && excelItem.getJqPremium().compareTo(BigDecimal.ZERO) != 0) {
-                        params.put("jqPremium", excelItem.getJqPremium());
-                        InsPlyIncome byBxLicenseno = baseMapper.findByBxLicenseno(params);
-                        if (ObjectUtils.isEmpty(byBxLicenseno)) {
-                            reason = "该数据交强保费有问题";
-                        }
-                    }
-                    if (excelItem.getSyPremium() != null && excelItem.getSyPremium().compareTo(BigDecimal.ZERO) != 0) {
-                        params.put("syPremium", excelItem.getSyPremium());
-                        InsPlyIncome byBxLicenseno = baseMapper.findByBxLicenseno(params);
-                        if (ObjectUtils.isEmpty(byBxLicenseno)) {
-                            reason = "该数据商业保费有问题";
-                        }
-                    }
 
 //                  只查手续费
                     params.put("isOther", "0");
@@ -1036,21 +1009,6 @@ handlingProportion,
                         }
                     }
 
-                    if (excelItem.getNoPremium() != null && excelItem.getNoPremium().compareTo(BigDecimal.ZERO) != 0) {
-                        params.put("noPolicyno", excelItem.getNoPremium());
-                        InsPlyIncome byBxLicenseno = baseMapper.findByBxLicenseno(params);
-                        if (ObjectUtils.isEmpty(byBxLicenseno)) {
-                            reason = "该数据非车保费有问题";
-                        }
-                    }
-
-                    if (excelItem.getNoSuperviseCostsPremiums() != null && excelItem.getNoSuperviseCostsPremiums().compareTo(BigDecimal.ZERO) != 0) {
-                        params.put("noSuperviseCostsPremiums", excelItem.getNoSuperviseCostsPremiums());
-                        InsPlyIncome byBxLicenseno = baseMapper.findByBxLicenseno(params);
-                        if (ObjectUtils.isEmpty(byBxLicenseno)) {
-                            reason = "该数据非车手续费有问题";
-                        }
-                    }
                     if (excelItem.getNoSuperviseCostsProportion() != null && excelItem.getNoSuperviseCostsProportion().compareTo(BigDecimal.ZERO) != 0) {
                         params.put("noSuperviseCostsProportion", excelItem.getNoSuperviseCostsProportion());
                         InsPlyIncome byBxLicenseno = baseMapper.findByBxLicenseno(params);

src/main/java/com/ydtech/modules/inv/model/dto/InsBxNoPlyIncomeExcelDto.java

@@ -10,30 +10,18 @@ public class InsBxNoPlyIncomeExcelDto {
     /**
      * 车牌号
      */
-    @Excel(name = "车牌号")
+    @Excel(name = "车牌号" ,isImportField = "true")
     private String licenseno;
     /**
      * 非车保单号
      */
-    @Excel(name = "非车保单号")
+    @Excel(name = "非车保单号" ,isImportField = "true")
     private String noPolicyno;
 
-    /**
-     * 非车保费
-     */
-    @Excel(name = "非车保费")
-    private BigDecimal noPremium;
-
-    /**
-     * 非车手续费金额
-     */
-    @Excel(name = "非车手续费金额")
-    private BigDecimal noSuperviseCostsPremiums;
-
     /**
      * 非车手续费比例
      */
-    @Excel(name = "非车手续费比例")
+    @Excel(name = "非车手续费比例" ,isImportField = "true")
     private BigDecimal noSuperviseCostsProportion;
 
 

src/main/java/com/ydtech/modules/inv/model/dto/InsBxOtherExcelDto.java

@@ -12,31 +12,31 @@ public class InsBxOtherExcelDto {
     /**
      * 车牌号
      */
-    @Excel(name = "车牌号")
+    @Excel(name = "车牌号" , isImportField = "true")
     private String licenseno;
 
     /**
      * 交强保单号
      */
-    @Excel(name = "交强保单号")
+    @Excel(name = "交强保单号" , isImportField = "true")
     private String policyno;
 
     /**
      * 商业保单号
      */
-    @Excel(name =  "商业保单号")
+    @Excel(name =  "商业保单号", isImportField = "true")
     private String syPolicyno;
 
     /**
      * 交强跟单比例
      */
-    @Excel(name = "交强跟单比例")
+    @Excel(name = "交强跟单比例" , isImportField = "true")
     private BigDecimal jqOtherCostsProportion;
 
     /**
      * 商业保单号
      */
-    @Excel(name = "商业跟单比例")
+    @Excel(name = "商业跟单比例" , isImportField = "true")
     private BigDecimal syOtherCostsProportion;
 
 

src/main/java/com/ydtech/modules/inv/model/dto/InsBxPlyIncomeExcelDto.java

@@ -10,58 +10,32 @@ public class InsBxPlyIncomeExcelDto {
     /**
      * 车牌号
      */
-    @Excel(name = "车牌号")
+    @Excel(name = "车牌号" ,isImportField = "true")
     private String licenseno;
     /**
      * 交强保单号
      */
-    @Excel(name = "交强保单号")
+    @Excel(name = "交强保单号",isImportField = "true")
     private String policyno;
 
     /**
      * 商业保单号
      */
-    @Excel(name = "商业保单号")
+    @Excel(name = "商业保单号",isImportField = "true")
     private String syPolicyno;
 
-
-    /**
-     * 交强手续费金额
-     */
-    @Excel(name = "交强手续费金额")
-    private BigDecimal jqSuperviseCostsPremiums;
-
     /**
      * 交强手续费比例
      */
-    @Excel(name = "交强手续费比例")
+    @Excel(name = "交强手续费比例",isImportField = "true")
     private BigDecimal jqSuperviseCostsProportion;
 
 
-    /**
-     * 商业手续费金额
-     */
-    @Excel(name = "商业手续费金额")
-    private BigDecimal sySuperviseCostsPremiums;
-
     /**
      * 商业手续费比例
      */
-    @Excel(name = "商业手续费比例")
+    @Excel(name = "商业手续费比例",isImportField = "true")
     private BigDecimal sySuperviseCostsProportion;
 
-    /**
-     * 交强保费
-     */
-    @Excel(name = "交强保费")
-    private BigDecimal jqPremium;
-
-
-    /**
-     * 商业保费
-     */
-    @Excel(name = "商业保费")
-    private BigDecimal syPremium;
-
 
 }

src/main/java/com/ydtech/modules/inv/model/dto/InsNoBxOtherExcelDto.java

@@ -13,19 +13,19 @@ public class InsNoBxOtherExcelDto {
     /**
      * 车牌号
      */
-    @Excel(name = "车牌号")
+    @Excel(name = "车牌号", isImportField = "true")
     private String licenseno;
 
     /**
      * 非车保单号
      */
-    @Excel(name = "非车保单号")
+    @Excel(name = "非车保单号" , isImportField = "true")
     private String noPolicyno;
 
     /**
      * 非车跟单比例
      */
-    @Excel(name = "非车跟单比例")
+    @Excel(name = "非车跟单比例" , isImportField = "true")
     private BigDecimal noOtherCostsProportion;