huanghongfa
2020-12-30 b1da1a1fd20d2392e0b686ba1ea72cd9eba7e723
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java
@@ -16,14 +16,13 @@
import com.panzhihua.service_dangjian.model.dos.ComPbActivityMemberDO;
import com.panzhihua.service_dangjian.model.dos.ComPbMemberDO;
import com.panzhihua.service_dangjian.service.ComBpActivityService;
import org.apache.http.client.utils.DateUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;
/**
@@ -64,6 +63,7 @@
        Page page = new Page<>();
        Long pageNum = pageActivityMembersVO.getPageNum();
        Long pageSize = pageActivityMembersVO.getPageSize();
        Long activityId = pageActivityMembersVO.getActivityId();
        if (null == pageNum) {
            pageNum = 1l;
        }
@@ -73,7 +73,12 @@
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<PageActivityMembersVO> iPage = comPbActivityMemberDAO.pageActivityMembers(page, pageActivityMembersVO);
        return R.ok(iPage);
        Map<String,Object> map=new HashMap<>(3);
        ComPbActivityDO comPbActivityDO = comBpActivityDAO.selectById(activityId);
        map.put("page",iPage);
        map.put("name",comPbActivityDO.getName());
        map.put("createAt",DateUtils.formatDate(comPbActivityDO.getCreateAt(),"yyyy-MM-dd HH:mm:ss"));
        return R.ok(map);
    }
    /**
@@ -215,7 +220,7 @@
        ComPbActivityDO comPbActivityDO = new ComPbActivityDO();
        comPbActivityDO.setId(partyBuildingActivityVO.getId());
        comPbActivityDO.setCancelReason(partyBuildingActivityVO.getCancelReason());
        comPbActivityDO.setCreateBy(partyBuildingActivityVO.getCreateBy());
        comPbActivityDO.setStatus(6);
        int update = comBpActivityDAO.updateById(comPbActivityDO);
        if (update > 0) {
            return R.ok();