From 72204a91cd4e734adfcc5e5a5aace9f6fbb30223 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 06 九月 2024 18:10:34 +0800
Subject: [PATCH] 花城 修改双报道个人服务统计时常次数不正确3
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventApi.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 305f44b..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
@@ -8,6 +8,7 @@
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;
@@ -38,11 +39,16 @@
@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")
@@ -54,6 +60,8 @@
public R appletList(){
return R.ok(commediateTypeService.list(new QueryWrapper<ComMediateType>().eq("enabled",1).eq("delete_flag", 0)));
}
+
+
/**
* 新增事件类型
@@ -73,6 +81,7 @@
return commediateTypeService.addOrUpdate(comMediateTypeDTO);
}
+
/**
* 删除事件
* */
@@ -84,10 +93,12 @@
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){
+ if (list.size() != 0){
return R.fail("有未处理完成事件,无法删除");
}
return R.ok(commediateTypeService.updateById(comMediateType));
}
+
+
}
--
Gitblit v1.7.1