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

CeDo

2021-05-08 9cc2be00cf833beddfc4fca148b96f0a1f75bb8c

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

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java

@@ -196,6 +196,8 @@
            long l = System.currentTimeMillis();
            if (l >= time) {
                comActDynVO.setStatus(1);
            }else{
                comActDynVO.setStatus(0);
            }
        }
        comActDynVO.setCommunityId(communityId);

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java

@@ -423,8 +423,10 @@
        if (!ObjectUtils.isEmpty(publishAt)) {
            long time = publishAt.getTime();
            long l = System.currentTimeMillis();
            if (l >= time) {
            if (l > time) {
                partyCommitteeVO.setStatus(1);
            }else{
                partyCommitteeVO.setStatus(2);
            }
        }
        return partyBuildingService.updateYnamic(partyCommitteeVO);

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java

@@ -51,7 +51,7 @@
            " order by (canc.last_views_num + canc.last_comment_num + canc.last_fabulous_num) desc " +
            " </if> " +
            "<if test='neighborCircleAppDTO.type != null and neighborCircleAppDTO.type == 2'>" +
            " order by canc.reply_at desc,canc.create_at desc " +
            " order by canc.create_at desc " +
            " </if> " +
            "<if test='neighborCircleAppDTO.type != null and neighborCircleAppDTO.type == 3'>" +
            " order by (canc.views_num + canc.comment_num + canc.fabulous_num) desc " +