From 8457df0ef43fada73d66647b8a5fa43e623b6826 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期一, 10 十月 2022 16:03:34 +0800
Subject: [PATCH] Merge branch 'sanshuohuitang_dev' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventApi.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventApi.java
index 7a4c003..b8e6fed 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventApi.java
@@ -8,10 +8,12 @@
import com.panzhihua.common.model.dtos.community.sanshuo.ComSanshuoEventDTO;
import com.panzhihua.common.model.dtos.community.sanshuo.IndexDateDTO;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.service_community.entity.ComEvent;
import com.panzhihua.service_community.entity.ComMediateType;
import com.panzhihua.service_community.entity.ComSanshuoEvent;
import com.panzhihua.service_community.service.ComSanShuoEventService;
import com.panzhihua.service_community.service.CommediateTypeService;
+import com.panzhihua.service_community.service.IComEventService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
@@ -33,6 +35,9 @@
@Resource
private CommediateTypeService commediateTypeService;
+ @Resource
+ private IComEventService comEventService;
+
@GetMapping ("/list")
public R list(@RequestParam(value = "keyWord",required = false)String keyWord,
@RequestParam(value = "page",required = false)Integer page,
@@ -47,8 +52,10 @@
@GetMapping("/appletsList")
public R appletList(){
- return R.ok(commediateTypeService.list(new QueryWrapper<ComMediateType>().eq("enabled",1)));
+ return R.ok(commediateTypeService.list(new QueryWrapper<ComMediateType>().eq("enabled",1).eq("delete_flag", 0)));
}
+
+
/**
* 新增事件类型
@@ -68,6 +75,7 @@
return commediateTypeService.addOrUpdate(comMediateTypeDTO);
}
+
/**
* 删除事件
* */
@@ -77,14 +85,14 @@
comMediateType.setDeleteFlag(true);
comMediateType.setEnabled(false);
comMediateType.setModifyUser(this.getLoginUserInfo().getUserId());
+ //该分类是否有未调解完成事件
+ List<ComEvent> list = comEventService.list(new QueryWrapper<ComEvent>().lambda().eq(ComEvent::getEventCategory, id).in(ComEvent::getEventProcessStatus, (1), (2), (5)));
+ if (list.size() != 0){
+ return R.fail("有未处理完成事件,无法删除");
+ }
return R.ok(commediateTypeService.updateById(comMediateType));
}
- /**
- * 大屏接口-事件统计
- * */
- @PostMapping("/indexDate")
- public R indexDate(@RequestBody IndexDateDTO indexDateDTO){
- return commediateTypeService.indexDate(indexDateDTO);
- }
+
+
}
--
Gitblit v1.7.1