From 83bdaea1c6379646b32a44d7e494ec8d0f57adcd Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 23 五月 2022 10:05:24 +0800
Subject: [PATCH] 花城E+bug更新
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngCarServiceImpl.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngCarServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngCarServiceImpl.java
index f069af3..fc3e740 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngCarServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngCarServiceImpl.java
@@ -180,11 +180,11 @@
@Override
public R listSaveMngCarExcelVO(List<ComMngCarExcelVO> list, Long communityId) {
// 获取社区下所有的小区
- List<ComMngStructAreaDO> comMngStructAreaDOs = comMngStructAreaDAO.selectList(
- new QueryWrapper<ComMngStructAreaDO>().lambda().eq(ComMngStructAreaDO::getCommunityId, communityId));
- Map<String, ComMngStructAreaDO> areaMap = new HashMap<>(comMngStructAreaDOs.size());
- comMngStructAreaDOs.forEach(comMngStructAreaDO -> {
- areaMap.put(comMngStructAreaDO.getAreaName(), comMngStructAreaDO);
+ List<ComMngVillageDO> comMngVillageDOS = comMngVillageDAO.selectList(
+ new QueryWrapper<ComMngVillageDO>().lambda().eq(ComMngVillageDO::getCommunityId, communityId));
+ Map<String, ComMngVillageDO> areaMap = new HashMap<>(comMngVillageDOS.size());
+ comMngVillageDOS.forEach(comMngVillageDO -> {
+ areaMap.put(comMngVillageDO.getName(),comMngVillageDO);
});
List<ComMngCarDO> comMngCarDOS = new ArrayList<>();
list.forEach(vo -> {
@@ -199,7 +199,7 @@
}
comMngCarDO.setCommunityId(communityId);
- comMngCarDO.setAreaId(areaMap.get(vo.getAreaName()).getId());
+ comMngCarDO.setAreaId(areaMap.get(vo.getAreaName()).getVillageId());
R<SysUserVO> sysUserVOR = userService.getSysUserVOByPhone(vo.getMobile());
if (R.isOk(sysUserVOR)) {
SysUserVO sysUserVO =
@@ -210,8 +210,13 @@
comMngCarDOS.add(comMngCarDO);
}
});
- this.saveBatch(comMngCarDOS);
- return R.ok("共计导入车辆数量：" + comMngCarDOS.size());
+ if(comMngCarDOS.isEmpty()){
+ return R.fail("导入数据有误");
+ }
+ else {
+ this.saveBatch(comMngCarDOS);
+ return R.ok("共计导入车辆数量：" + comMngCarDOS.size());
+ }
}
@Override
--
Gitblit v1.7.1