Merge remote-tracking branch 'origin/test'

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

@@ -60,6 +60,10 @@ public class InvSettlementSourceExcel implements Serializable {
     @ExcelProperty("保险公司")
     private String insuranceCompany;
 
+
+    @ExcelProperty("保司编码")
+    private String insuranceId;
+
     /**
      * 险种
      */

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

@@ -44,14 +44,6 @@ public class InvSettlementSourceServiceImpl extends ServiceImpl<InvSettlementSou
     public HttpResult readInvSettlementSourceExcel(String file) {
         List<InvSettlementSourceExcel> invSettlementSourceExcels = EasyExcelUtils.readInvSettlementSourceExcelExcel(uploadFilePath + file, InvSettlementSourceExcel.class);
         List<InvSettlementSource> invSettlementSources = JSONArray.parseArray(JSONArray.toJSONString(invSettlementSourceExcels),InvSettlementSource.class);
-        List<InvChannelAccount> accountList = invChannelAccountService.list();
-//        invSettlementSources.forEach(invSettlementSource -> {
-//            boolean count = accountList.stream().filter(x -> x.getChannelName().equals(invSettlementSource.getChannel())).findFirst().isPresent();
-//            if(count){
-//                InvChannelAccount invChannelAccount = accountList.stream().filter(x -> x.getChannelName().equals(invSettlementSource.getChannel())).findFirst().get();
-//                invSettlementSource.setEmployeeId(invChannelAccount.getEmployeeId());
-//            }
-//        });
         boolean result = invSettlementSourceService.saveOrUpdateBatchWithConditions(invSettlementSources);
         return result ? HttpResult.ok("导入成功") : HttpResult.error("导入失败");
     }