springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java
@@ -74,15 +74,6 @@ @Select("select m.* from sys_user u join com_pb_member m on u.id_card=m.id_card where u.user_id=#{userId}") ComPbMemberDO selectByUserId(Long userId); @Select("SELECT\n" + "m.* \n" + "FROM\n" + "com_pb_member m\n" + "JOIN sys_user u ON m.id_card = u.id_card \n" + "LEFT JOIN com_pb_member_role r on m.id=r.member_id \n" + "WHERE\n" + "m.community_id =#{communityId} and r.id is null ") List<ComPbMemberDO> selectListRegister(Long communityId); @Select("select name from sys_user where user_id=#{createBy}") String selectNameByUserId(Long createBy); @Update("update sys_user u set u.is_partymember=0 where u.id_card=#{idCard}") springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberRoleDAO.java
@@ -5,10 +5,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.model.vos.partybuilding.PartyBuildingMemberVO; import com.panzhihua.common.model.vos.partybuilding.PartyCommitteeVO; import com.panzhihua.common.model.vos.user.SysUserVO; import com.panzhihua.service_dangjian.model.dos.ComPbMemberDO; import com.panzhihua.service_dangjian.model.dos.ComPbMemberRoleDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; /** * @program: springcloud_k8s_panzhihuazhihuishequ @@ -41,4 +44,13 @@ "t.community_id = #{partyCommitteeVO.communityId} \n" + "</script>") IPage<PartyCommitteeVO> pagePartyOrganization(Page page, @Param("partyCommitteeVO") PartyCommitteeVO partyCommitteeVO); @Select("select * from sys_user where phone=#{phone} and type=1") SysUserVO getSysUserByPhone(@Param("phone")String phone); @Update("update sys_user u set u.phone=#{newphone} where u.phone=#{oldphone}") void updateUserPhone(@Param("newphone")String newphone,@Param("oldphone")String oldphone); @Select("select * from com_pb_member_role where id=#{id}") PartyCommitteeVO selectPartyCommitteeById(@Param("id")Long id); } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbServiceTeamDAO.java
@@ -6,6 +6,7 @@ import com.panzhihua.common.model.dtos.partybuilding.PageComPbServiceTeamDTO; import com.panzhihua.common.model.vos.community.ComActEasyPhotoCommentVO; import com.panzhihua.common.model.vos.partybuilding.ComPbServiceTeamVO; import com.panzhihua.common.model.vos.partybuilding.PartyCommitteeVO; import com.panzhihua.service_dangjian.model.dos.ComPbServiceTeamDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -36,4 +37,6 @@ " </if> " + "</script>") IPage<ComPbServiceTeamVO> PageComPbServiceTeamDTO(Page page, @Param("pageComPbServiceTeamDTO") PageComPbServiceTeamDTO pageComPbServiceTeamDTO); @Select("select * from com_pb_service_team where id=#{id}") ComPbServiceTeamDO selectComPbServiceTeamById(@Param("id")Long id); } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbServiceTeamDO.java
@@ -52,4 +52,13 @@ * 社区id */ private Long communityId; /** * 电话 */ private String phone; /** * 是否注册 */ private Integer isReg; } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
@@ -8,10 +8,12 @@ import com.panzhihua.common.exceptions.PartyBuildingMemberException; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.partybuilding.*; import com.panzhihua.common.model.vos.user.SysUserVO; import com.panzhihua.common.utlis.RichTextUtil; import com.panzhihua.service_dangjian.dao.*; import com.panzhihua.service_dangjian.model.dos.*; import com.panzhihua.service_dangjian.service.ComPbMemberService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.data.redis.core.StringRedisTemplate; @@ -189,13 +191,13 @@ */ @Override public R listPartyMember(Long communityId) { // List<ComPbMemberDO> comPbMemberDOS = comPbMemberDAO.selectList(new QueryWrapper<ComPbMemberDO>().lambda().eq(ComPbMemberDO::getCommunityId,communityId)); List<ComPbMemberDO> comPbMemberDOS = comPbMemberDAO.selectList(new QueryWrapper<ComPbMemberDO>().lambda().eq(ComPbMemberDO::getCommunityId,communityId)); // 查询社区所有已经注册的党员 // 排除掉已经成为党委的党员 List<ComPbMemberDO> comPbMemberDOS = comPbMemberDAO.selectListRegister(communityId); if (ObjectUtils.isEmpty(comPbMemberDOS)) { return R.ok(new ArrayList<>()); } // List<ComPbMemberDO> comPbMemberDOS = comPbMemberDAO.selectListRegister(communityId); // if (ObjectUtils.isEmpty(comPbMemberDOS)) { // return R.ok(new ArrayList<>()); // } List<PartyBuildingMemberVO> partyBuildingMemberVOS=new ArrayList<>(); comPbMemberDOS.forEach(comPbMemberDO -> { PartyBuildingMemberVO partyBuildingMemberVO=new PartyBuildingMemberVO(); @@ -217,6 +219,11 @@ BeanUtils.copyProperties(partyCommitteeVO,comPbMemberRoleDO); comPbMemberRoleDO.setCreateAt(new Date()); comPbMemberRoleDO.setUpdateAt(new Date()); comPbMemberRoleDO.setIsReg(2); SysUserVO sysUser = comPbMemberRoleDAO.getSysUserByPhone(partyCommitteeVO.getPhone()); if(!ObjectUtils.isEmpty(sysUser)) { comPbMemberRoleDO.setIsReg(1); } int insert = comPbMemberRoleDAO.insert(comPbMemberRoleDO); if (insert>0) { return R.ok(); @@ -237,6 +244,18 @@ ComPbMemberRoleDO comPbMemberRoleDOOld = comPbMemberRoleDAO.selectById(partyCommitteeVO.getId()); comPbMemberRoleDO.setCreateAt(comPbMemberRoleDOOld.getCreateAt()); comPbMemberRoleDO.setUpdateAt(new Date()); comPbMemberRoleDO.setIsReg(2); PartyCommitteeVO oldPartyCommitteeVO = comPbMemberRoleDAO.selectPartyCommitteeById(partyCommitteeVO.getId()); String oldphone = oldPartyCommitteeVO.getPhone(); SysUserVO sysUserOld = comPbMemberRoleDAO.getSysUserByPhone(oldphone); String newphone=partyCommitteeVO.getPhone(); SysUserVO sysUserNew = comPbMemberRoleDAO.getSysUserByPhone(newphone); if(!ObjectUtils.isEmpty(sysUserOld)||!ObjectUtils.isEmpty(sysUserNew)) { comPbMemberRoleDO.setIsReg(1); } if(!newphone.equals(oldphone)) { comPbMemberRoleDAO.updateUserPhone(newphone, oldphone); } int update = comPbMemberRoleDAO.updateById(comPbMemberRoleDO); if (update>0) { return R.ok(); @@ -446,8 +465,5 @@ log.info("定时任务更新党建动态发布状态数量【{}】",num); return R.ok(num); } } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbServiceTeamServiceImpl.java
@@ -7,12 +7,15 @@ import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActEasyPhotoCommentVO; import com.panzhihua.common.model.vos.partybuilding.ComPbServiceTeamVO; import com.panzhihua.common.model.vos.user.SysUserVO; import com.panzhihua.service_dangjian.dao.ComPbMemberRoleDAO; import com.panzhihua.service_dangjian.dao.ComPbServiceTeamDAO; import com.panzhihua.service_dangjian.model.dos.ComPbServiceTeamDO; import com.panzhihua.service_dangjian.service.ComPbServiceTeamService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; import javax.annotation.Resource; @@ -27,6 +30,8 @@ public class ComPbServiceTeamServiceImpl implements ComPbServiceTeamService { @Resource private ComPbServiceTeamDAO comPbServiceTeamDAO; @Resource private ComPbMemberRoleDAO comPbMemberRoleDAO; /** * 新增服务团队人员 * @@ -37,6 +42,11 @@ public R addServiceTeam(ComPbServiceTeamDTO comPbServiceTeamDTO) { ComPbServiceTeamDO comPbServiceTeamDO=new ComPbServiceTeamDO(); BeanUtils.copyProperties(comPbServiceTeamDTO,comPbServiceTeamDO); comPbServiceTeamDO.setIsReg(2); SysUserVO sysUser = comPbMemberRoleDAO.getSysUserByPhone(comPbServiceTeamDTO.getPhone()); if(!ObjectUtils.isEmpty(sysUser)) { comPbServiceTeamDO.setIsReg(1); } int insert = comPbServiceTeamDAO.insert(comPbServiceTeamDO); if (insert>0) { return R.ok(); @@ -54,6 +64,18 @@ public R putServiceTeam(ComPbServiceTeamDTO comPbServiceTeamDTO) { ComPbServiceTeamDO comPbServiceTeamDO=new ComPbServiceTeamDO(); BeanUtils.copyProperties(comPbServiceTeamDTO,comPbServiceTeamDO); comPbServiceTeamDO.setIsReg(2); ComPbServiceTeamDO oldComPbServiceTeam = comPbServiceTeamDAO.selectComPbServiceTeamById(comPbServiceTeamDTO.getId()); String oldphone = oldComPbServiceTeam.getPhone(); SysUserVO sysUserOld = comPbMemberRoleDAO.getSysUserByPhone(oldphone); String newphone=comPbServiceTeamDTO.getPhone(); SysUserVO sysUserNew = comPbMemberRoleDAO.getSysUserByPhone(newphone); if(!ObjectUtils.isEmpty(sysUserOld)||!ObjectUtils.isEmpty(sysUserNew)) { comPbServiceTeamDO.setIsReg(1); } if(!newphone.equals(oldphone)) { comPbMemberRoleDAO.updateUserPhone(newphone, oldphone); } comPbServiceTeamDAO.updateById(comPbServiceTeamDO); return R.ok(); }
