From 38596b03540250dd7de85c49f53ece5dd6bfe5b7 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 10 十一月 2022 13:19:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientElevatingPointServiceImpl.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientElevatingPointServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientElevatingPointServiceImpl.java
index 427a5ea..30d72c2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientElevatingPointServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientElevatingPointServiceImpl.java
@@ -65,8 +65,13 @@
public R addPoint(ConvenientElevatingPointDTO convenientElevatingPointDTO) {
ConvenientElevatingPointDO convenientElevatingPointDO = new ConvenientElevatingPointDO();
BeanUtils.copyProperties(convenientElevatingPointDTO,convenientElevatingPointDO);
- ComActDO comActDO = comActDAO.selectById(convenientElevatingPointDTO.getCommunityId());
- convenientElevatingPointDO.setCommunityName(comActDO.getName());
+ String communityId = convenientElevatingPointDTO.getCommunityId();
+ if (nonNull(communityId)) {
+ ComActDO comActDO = comActDAO.selectById(Long.parseLong(communityId.substring(communityId.lastIndexOf(",")+1)));
+ if(comActDO!=null){
+ convenientElevatingPointDO.setCommunityName(comActDO.getName());
+ }
+ }
this.baseMapper.insert(convenientElevatingPointDO);
return R.ok();
}
@@ -84,13 +89,11 @@
if (isNull(convenientElevatingPointDO)) {
return R.fail("自提点不存在");
}
- Long communityId = convenientElevatingPointDTO.getCommunityId();
+ String communityId = convenientElevatingPointDTO.getCommunityId();
if (nonNull(communityId)) {
- ComActDO comActDO = comActDAO.selectById(communityId);
+ ComActDO comActDO = comActDAO.selectById(Long.parseLong(communityId.substring(communityId.lastIndexOf(",")+1)));
if(comActDO!=null){
convenientElevatingPointDO.setCommunityName(comActDO.getName());
- } else {
- convenientElevatingPointDO.setCommunityName("西区社区");
}
}
BeanUtils.copyProperties(convenientElevatingPointDTO, convenientElevatingPointDO);
@@ -111,4 +114,10 @@
}
return R.fail("删除失败");
}
+
+ @Override
+ public R detailPoint(Long pointId) {
+ ConvenientElevatingPointDO convenientElevatingPointDO = this.baseMapper.selectById(pointId);
+ return R.ok(convenientElevatingPointDO);
+ }
}
--
Gitblit v1.7.1