From ce4a770744d7a0b4e4ea3b5101556b94e72bdf1c Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 14 十一月 2023 17:49:20 +0800
Subject: [PATCH] 修改打卡
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerActivityServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerActivityServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerActivityServiceImpl.java
index 52ba0e0..027f871 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerActivityServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerActivityServiceImpl.java
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.panzhihua.common.model.vos.community.ComActDynVO;
import com.panzhihua.common.model.vos.community.VolunteerActivityVO;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.VolunteerActivityDao;
@@ -23,8 +22,8 @@
{
@Override
- public VolunteerActivity queryById(String Id) {
- return baseMapper.queryById(Id);
+ public VolunteerActivity queryById(String Id,String userId) {
+ return baseMapper.queryById(Id,userId);
}
@Override
@@ -32,11 +31,12 @@
String name,
String acState,
String acType,
+ String userId,
Date actityBeginTime,
Date actityEndTime)
{
Page page = new Page<VolunteerActivity>(pageNum,pageSize);
- return baseMapper.queryList(page, name, acState, acType, actityBeginTime, actityEndTime);
+ return baseMapper.queryList(page, name, acState, acType, userId, actityBeginTime, actityEndTime);
}
@Override
@@ -85,7 +85,7 @@
{
state = "3";
}
- else if (newTiem>applyEndtime)
+ else if (newTiem>applyEndtime && newTiem <actityBegintime )
{
//报名如果截止 报名人数为0 结束活动
Integer num=0;
@@ -114,6 +114,7 @@
itemDate.setAcState(state);
VolunteerActivityVO comActDynVO = new VolunteerActivityVO();
+ comActDynVO.setId(itemDate.getId());
BeanUtils.copyProperties(itemDate, comActDynVO);
baseMapper.updateById(comActDynVO);
}
--
Gitblit v1.7.1