From abcf72007c724d6e828994e13b34c26b04651471 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 23 Jun 2020 09:49:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=96=E6=B6=88=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activity/controller/ActivityInfoController.java    |  8 ++++++++
 .../activity/service/impl/ActivityInfoServiceImpl.java | 10 ++++++++++
 2 files changed, 18 insertions(+)

diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActivityInfoController.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActivityInfoController.java
index 48edd40..fbd850c 100644
--- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActivityInfoController.java
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActivityInfoController.java
@@ -77,6 +77,14 @@ public class ActivityInfoController {
         return new Result();
     }
 
+    @PostMapping("cancel")
+    public Result cancel(@RequestBody ActivityInfoDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        activityInfoService.update(dto);
+        return new Result();
+    }
+
     @DeleteMapping
     public Result delete(@RequestBody String[] ids){
         //效验数据
diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActivityInfoServiceImpl.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActivityInfoServiceImpl.java
index cd055d1..17d5e0b 100644
--- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActivityInfoServiceImpl.java
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActivityInfoServiceImpl.java
@@ -25,7 +25,9 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.dto.activity.ActivityInfoDTO;
 import com.elink.esua.epdc.modules.activity.dao.ActivityInfoDao;
+import com.elink.esua.epdc.modules.activity.dao.ActivityParticipantDao;
 import com.elink.esua.epdc.modules.activity.entity.ActivityInfoEntity;
+import com.elink.esua.epdc.modules.activity.entity.ActivityParticipantEntity;
 import com.elink.esua.epdc.modules.activity.redis.ActivityInfoRedis;
 import com.elink.esua.epdc.modules.activity.service.ActivityInfoService;
 import com.elink.esua.epdc.modules.section.dao.SectionCategoryDao;
@@ -37,6 +39,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -55,6 +58,9 @@ public class ActivityInfoServiceImpl extends BaseServiceImpl<ActivityInfoDao, Ac
     @Resource
     private SectionCategoryDao sectionCategoryDao;
 
+    @Resource
+    private ActivityParticipantDao activityParticipantDao;
+
     @Override
     public PageData<ActivityInfoDTO> page(Map<String, Object> params) {
         IPage<ActivityInfoEntity> page = getPage(params);
@@ -82,6 +88,10 @@ public class ActivityInfoServiceImpl extends BaseServiceImpl<ActivityInfoDao, Ac
     @Override
     public ActivityInfoDTO get(String id) {
         ActivityInfoEntity entity = baseDao.selectById(id);
+        Map<String, Object> params = new HashMap<>(1);
+        params.put("id", id);
+        List<ActivityParticipantEntity> activityParticipantNum = activityParticipantDao.selectListOfActivityParticipant(params);
+        entity.setSignUpNum(activityParticipantNum.size());
         return ConvertUtils.sourceToTarget(entity, ActivityInfoDTO.class);
     }