huanghongfa
2020-12-22 e618a4c7b63f7c111b6cdd154544e54b4ed0a25e
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java
@@ -10,7 +10,7 @@
import com.panzhihua.service_dangjian.dao.ComBpActivityDAO;
import com.panzhihua.service_dangjian.dao.ComPbActivityMemberDAO;
import com.panzhihua.service_dangjian.dao.ComPbMemberDAO;
import com.panzhihua.service_dangjian.model.dos.ComBpActivityDO;
import com.panzhihua.service_dangjian.model.dos.ComPbActivityDO;
import com.panzhihua.service_dangjian.model.dos.ComPbActivityMemberDO;
import com.panzhihua.service_dangjian.model.dos.ComPbMemberDO;
import com.panzhihua.service_dangjian.service.ComBpActivityService;
@@ -82,12 +82,12 @@
     */
    @Override
    public R activityinfo(Long id) {
        ComBpActivityDO comBpActivityDO = comBpActivityDAO.selectById(id);
        if (ObjectUtils.isEmpty(comBpActivityDO)) {
        ComPbActivityDO comPbActivityDO = comBpActivityDAO.selectById(id);
        if (ObjectUtils.isEmpty(comPbActivityDO)) {
            return R.fail();
        }
        PartyBuildingActivityVO partyBuildingActivityVO=new PartyBuildingActivityVO();
        BeanUtils.copyProperties(comBpActivityDO,partyBuildingActivityVO);
        BeanUtils.copyProperties(comPbActivityDO,partyBuildingActivityVO);
        List<ComPbActivityMemberDO> comPbActivityMemberDOS = comPbActivityMemberDAO.selectList(new QueryWrapper<ComPbActivityMemberDO>().lambda().eq(ComPbActivityMemberDO::getActivityId, id));
        if (!ObjectUtils.isEmpty(comPbActivityMemberDOS)) {
            List<Long> collect = comPbActivityMemberDOS.stream().map(ComPbActivityMemberDO::getMemberId).collect(Collectors.toList());
@@ -111,10 +111,10 @@
     */
    @Override
    public R addactivity(PartyBuildingActivityVO partyBuildingActivityVO) {
        ComBpActivityDO comBpActivityDO=new ComBpActivityDO();
        BeanUtils.copyProperties(partyBuildingActivityVO,comBpActivityDO);
        comBpActivityDO.setCreateAt(new Date());
        int insert = comBpActivityDAO.insert(comBpActivityDO);
        ComPbActivityDO comPbActivityDO =new ComPbActivityDO();
        BeanUtils.copyProperties(partyBuildingActivityVO, comPbActivityDO);
        comPbActivityDO.setCreateAt(new Date());
        int insert = comBpActivityDAO.insert(comPbActivityDO);
        if (insert>0) {
            return R.ok();
        }
@@ -129,9 +129,9 @@
     */
    @Override
    public R updateActivity(PartyBuildingActivityVO partyBuildingActivityVO) {
        ComBpActivityDO comBpActivityDO=new ComBpActivityDO();
        BeanUtils.copyProperties(partyBuildingActivityVO,comBpActivityDO);
        int update = comBpActivityDAO.updateById(comBpActivityDO);
        ComPbActivityDO comPbActivityDO =new ComPbActivityDO();
        BeanUtils.copyProperties(partyBuildingActivityVO, comPbActivityDO);
        int update = comBpActivityDAO.updateById(comPbActivityDO);
        if (update>0) {
            return R.ok();
        }
@@ -146,11 +146,11 @@
     */
    @Override
    public R releaseActivity(Long id) {
        ComBpActivityDO comBpActivityDO=new ComBpActivityDO();
        comBpActivityDO.setId(id);
        comBpActivityDO.setStatus(2);
        comBpActivityDO.setReleaseTime(new Date());
        int update = comBpActivityDAO.updateById(comBpActivityDO);
        ComPbActivityDO comPbActivityDO =new ComPbActivityDO();
        comPbActivityDO.setId(id);
        comPbActivityDO.setStatus(2);
        comPbActivityDO.setReleaseTime(new Date());
        int update = comBpActivityDAO.updateById(comPbActivityDO);
        if (update>0) {
            return R.ok();
        }
@@ -203,11 +203,11 @@
     */
    @Override
    public R cancelActivity(PartyBuildingActivityVO partyBuildingActivityVO) {
        ComBpActivityDO comBpActivityDO=new ComBpActivityDO();
        comBpActivityDO.setId(partyBuildingActivityVO.getId());
        comBpActivityDO.setCancelReason(partyBuildingActivityVO.getCancelReason());
        comBpActivityDO.setCreateBy(partyBuildingActivityVO.getCreateBy());
        int update = comBpActivityDAO.updateById(comBpActivityDO);
        ComPbActivityDO comPbActivityDO =new ComPbActivityDO();
        comPbActivityDO.setId(partyBuildingActivityVO.getId());
        comPbActivityDO.setCancelReason(partyBuildingActivityVO.getCancelReason());
        comPbActivityDO.setCreateBy(partyBuildingActivityVO.getCreateBy());
        int update = comBpActivityDAO.updateById(comPbActivityDO);
        if (update>0) {
            return R.ok();
        }