From 00a59b93c16b24e7be77c6f1ce4866c75a2e0431 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 19 四月 2022 16:32:21 +0800
Subject: [PATCH] 花城E+防疫修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWorkGuideClassifyServiceImpl.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWorkGuideClassifyServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWorkGuideClassifyServiceImpl.java
index 21738f3..1f78b5c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWorkGuideClassifyServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWorkGuideClassifyServiceImpl.java
@@ -15,7 +15,9 @@
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.ComActWorkGuideClassifyDAO;
+import com.panzhihua.service_community.dao.ComActWorkGuideDAO;
import com.panzhihua.service_community.model.dos.ComActWorkGuideClassifyDO;
+import com.panzhihua.service_community.model.dos.ComActWorkGuideDO;
import com.panzhihua.service_community.model.dos.ComMngPopulationHouseDO;
import com.panzhihua.service_community.model.dos.ComMngUserTagDO;
import com.panzhihua.service_community.service.ComActWorkGuideClassifyService;
@@ -43,6 +45,8 @@
@Resource
private ComActWorkGuideClassifyDAO comActWorkGuideClassifyDAO;
+ @Resource
+ private ComActWorkGuideDAO comActWorkGuideDAO;
@Override
public R pageWorkGuideClassify(ComActWorkGuideClassifyVO comActWorkGuideClassifyVO) {
@@ -71,7 +75,9 @@
return R.fail("该办事指南分类不存在");
}
ComActWorkGuideClassifyDO checkCreditCode = comActWorkGuideClassifyDAO.selectOne(
- new QueryWrapper<ComActWorkGuideClassifyDO>().lambda().eq(ComActWorkGuideClassifyDO::getClassifyName, comActWorkGuideClassifyVO.getClassifyName()));
+ new QueryWrapper<ComActWorkGuideClassifyDO>().lambda()
+ .eq(ComActWorkGuideClassifyDO::getClassifyName, comActWorkGuideClassifyVO.getClassifyName())
+ .eq(ComActWorkGuideClassifyDO::getAreaCode, comActWorkGuideClassifyVO.getAreaCode()));
if (null != checkCreditCode && !comActWorkGuideClassifyDO.getId().equals(checkCreditCode.getId())) {
return R.fail("该办事指南分类已存在，办事指南分类名称重复");
}
@@ -84,7 +90,9 @@
} else {
// 新增
Integer count = comActWorkGuideClassifyDAO.selectCount(
- new QueryWrapper<ComActWorkGuideClassifyDO>().lambda().eq(ComActWorkGuideClassifyDO::getClassifyName, comActWorkGuideClassifyVO.getClassifyName()));
+ new QueryWrapper<ComActWorkGuideClassifyDO>().lambda()
+ .eq(ComActWorkGuideClassifyDO::getClassifyName, comActWorkGuideClassifyVO.getClassifyName())
+ .eq(ComActWorkGuideClassifyDO::getAreaCode, comActWorkGuideClassifyVO.getAreaCode()));
if (count > 0) {
return R.fail("该办事指南分类已存在，办事指南分类名称重复");
}
@@ -105,6 +113,13 @@
if (comActWorkGuideClassifyDO == null) {
return R.fail("办事指南分类不存在");
}
+
+ Integer count = comActWorkGuideDAO.selectCount(new QueryWrapper<ComActWorkGuideDO>()
+ .lambda().eq(ComActWorkGuideDO::getClassify,workGuideClassifyId));
+ if(count > 0){
+ return R.fail("该分类下存在办事指南，不可删除");
+ }
+
int delete = comActWorkGuideClassifyDAO.deleteById(workGuideClassifyId);
if (delete > 0) {
return R.ok();
@@ -113,8 +128,8 @@
}
@Override
- public R getWorkGuideClassifyList() {
- List<ComActWorkGuideClassifyDO> comActWorkGuideClassifyDOS = comActWorkGuideClassifyDAO.selectList(null);
+ public R getWorkGuideClassifyList(String areaCode) {
+ List<ComActWorkGuideClassifyDO> comActWorkGuideClassifyDOS = comActWorkGuideClassifyDAO.selectList(new QueryWrapper<ComActWorkGuideClassifyDO>().lambda().eq(ComActWorkGuideClassifyDO::getAreaCode,areaCode));
List<ComActWorkGuideClassifyVO> comActWorkGuideClassifyVOList = new ArrayList<>();
if (comActWorkGuideClassifyDOS != null && comActWorkGuideClassifyDOS.size() > 0) {
comActWorkGuideClassifyDOS.forEach(comActWorkGuideClassifyDO -> {
--
Gitblit v1.7.1