lidongdong
2023-09-04 b2fce0dc7dc4ea5dec9792a2bc3ceb9d33d6e07b
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerActivityServiceImpl.java
@@ -3,16 +3,13 @@
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.MostBeautifulVolunteerVO;
import com.panzhihua.common.model.vos.community.VolunteerActivityVO;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.MostBeautifulVolunteerDao;
import com.panzhihua.service_community.dao.VolunteerActivityDao;
import com.panzhihua.service_community.entity.MostBeautifulVolunteer;
import com.panzhihua.service_community.entity.VolunteerActivity;
import com.panzhihua.service_community.service.MostBeautifulVolunteerService;
import com.panzhihua.service_community.service.VolunteerActivityService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import java.util.Date;
@@ -25,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
@@ -34,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
@@ -87,10 +85,14 @@
                {
                    state = "3";
                }
                else if (newTiem>applyEndtime)
                else if (newTiem>applyEndtime  && newTiem <actityBegintime )
                {
                    //报名如果截止  报名人数为0   结束活动
                    Integer num=Integer.valueOf(itemDate.getVolunteerNum());
                    Integer num=0;
                    if(!StringUtils.isEmpty(itemDate.getVolunteerNum()))
                    {
                        num=Integer.valueOf(itemDate.getVolunteerNum());
                    }
                    if(num<=0)
                    {
                        state = "6";
@@ -110,7 +112,11 @@
                if(!StringUtils.equals(state,itemDate.getAcState()))
                {
                    itemDate.setAcState(state);
                    baseMapper.updateById(itemDate);
                    VolunteerActivityVO comActDynVO = new VolunteerActivityVO();
                    comActDynVO.setId(itemDate.getId());
                    BeanUtils.copyProperties(itemDate, comActDynVO);
                    baseMapper.updateById(comActDynVO);
                }
            }
        }