应收应付导入修改

src/main/java/com/ydtech/modules/inv/model/excel/InvSettlementSourceExcel.java

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Date;
@@ -132,6 +133,13 @@ public class InvSettlementSourceExcel implements Serializable {
     @ExcelProperty("非车出口比例")
     private String nonVehicleExportRatio;
 
+
+    @ExcelProperty("补贴比例")
+    private String subsidyRatio;
+
+    @ExcelProperty("补贴金额")
+    private String subsidyAmount;
+
     /**
      * 结算金额
      */

src/main/java/com/ydtech/modules/inv/service/impl/InvSettlementSourceServiceImpl.java

@@ -64,22 +64,18 @@ public class InvSettlementSourceServiceImpl extends ServiceImpl<InvSettlementSou
     @Override
     @Transactional
     public boolean saveOrUpdateBatchWithConditions(List<InvSettlementSource> invSettlementSources) {
-        try {
-            for (InvSettlementSource invSettlementSource : invSettlementSources) {
-                InvSettlementSource one = baseMapper.selectOne(new LambdaQueryWrapper<InvSettlementSource>()
-                        .eq(InvSettlementSource::getLicenseno, invSettlementSource.getLicenseno())
-                        .eq(InvSettlementSource::getJqPolicyId, invSettlementSource.getJqPolicyId())
-                        .eq(InvSettlementSource::getSyPolicyId, invSettlementSource.getSyPolicyId())
-                        .eq(InvSettlementSource::getNonCarPolicyId, invSettlementSource.getNonCarPolicyId()));
-                if (one != null) {
-                    invSettlementSource.setId(one.getId());
-                    baseMapper.updateById(invSettlementSource);
-                } else {
-                    baseMapper.insert(invSettlementSource);
-                }
+        for (InvSettlementSource invSettlementSource : invSettlementSources) {
+            InvSettlementSource one = baseMapper.selectOne(new LambdaQueryWrapper<InvSettlementSource>()
+                    .eq(InvSettlementSource::getLicenseno, invSettlementSource.getLicenseno())
+                    .eq(InvSettlementSource::getJqPolicyId, invSettlementSource.getJqPolicyId())
+                    .eq(InvSettlementSource::getSyPolicyId, invSettlementSource.getSyPolicyId())
+                    .eq(InvSettlementSource::getNonCarPolicyId, invSettlementSource.getNonCarPolicyId()));
+            if (one != null) {
+                invSettlementSource.setId(one.getId());
+                baseMapper.updateById(invSettlementSource);
+            } else {
+                baseMapper.insert(invSettlementSource);
             }
-        }catch(Exception e){
-            return false;
         }
         return true;
     }

src/main/java/com/ydtech/modules/inv/service/impl/InvSourceServiceImpl.java

@@ -50,22 +50,18 @@ public class InvSourceServiceImpl extends ServiceImpl<InvSourceMapper, InvSource
     @Override
     @Transactional
     public boolean saveOrUpdateBatchWithConditions(List<InvSource> invSourceList) {
-        try {
-            for (InvSource invSource : invSourceList) {
-                InvSource one = baseMapper.selectOne(new LambdaQueryWrapper<InvSource>()
-                        .eq(InvSource::getLicenseno, invSource.getLicenseno())
-                        .eq(InvSource::getJqPolicyId, invSource.getJqPolicyId())
-                        .eq(InvSource::getSyPolicyId, invSource.getSyPolicyId())
-                        .eq(InvSource::getNonCarPolicyId, invSource.getNonCarPolicyId()));
-                if (one != null) {
-                    invSource.setId(one.getId());
-                    baseMapper.updateById(invSource);
-                } else {
-                    baseMapper.insert(invSource);
-                }
+        for (InvSource invSource : invSourceList) {
+            InvSource one = baseMapper.selectOne(new LambdaQueryWrapper<InvSource>()
+                    .eq(InvSource::getLicenseno, invSource.getLicenseno())
+                    .eq(InvSource::getJqPolicyId, invSource.getJqPolicyId())
+                    .eq(InvSource::getSyPolicyId, invSource.getSyPolicyId())
+                    .eq(InvSource::getNonCarPolicyId, invSource.getNonCarPolicyId()));
+            if (one != null) {
+                invSource.setId(one.getId());
+                baseMapper.updateById(invSource);
+            } else {
+                baseMapper.insert(invSource);
             }
-        }catch(Exception e){
-            return false;
         }
         return true;
     }