From b2fce0dc7dc4ea5dec9792a2bc3ceb9d33d6e07b Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 04 九月 2023 13:59:52 +0800
Subject: [PATCH] 修改后台社区动态加载不出来
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventApi.java | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 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 95c5daa..f773788 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
@@ -6,11 +6,15 @@
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.sanshuo.ComMediateTypeDTO;
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.common.service.user.UserService;
+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.*;
@@ -32,11 +36,19 @@
@Resource
private CommediateTypeService commediateTypeService;
+ @Resource
+ private IComEventService comEventService;
+
+ @Resource
+ private UserService userService;
+
@GetMapping ("/list")
public R list(@RequestParam(value = "keyWord",required = false)String keyWord,
@RequestParam(value = "page",required = false)Integer page,
@RequestParam(value = "size",required = false)Integer size){
- return commediateTypeService.listEvent(keyWord,page,size);
+// String appId=userService.detailUser(this.getUserId()).getData().getAppId();
+ String appId=getAppId();
+ return commediateTypeService.listEvent(keyWord,page,size,appId);
}
@GetMapping("/detail")
@@ -46,15 +58,17 @@
@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)));
}
+
+
/**
* 新增事件类型
* */
@PostMapping
public R add(@RequestBody ComMediateTypeDTO comMediateTypeDTO){
- //comMediateTypeDTO.setCreateUser(this.getLoginUserInfo().getUserId());
+ comMediateTypeDTO.setCreateUser(this.getLoginUserInfo().getUserId());
return commediateTypeService.addOrUpdate(comMediateTypeDTO);
}
@@ -63,9 +77,10 @@
* */
@PutMapping
public R update(@RequestBody ComMediateTypeDTO comMediateTypeDTO){
- //comMediateTypeDTO.setModifyUser(this.getLoginUserInfo().getUserId());
+ comMediateTypeDTO.setModifyUser(this.getLoginUserInfo().getUserId());
return commediateTypeService.addOrUpdate(comMediateTypeDTO);
}
+
/**
* 删除事件
@@ -75,7 +90,15 @@
ComMediateType comMediateType = commediateTypeService.getById(id);
comMediateType.setDeleteFlag(true);
comMediateType.setEnabled(false);
- //comMediateType.setModifyUser(this.getLoginUserInfo().getUserId());
+ 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));
}
+
+
+
}
--
Gitblit v1.7.1