防疫报备更新

101captain

2022-06-30 353af3243fc246c47d4ad8e076bfca1e99d2e89d

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

@@ -143,11 +143,15 @@
                        circleAppVO.setHaveSign(2);
                    }
                }

                ComActDO actDO = comActDAO.selectById(circleAppVO.getCommunityId());
                if (circleAppVO.getType() != null && circleAppVO.getType().equals(ComActNeighborCircleDO.type.admin)) {
                    ComActDO actDO = comActDAO.selectById(circleAppVO.getCommunityId());
                    if (actDO != null) {
                        circleAppVO.setName(actDO.getName());
                    }
                }
                else {
                    if (actDO != null) {
                        circleAppVO.setCommunityName(actDO.getName());
                    }
                }

@@ -970,6 +974,9 @@
        if(comActNeighborCircleDO.getOrderStatus()!=null){
            comActNeighborCircleDO.setOrderTime(new Date());
        }
        if(StringUtils.isNotEmpty(comActNeighborCircleDO.getComment())){
            comActNeighborCircleDO.setCommentTime(new Date());
        }
        return R.ok(this.baseMapper.updateById(comActNeighborCircleDO));
    }
}