1.对账优化

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

@@ -156,21 +156,12 @@ public class ImportAsyncServiceImpl extends ServiceImpl<ImportAsyncMapper, Impor
                     }
                 } else {
                     reason = "查询不到该车辆";
-                    if (StringUtils.isNotEmpty(excelItem.getLicenseno())) {
-                        insImportResult.setLicenseno(excelItem.getLicenseno());
-                    }
-                    if (StringUtils.isNotEmpty(excelItem.getPolicyno())) {
-                        insImportResult.setPolicyno(excelItem.getPolicyno());
-                    }
-                    if (StringUtils.isNotEmpty(excelItem.getSyPolicyno())) {
-                        insImportResult.setSyPolicyno(excelItem.getSyPolicyno());
-                    }
-
                 }
                 if(StringUtils.isNotEmpty(reason)){
+                    insImportResult.setLicenseno(excelItem.getLicenseno());
+                    insImportResult.setPolicyno(excelItem.getPolicyno());
+                    insImportResult.setSyPolicyno(excelItem.getSyPolicyno());
                     insImportResult.setReason(reason);
-                }
-                if(StringUtils.isNotEmpty(insImportResult.getLicenseno())){
                     insImportResultsExcel.add(insImportResult);
                 }
             }
@@ -306,6 +297,9 @@ public class ImportAsyncServiceImpl extends ServiceImpl<ImportAsyncMapper, Impor
                 } else {
 
                     reason = "查询不到该车辆";
+
+                }
+                if(StringUtils.isNotEmpty(reason)){
                     if (StringUtils.isNotEmpty(excelItem.getLicenseno())) {
                         insImportResult.setLicenseno(excelItem.getLicenseno());
                     }
@@ -315,12 +309,7 @@ public class ImportAsyncServiceImpl extends ServiceImpl<ImportAsyncMapper, Impor
                     if (StringUtils.isNotEmpty(excelItem.getSyPolicyno())) {
                         insImportResult.setSyPolicyno(excelItem.getSyPolicyno());
                     }
-
-                }
-                if(StringUtils.isNotEmpty(reason)){
                     insImportResult.setReason(reason);
-                }
-                if(StringUtils.isNotEmpty(insImportResult.getLicenseno()) ){
                     insImportResultsExcel.add(insImportResult);
                 }
             }
@@ -415,19 +404,15 @@ public class ImportAsyncServiceImpl extends ServiceImpl<ImportAsyncMapper, Impor
                     
                 } else {
                     reason = "查询不到该车辆";
-
+                }
+                if(StringUtils.isNotEmpty(reason)){
+                    insImportResult.setReason(reason);
                     if (StringUtils.isNotEmpty(excelItem.getLicenseno())) {
                         insImportResult.setLicenseno(excelItem.getLicenseno());
                     }
                     if (StringUtils.isNotEmpty(excelItem.getNoPolicyno())) {
                         insImportResult.setPolicyno(excelItem.getNoPolicyno());
                     }
-
-                }
-                if(StringUtils.isNotEmpty(reason)){
-                    insImportResult.setReason(reason);
-                }
-                if(StringUtils.isNotEmpty(insImportResult.getLicenseno())){
                     insImportResultsExcel.add(insImportResult);
                 }
             }
@@ -521,22 +506,18 @@ public class ImportAsyncServiceImpl extends ServiceImpl<ImportAsyncMapper, Impor
                     }
                     
                 } else {
-
                     reason = "查询不到该车辆";
-
+                }
+                if(StringUtils.isNotEmpty(reason)){
+                    insImportResult.setReason(reason);
                     if (StringUtils.isNotEmpty(excelItem.getLicenseno())) {
                         insImportResult.setLicenseno(excelItem.getLicenseno());
                     }
                     if (StringUtils.isNotEmpty(excelItem.getNoPolicyno())) {
                         insImportResult.setPolicyno(excelItem.getNoPolicyno());
                     }
-
-                }
-                if(StringUtils.isNotEmpty(reason)){
-                    insImportResult.setReason(reason);
-                }
-                if(StringUtils.isNotEmpty(insImportResult.getLicenseno())){
                     insImportResultsExcel.add(insImportResult);
+
                 }
             }
         }

src/main/resources/mapper/modules/fnc/InsPlyIncomeMapper.xml

@@ -498,9 +498,18 @@
             <if test="jqSuperviseCostsProportion !=null  and  jqSuperviseCostsProportion  !=''">
                 and a.jq_supervise_costs_proportion =#{jqSuperviseCostsProportion}
             </if>
+           <if test="jqOtherCostsProportion !=null  and  jqOtherCostsProportion  !=''">
+                and a.jq_other_costs_proportion =#{jqOtherCostsProportion}
+            </if>
+            <if test="syOtherCostsProportion !=null  and  syOtherCostsProportion  !=''">
+                and a.sy_other_costs_proportion =#{syOtherCostsProportion}
+            </if>
             <if test="sySuperviseCostsPremiums !=null  and  sySuperviseCostsPremiums  !=''">
                 and a.sy_supervise_costs_premiums =#{sySuperviseCostsPremiums}
             </if>
+            <if test="noOtherCostsProportion !=null  and  noOtherCostsProportion  !=''">
+                and a.no_other_costs_proportion =#{noOtherCostsProportion}
+            </if>
             <if test="sySuperviseCostsProportion !=null  and  sySuperviseCostsProportion  !=''">
                 and a.sy_supervise_costs_proportion =#{sySuperviseCostsProportion}
             </if>