From 8555f974846ca5b4f4734f52b51e39cd4502df44 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期五, 02 四月 2021 15:46:30 +0800
Subject: [PATCH] fix：修改bug
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructOtherBuildServiceImpl.java | 66 ++++++++++++++++++++++++++++++++-
1 files changed, 64 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructOtherBuildServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructOtherBuildServiceImpl.java
index 8fe2a79..a598a7f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructOtherBuildServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructOtherBuildServiceImpl.java
@@ -63,8 +63,8 @@
List<ComMngStructBuildTypeVO>comMngStructBuildTypeVOS=new ArrayList<>();
List<ComMngStructBuildTypeDO> comMngStructBuildTypeDOS = comMngStructBuildTypeDAO.selectList(null);
if (!ObjectUtils.isEmpty(comMngStructBuildTypeDOS)) {
- ComMngStructBuildTypeVO comMngStructBuildTypeVO=new ComMngStructBuildTypeVO();
comMngStructBuildTypeDOS.forEach(comMngStructBuildTypeDO -> {
+ ComMngStructBuildTypeVO comMngStructBuildTypeVO=new ComMngStructBuildTypeVO();
BeanUtils.copyProperties(comMngStructBuildTypeDO,comMngStructBuildTypeVO);
comMngStructBuildTypeVOS.add(comMngStructBuildTypeVO);
});
@@ -135,7 +135,9 @@
buildTypdIds.forEach(aLong -> {
if (!collect.contains(aLong)) {
ComMngStructBuildTypeDO comMngStructBuildTypeDO = comMngStructBuildTypeDAO.selectById(aLong);
- throw new ServiceException(comMngStructBuildTypeDO.getName()+"已经在使用无法删除");
+ if (!ObjectUtils.isEmpty(comMngStructBuildTypeDO)) {
+ throw new ServiceException(comMngStructBuildTypeDO.getName()+"已经在使用无法删除");
+ }
}
});
comMngStructBuildTypeDAO.delete(new QueryWrapper<ComMngStructBuildTypeDO>().lambda().eq(ComMngStructBuildTypeDO::getCommunityId, communityId));
@@ -151,4 +153,64 @@
});
return R.ok();
}
+
+ /**
+ * 其他建筑详情
+ *
+ * @param id 主键id
+ * @return 建筑内容
+ */
+ @Override
+ public R detailOtherbuild(Long id) {
+ ComMngStructOtherBuildDO comMngStructOtherBuildDO = comMngStructOtherBuildDAO.selectById(id);
+ if (ObjectUtils.isEmpty(comMngStructOtherBuildDO)) {
+ return R.fail("建筑不存在");
+ }
+ Long typeId = comMngStructOtherBuildDO.getTypeId();
+ ComMngStructBuildTypeDO comMngStructBuildTypeDO = comMngStructBuildTypeDAO.selectById(typeId);
+ if (ObjectUtils.isEmpty(comMngStructBuildTypeDO)) {
+ return R.fail("建筑类型不存在");
+ }
+ ComMngStructOtherBuildVO comMngStructOtherBuildVO=new ComMngStructOtherBuildVO();
+ BeanUtils.copyProperties(comMngStructOtherBuildDO,comMngStructOtherBuildVO);
+ comMngStructOtherBuildVO.setBuileTypeName(comMngStructBuildTypeDO.getName());
+ return R.ok(comMngStructOtherBuildVO);
+ }
+
+ /**
+ * 编辑其他建筑
+ *
+ * @param comMngStructOtherBuildVO 编辑内容
+ * @return 编辑结果
+ */
+ @Override
+ public R putOtherbuild(ComMngStructOtherBuildVO comMngStructOtherBuildVO) {
+ Long typeId = comMngStructOtherBuildVO.getTypeId();
+ ComMngStructBuildTypeDO comMngStructBuildTypeDO = comMngStructBuildTypeDAO.selectById(typeId);
+ if (ObjectUtils.isEmpty(comMngStructBuildTypeDO)) {
+ return R.fail("建筑类型不存在");
+ }
+ ComMngStructOtherBuildDO comMngStructOtherBuildDO=new ComMngStructOtherBuildDO();
+ BeanUtils.copyProperties(comMngStructOtherBuildVO,comMngStructOtherBuildDO);
+ int update = comMngStructOtherBuildDAO.updateById(comMngStructOtherBuildDO);
+ if (update>0) {
+ return R.ok("编辑成功过");
+ }
+ return R.fail("编辑失败");
+ }
+
+ /**
+ * 删除其他建筑
+ *
+ * @param id 主键
+ * @return 删除结果
+ */
+ @Override
+ public R deleteOtherbuild(Long id) {
+ int delete = comMngStructOtherBuildDAO.deleteById(id);
+ if (delete>0) {
+ return R.ok();
+ }
+ return R.fail("删除失败");
+ }
}
--
Gitblit v1.7.1