From 50e1eb020efe8da670b718d865fa4c1eaa61ee7d Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 20 五月 2021 19:51:09 +0800
Subject: [PATCH] 修改bug
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtServeServiceImpl.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtServeServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtServeServiceImpl.java
index c0ace74..c6d9062 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtServeServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtServeServiceImpl.java
@@ -174,7 +174,9 @@
comCvtBusinessDOS = comCvtBusinessDAO.selectList(new LambdaQueryWrapper<>());
}
Map<String, Long> businessMap = getBusinessMap(comCvtBusinessDOS);
- list.forEach(comCvtServeExcelVO -> {
+ List<String> errorInfo = new ArrayList<>();
+ int index = 2;
+ for (ComCvtServeExcelVO comCvtServeExcelVO:list) {
/**
* 便民服务分类存在 并且 便民服务商家 匹配上
*/
@@ -189,9 +191,26 @@
}else{
log.error(String.format("导入失败：商家【%s】下已有服务【%s】",comCvtServeExcelVO.getBusinessName(),comCvtServeExcelVO.getServiceName()));
}
+ }else{
+ if(!categoryMap.containsKey(comCvtServeExcelVO.getCategoryName())) {
+ errorInfo.add(comCvtServeExcelVO.getCategoryName() +"导入失败: 服务分类不存在");
+ }
+ if(!businessMap.containsKey(comCvtServeExcelVO.getBusinessName())) {
+ errorInfo.add(comCvtServeExcelVO.getBusinessName() +"导入失败: 便民服务商家不存在");
+ }
}
- });
- this.saveBatch(comCvtServeDOS);
+ }
+ boolean saveBatched = this.saveBatch(comCvtServeDOS);
+ if(saveBatched) {
+ if (comCvtServeDOS.size()>0 && errorInfo != null && errorInfo.size() > 0) {
+ return R.fail("导入部分成功：" + errorInfo.toString());
+ }
+ if(comCvtServeDOS.size()==0 && errorInfo != null && errorInfo.size() > 0){
+ return R.fail("导入失败：" + errorInfo.toString());
+ }
+ }else {
+ return R.fail("导入失败：" + errorInfo.toString());
+ }
return R.ok("共计导入服务数量："+comCvtServeDOS.size());
}
--
Gitblit v1.7.1