Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-05-12 b9ee8fe325fa9746b284d3487df96d93d84d6473

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

@@ -59,10 +59,12 @@
        /*if(now.getTime()<comActActivityVO.getBeginAt().getTime()){
            comActActivityDO.setStatus(3);
        }*/
        if(status.intValue()==2) {//点击‘保存并发布’ 按钮
        //报名结束时间大于当前时间则设置为“进行中”
        if(comActActivityVO.getSignUpEnd()!=null && now.getTime()<comActActivityVO.getSignUpEnd().getTime()){
            comActActivityDO.setStatus(4);
        }
        }

        boolean save = this.save(comActActivityDO);
        if(!save){