Merge branch 'shuangzheng2' into huacheng_test

101captain

2022-08-01 bf46bac3cda70dc8dc7ed95e0461f1a72fba2eeb

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java

@@ -17,6 +17,7 @@

import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.utlis.Snowflake;
import com.panzhihua.service_community.entity.ComPbCheckUnit;
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.BeanUtils;
@@ -360,10 +361,16 @@
     */
    @Override
    public R listActivitySign(ActivitySignVO activitySignVO) {

        ComActActivityDO comActActivityDO=comActActivityDAO.selectById(activitySignVO.getActivityId());
        if(comActActivityDO!=null){
            if(comActActivityDO.getType()==3||comActActivityDO.getType()==5){
                IPage<ActivitySignVO> activitySignVOS = comActActSignDAO
                        .listActivitySignParty(new Page(activitySignVO.getPageNum(), activitySignVO.getPageSize()), activitySignVO);
                return R.ok(activitySignVOS);
            }
        }
        IPage<ActivitySignVO> activitySignVOS = comActActSignDAO
            .listActivitySign(new Page(activitySignVO.getPageNum(), activitySignVO.getPageSize()), activitySignVO);
        // List<ActivitySignVO> activitySignVOS = comActActSignDAO.listActivitySign(activitySignVO);
        return R.ok(activitySignVOS);
    }

@@ -1141,6 +1148,7 @@
    @Override
    public R addActivityType(ComActActivityTypeVO comActActivityTypeVO) {
        try {
            comActActivityTypeVO.setId(Snowflake.getId());
            this.baseMapper.addActivityType(comActActivityTypeVO);
        } catch (Exception e) {
            log.error("添加活动类型错误【{}】", e.getMessage());