lidongdong
2024-07-11 eef6d2bcdb29348efe4ef17bc45a4c6886b487b1
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,15 +31,48 @@
                                              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
    public int insertVolunteer(VolunteerActivityVO mostBeautifulVolunteerVO) {
    public int insertVolunteer(VolunteerActivityVO mostBeautifulVolunteerVO)
    {
        Long applyBegintime = mostBeautifulVolunteerVO.getApplyBeginTime().getTime();
        //活动报名结束时间
        Long applyEndtime = mostBeautifulVolunteerVO.getApplyEndTime().getTime();
        //活动开始时间
        Long actityBegintime = mostBeautifulVolunteerVO.getActityBeginTime().getTime();
        //活动结束时间
        Long actityEndtime = mostBeautifulVolunteerVO.getActityEndTime().getTime();
        Long newTiem=System.currentTimeMillis();
        //判断是否在报名中
        if (newTiem >= applyBegintime && newTiem < applyEndtime)
        {
            mostBeautifulVolunteerVO.setAcState("3");
        }
        else if (newTiem>applyEndtime  && newTiem <actityBegintime )
        {
             mostBeautifulVolunteerVO.setAcState("4");
        }
        else if (newTiem >= actityBegintime && newTiem <= actityEndtime)
        {
            //判断是否活动进行中
            mostBeautifulVolunteerVO.setAcState("4");
        }
        else if(newTiem>actityEndtime)
        {
            //活动结束
            mostBeautifulVolunteerVO.setAcState("5");
        }
        return baseMapper.insertVolunteer(mostBeautifulVolunteerVO);
    }
@@ -85,7 +117,7 @@
                {
                    state = "3";
                }
                else if (newTiem>applyEndtime)
                else if (newTiem>applyEndtime  && newTiem <actityBegintime )
                {
                    //报名如果截止  报名人数为0   结束活动
                    Integer num=0;