From 02085db6c53adada7f96e52bde5711134d7b4b45 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 02 六月 2021 13:41:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java | 34 +++++-----------------------------
1 files changed, 5 insertions(+), 29 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
index 8d1d615..ea9fbb8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
@@ -50,35 +50,6 @@
@Resource
private CommunityService communityService;
- /**
- * 新增事件
- * @param eventAddDTO 事件新增DTO
- * @return 新增结果
- */
- public R add(EventAddDTO eventAddDTO){
- EventDO eventDO = new EventDO();
- BeanUtils.copyProperties(eventAddDTO, eventDO);
- eventDO.setCreateAt(new Date());
- if(eventMapper.insert(eventDO)>0){
- return R.ok();
- }
- return R.fail();
- }
-
- /**
- * 修改事件
- * @param eventEditDTO
- * @return 维护结果
- */
- public R edit(EventEditDTO eventEditDTO){
- EventDO eventDO = new EventDO();
- BeanUtils.copyProperties(eventEditDTO, eventDO);
- //eventDO.setUpdateAt(new Date());
- if(eventMapper.updateById(eventDO)>0){
- return R.ok();
- }
- return R.fail();
- }
/**
* 分页查找事件
@@ -1077,6 +1048,11 @@
return R.fail();
}
+ @Override
+ public R<ComActVO> actList() {
+ return communityService.listCommunityAll();
+ }
+
/**
* 添加发布事件流转记录
* @param eventId 事件ID
--
Gitblit v1.7.1