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

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

@@ -2886,11 +2886,12 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
     public HashMap<String, Object> ptImportOther(MultipartFile multipartFile) {
         HashMap<String, Object> resultMap = new HashMap<>();
         List<HashMap<String, Object>> resultList = new ArrayList<>();
-        HashMap<String, Object> params = new HashMap<>();
         BigDecimal allAmount = BigDecimal.ZERO;
         try {
             List<InsPtHandExcelDto> dtoList = ExcelEasypoiUtils.importExcel(multipartFile, InsPtHandExcelDto.class, 0, 1, 1);
             for (InsPtHandExcelDto item : dtoList) {
+                HashMap<String, Object> params = new HashMap<>();
+
                 if (StringUtils.isNotEmpty(item.getLicenseno())) {
                     params.put("licenseno", item.getLicenseno());
                 }
@@ -2927,7 +2928,7 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
                     item.setNoSuperviseCostsProportion(BigDecimal.ZERO);
                 }
 
-                if (ObjectUtils.isNotEmpty(byBxLicenseno) && (byBxLicenseno.getJqOtherCostsProportion().compareTo(item.getJqOtherCostsProportion()) != 0 || byBxLicenseno.getSyOtherCostsProportion().compareTo(item.getSyOtherCostsProportion()) != 0)) {
+                if (ObjectUtils.isNotEmpty(byBxLicenseno) && (byBxLicenseno.getJqOtherCostsProportion().compareTo(item.getJqOtherCostsProportion()) != 0 || byBxLicenseno.getSyOtherCostsProportion().compareTo(item.getSyOtherCostsProportion()) != 0|| byBxLicenseno.getNoSuperviseCostsProportion().compareTo(item.getNoSuperviseCostsProportion()) != 0)) {
                     InsPlyIncomeLog insPlyIncomeLog = new InsPlyIncomeLog();
                     BeanUtils.copyProperties(byBxLicenseno,insPlyIncomeLog);
                     insPlyIncomeLog.setOperationStatus("2");