From a6039dd43de890a85d3586c044a23378b12cca02 Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期三, 27 一月 2021 13:49:59 +0800
Subject: [PATCH] 随手拍
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 48 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
index 68a66d7..f6ce162 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
@@ -11,6 +11,7 @@
import com.panzhihua.common.model.vos.community.SignactivityVO;
import com.panzhihua.service_community.dao.ComActActSignDAO;
import com.panzhihua.service_community.dao.ComActActivityDAO;
+import com.panzhihua.service_community.dao.ComActDiscussOptionUserDAO;
import com.panzhihua.service_community.model.dos.ComActActSignDO;
import com.panzhihua.service_community.model.dos.ComActActivityDO;
import com.panzhihua.service_community.service.ComActActivityService;
@@ -39,6 +40,7 @@
private ComActActivityDAO comActActivityDAO;
@Resource
private ComActActSignDAO comActActSignDAO;
+
/**
* 新增社区活动
* @param comActActivityVO 新增信息
@@ -98,6 +100,15 @@
page.setSize(pageSize);
page.setCurrent(pageNum);
IPage<ComActActivityVO> iPage = comActActivityDAO.pageActivity(page, comActActivityVO);
+ List<ComActActivityVO> records = iPage.getRecords();
+ if (!ObjectUtils.isEmpty(records)) {
+ records.forEach(comActActivityVO1 -> {
+ Integer status = comActActivityVO1.getStatus();
+ if (status.intValue()==3) {
+ comActActivityVO1.setStatus(4);
+ }
+ });
+ }
return R.ok(iPage);
}
@@ -214,7 +225,14 @@
comActActSignDO.setActivityId(activityId);
comActActSignDO.setUserId(userId);
comActActSignDO.setIsVolunteer(isVolunteer);
- num = comActActSignDAO.insert(comActActSignDO);
+ try {
+ num = comActActSignDAO.insert(comActActSignDO);
+ } catch (Exception e) {
+ if (e.getMessage().contains("unique_activity_id_user_id")) {
+ return R.fail("已经报名过了，请勿重复提交");
+ }
+ log.error(e.getMessage());
+ }
} else {
num = comActActSignDAO.delete(new QueryWrapper<ComActActSignDO>().lambda().eq(ComActActSignDO::getUserId, userId).eq(ComActActSignDO::getActivityId, activityId).eq(ComActActSignDO::getIsVolunteer, isVolunteer));
}
@@ -250,6 +268,11 @@
}else{
comActActivityVO.setType(2);
}
+ Integer status = comActActivityVO.getStatus();
+ if (status.intValue()==3) {
+ comActActivityVO.setStatus(4);
+ }
+ comActActivityVO.setSingDate(comActActSignDOS.stream().filter(comActActSignDO1 -> comActActSignDO1.getActivityId().equals(comActActivityVO.getId())).collect(Collectors.toList()).get(0).getCreateAt());
comActActivityVOS.add(comActActivityVO);
});
return R.ok(comActActivityVOS);
@@ -318,10 +341,33 @@
// 修改进行状态 变为进行中或者已结束
int num2=comActActivityDAO.updateStatusToBeginActiveOrEnd();
log.info("定时任务--修改社区活动进行状态活动数量【{}】",num2);
+ int num3=comActActivityDAO.updateStatusToBeginAfterSingEnd();
+ log.info("定时任务--报名结束修改社区活动进行状态活动数量【{}】",num3);
return R.ok();
}
-
+ /**
+ * 社区后台分页查询社区活动
+ *
+ * @param comActActivityVO 查询参数
+ * @return 返回结果
+ */
+ @Override
+ public R pageActivityCommunityBack(ComActActivityVO comActActivityVO) {
+ Page page = new Page<>();
+ Long pageNum = comActActivityVO.getPageNum();
+ Long pageSize = comActActivityVO.getPageSize();
+ if (null==pageNum||0==pageNum) {
+ pageNum = 1l;
+ }
+ if (null==pageSize||0==pageSize) {
+ pageSize = 10l;
+ }
+ page.setSize(pageSize);
+ page.setCurrent(pageNum);
+ IPage<ComActActivityVO> iPage = comActActivityDAO.pageActivityCommunityBack(page, comActActivityVO);
+ return R.ok(iPage);
+ }
}
--
Gitblit v1.7.1