springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/AddNeighborCircleAdminVO.java
@@ -17,4 +17,7 @@ @ApiModelProperty("发布图片") private String releaseImages; @ApiModelProperty(value = "当前登陆人id",hidden = true) private Long userId; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/EditNeighborCircleAdminVO.java
New file @@ -0,0 +1,26 @@ package com.panzhihua.common.model.vos.neighbor; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** * @auther llming * @describe */ @Data @ApiModel("修改邻里圈状态") public class EditNeighborCircleAdminVO { @ApiModelProperty("邻里圈Id") private Long id; @ApiModelProperty("发布状态(1.待审核 2.显示 3.隐藏 4.驳回)") private Integer status; @ApiModelProperty(value = "当前用户Id",hidden = true) private Long userId; @ApiModelProperty("驳回原因") private String refuseReason; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java
@@ -8,6 +8,7 @@ import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAdminVO; import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAppVO; import com.panzhihua.common.model.vos.user.AdministratorsUserVO; import com.panzhihua.service_community.model.dos.ComActNeighborCircleDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -42,4 +43,8 @@ "order by nc.`status` asc,nc.create_at desc " + "</script>") IPage<ComActNeighborCircleAdminVO> pageNeighborByAdmin(Page page,@Param("neighborCircleAdminDTO") ComActNeighborCircleAdminDTO neighborCircleAdminDTO); @Select("select * from sys_user where user_id=#{userId}") AdministratorsUserVO selectUserByUserId(@Param("userId") Long userId); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleService.java
@@ -4,6 +4,8 @@ import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO; import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.neighbor.AddNeighborCircleAdminVO; import com.panzhihua.common.model.vos.neighbor.EditNeighborCircleAdminVO; import com.panzhihua.service_community.model.dos.ComActNeighborCircleDO; /** @@ -27,6 +29,18 @@ */ R pageNeighborByAdmin(ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO); R addNeighborByAdmin(); /** * 后台添加邻里圈 * @param addNeighborCircleAdminVO * @return */ R addNeighborByAdmin(AddNeighborCircleAdminVO addNeighborCircleAdminVO); /** * 修改 * @param editNeighborCircleAdminVO * @return */ R changeStatusByAdmin(EditNeighborCircleAdminVO editNeighborCircleAdminVO); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
@@ -1,4 +1,5 @@ package com.panzhihua.service_community.service.impl; import java.util.Date; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -6,8 +7,11 @@ import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO; import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.neighbor.AddNeighborCircleAdminVO; import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAdminVO; import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAppVO; import com.panzhihua.common.model.vos.neighbor.EditNeighborCircleAdminVO; import com.panzhihua.common.model.vos.user.AdministratorsUserVO; import com.panzhihua.service_community.dao.ComActNeighborCircleDAO; import com.panzhihua.service_community.model.dos.ComActNeighborCircleDO; import com.panzhihua.service_community.service.ComActNeighborCircleService; @@ -40,4 +44,42 @@ IPage<ComActNeighborCircleAdminVO> doPager = this.baseMapper.pageNeighborByAdmin(page, neighborCircleAdminDTO); return R.ok(doPager); } @Override public R addNeighborByAdmin(AddNeighborCircleAdminVO addVO) { ComActNeighborCircleDO comActNeighborCircleDO = new ComActNeighborCircleDO(); AdministratorsUserVO adminUser = this.baseMapper.selectUserByUserId(addVO.getUserId()); if(adminUser==null){ return R.fail("请登录重试"); } comActNeighborCircleDO.setReleaseId(addVO.getUserId()); comActNeighborCircleDO.setReleasePhone(adminUser.getPhone()); comActNeighborCircleDO.setCommunityId(adminUser.getCommunityId()); comActNeighborCircleDO.setReleaseContent(addVO.getReleaseContent()); comActNeighborCircleDO.setReleaseImages(addVO.getReleaseImages()); comActNeighborCircleDO.setStatus(1); comActNeighborCircleDO.setCommentNum(0); comActNeighborCircleDO.setFabulousNum(0); comActNeighborCircleDO.setForwardNum(0); comActNeighborCircleDO.setViewsNum(0); comActNeighborCircleDO.setIsBoutique(2); comActNeighborCircleDO.setCreateAt(new Date()); comActNeighborCircleDO.setLastCommentNum(0); comActNeighborCircleDO.setLastFabulousNum(0); comActNeighborCircleDO.setLastViewsNum(0); this.baseMapper.insert(comActNeighborCircleDO); return R.ok(); } @Override public R changeStatusByAdmin(EditNeighborCircleAdminVO editVO) { ComActNeighborCircleDO neighborCircleDO = this.baseMapper.selectById(editVO.getId()); if(neighborCircleDO==null){ return R.fail("id有误！"); } neighborCircleDO.setStatus(editVO.getStatus()); neighborCircleDO.setRefuseReason(editVO.getRefuseReason()); this.baseMapper.updateById(neighborCircleDO); return R.ok(); } } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbMemberRoleDO.java
@@ -59,7 +59,7 @@ /** * 职位2 */ private String position_two; private String positionTwo; /** * 岗位职责 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
@@ -249,6 +249,7 @@ ComPbMemberRoleDO comPbMemberRoleDOOld = comPbMemberRoleDAO.selectById(partyCommitteeVO.getId()); comPbMemberRoleDO.setCreateAt(comPbMemberRoleDOOld.getCreateAt()); comPbMemberRoleDO.setUpdateAt(new Date()); comPbMemberRoleDO.setPositionTwo(partyCommitteeVO.getPositionTwo()); comPbMemberRoleDO.setIsReg(2); PartyCommitteeVO oldPartyCommitteeVO = comPbMemberRoleDAO.selectPartyCommitteeById(partyCommitteeVO.getId()); String oldphone = oldPartyCommitteeVO.getPhone();
