springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
@@ -195,9 +195,9 @@ @ApiOperation(value = "家庭成员列表") @GetMapping("listfamily") public R listFamily() { public R listFamily(@RequestParam(value = "pageNum") Long pageNum, @RequestParam("pageNum") Long pageSize) { Long userId = this.getUserId(); return userService.listFamily(userId); return userService.listFamily(userId, pageNum, pageSize); } @ApiOperation(value = "新增家庭成员") springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAdminDTO.java
@@ -1,8 +1,11 @@ package com.panzhihua.common.model.dtos.neighbor; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; /** * @auther llming @@ -18,7 +21,16 @@ @ApiModelProperty(value = "分页-每页记录数",example = "10") private Long pageSize = 10L; @ApiModelProperty("邻里圈查询类型（1.热门 2.最新 3.精品）") private Integer type = 1; @ApiModelProperty("发布开始时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date startAt; @ApiModelProperty("发布结束时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date endAt; @ApiModelProperty("议事主题") private String releaseContent; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java
@@ -68,7 +68,7 @@ @ApiModelProperty("性别 1 男 2 女") private Integer sex; @ApiModelProperty("是否社区团队或者党委或系统管理人员 1 是 2 否") @ApiModelProperty("是否本社区的团队或者党委、或是系统管理人员 1 是 2 否") private Integer ismemberrole; @ApiModelProperty("生日") springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java
@@ -42,11 +42,11 @@ @ApiModelProperty("发布时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date publishAt; @ApiModelProperty("活动结束时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date endAt; @ApiModelProperty("活动开始时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date beginAt; springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideVO.java
@@ -7,6 +7,7 @@ import lombok.Data; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.util.List; @@ -21,7 +22,7 @@ private Long id; @ApiModelProperty("办事指南标题") @NotNull(groups = {AddGroup.class}, message = "标题不能为空") @NotBlank(groups = {AddGroup.class}, message = "标题不能为空") @Length(groups = {AddGroup.class}, max = 35) private String title; @@ -33,6 +34,9 @@ @ApiModelProperty("办理时间") private String timeAt; @ApiModelProperty("创建时间") private String createAt; @ApiModelProperty("办理地点") private String address;
New file @@ -0,0 +1,23 @@ 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 AddNeighborCircleAdminVO { @ApiModelProperty("发布内容") private String releaseContent; @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/ComActNeighborCircleAdminVO.java
New file @@ -0,0 +1,72 @@ package com.panzhihua.common.model.vos.neighbor; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; /** * @auther llming * @describe 邻里圈VO */ @Data @ApiModel("邻里圈") public class ComActNeighborCircleAdminVO { @ApiModelProperty("id") private Long id; @ApiModelProperty("发布人id") private Long releaseId; @ApiModelProperty("发布人") private Long releaseName; @ApiModelProperty("发布人电话") private String releasePhone; @ApiModelProperty("社区") private Long communityName; @ApiModelProperty("详情") private String releaseContent; @ApiModelProperty("发布图片") private String releaseImages; @ApiModelProperty("发布状态(1.待审核 2.显示 3.隐藏 4.驳回)") private Integer status; @ApiModelProperty("驳回原因") private String refuseReason; @ApiModelProperty("评论数") private Integer commentNum; @ApiModelProperty("点赞数") private Integer fabulousNum; @ApiModelProperty("转发数") private Integer forwardNum; @ApiModelProperty("浏览量") private Integer viewsNum; @ApiModelProperty("发布时间") private Date createAt; @ApiModelProperty("评论数") private Integer lastCommentNum; @ApiModelProperty("点赞数") private Integer lastFabulousNum; } 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/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyCommitteeVO.java
@@ -50,7 +50,7 @@ private String position; @ApiModelProperty("职位2") private String position_two; private String positionTwo; @ApiModelProperty("岗位职责") @NotBlank(groups = {AddGroup.class},message = "岗位职责不能为空") springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -214,7 +214,9 @@ * @return 成员集合 */ @PostMapping("listfamily") R listFamily(@RequestParam("userId")Long userId); R listFamily(@RequestParam("userId")Long userId, @RequestParam(value = "pageNum") Long pageNum, @RequestParam("pageNum") Long pageSize); /** * 新增家庭成员 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java
@@ -3,10 +3,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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.ComActNeighborCircleAdminVO; import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAppVO; import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleDetailAppVO; 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; @@ -60,4 +63,26 @@ " left join sys_user as su on su.user_id = canc.release_id where id = #{circleId}"+ " </script>") ComActNeighborCircleDetailAppVO neighborDetailByApp(@Param("circleId") Long circleId); @Select("<script> \n"+ "SELECT\n" + "nc.*,\n" + "u.`name` AS releaseName \n" + "FROM\n" + "com_act_neighbor_circle nc\n" + "LEFT JOIN sys_user u ON nc.release_id = u.user_id\n" + "<where>"+ "<if test='neighborCircleAdminDTO.releaseContent != null and neighborCircleAdminDTO.releaseContent.trim() != ""'>" + "and t.release_content LIKE concat('%',#{neighborCircleAdminDTO.releaseContent}, '%' ) " + " </if> " + "<if test='neighborCircleAdminDTO.startAt != null and neighborCircleAdminDTO.endAt !=null '>" + "and t.create_at between #{neighborCircleAdminDTO.startAt} and #{neighborCircleAdminDTO.endAt} " + " </if> " + "</where>"+ "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/dao/ComActWorkGuideDAO.java
@@ -17,7 +17,7 @@ @Mapper public interface ComActWorkGuideDAO extends BaseMapper<ComActWorkGuideDO> { @Select("<script> " + "select id ,title,content,time_at,address,phone from com_act_work_guide " + "select id ,title,content,time_at,address,phone,create_at from com_act_work_guide " + " <where>" + "<if test='pageActWorkGuideDTO.title != null and pageActWorkGuideDTO.title.trim() != ""'>" + "title like concat('%',#{pageActWorkGuideDTO.title},'%')"+ springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/BaseDO.java
@@ -14,9 +14,12 @@ @Data public class BaseDO { private Long createBy; @TableField(fill = FieldFill.INSERT) private Date createAt; private Long updateBy; @TableField(fill = FieldFill.INSERT) private Date updateAt; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleService.java
@@ -6,6 +6,8 @@ import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO; import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleDetailAppDTO; 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; /** @@ -37,6 +39,24 @@ */ R neighborDetailByApp(ComActNeighborCircleDetailAppDTO neighborCircleAppDTO); /** * 管理后台查询邻里圈列表 * @return */ R pageNeighborByAdmin(ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO); /** * 后台添加邻里圈 * @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,17 +1,23 @@ 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; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.panzhihua.common.model.dtos.neighbor.AddComActNeighborCircleAppDTO; import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO; import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO; import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleDetailAppDTO; 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.ComActNeighborCircleCommentAppVO; import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleDetailAppVO; import com.panzhihua.common.utlis.StringUtils; import com.panzhihua.service_community.dao.ComActNeighborCircleCommentDAO; 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.ComActNeighborCircleBrowseService; @@ -99,4 +105,48 @@ return R.ok(circleDetailAppVO); } @Override public R pageNeighborByAdmin(ComActNeighborCircleAdminDTO neighborCircleAdminDTO) { Page page = new Page(neighborCircleAdminDTO.getPageNum(), neighborCircleAdminDTO.getPageSize()); 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(); springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
@@ -35,6 +35,7 @@ /** * 新增微信用户 * * @param openid 微信小程序标志 * @param sessionKey 会话密钥 * @param unionid 微信平台唯一ID @@ -47,6 +48,7 @@ /** * 维护小程序用户基本信息 头像 昵称 性别 * * @param userId 数据库用户ID * @param nickName 昵称 * @param gender 性别 @@ -60,6 +62,7 @@ /** * 维护微信用户手机号 * * @param userId 数据库ID * @param purePhoneNumber 没有区号的手机号 * @return 维护结果 @@ -71,6 +74,7 @@ /** * 获取平台用户 * * @param userName 登录账户+_type * @return 平台用户信息 */ @@ -84,6 +88,7 @@ /** * 获取平台用户 * * @param userId 用户ID * @return 平台用户信息 */ @@ -94,6 +99,7 @@ /** * 修改用户登录密码 * * @param changePasswordVO 新密码 * @return 修改结果 */ @@ -104,6 +110,7 @@ /** * 某社区后台人员查询 * * @param param 名字 * @param communityId 社区id * @return 人员集合 @@ -115,6 +122,7 @@ /** *分页查询人脸识别 * * @param loginUserInfoVO 查询参数 * @return 分页集合 */ @@ -125,6 +133,7 @@ /** * 编辑人脸采集数据通过、驳回、删除 * * @param loginUserInfoVO 操作信息 * @return 操作结果 */ @@ -135,6 +144,7 @@ /** *分页查询人口管理 * * @param loginUserInfoVO 查询参数 * @return 分页数据 */ @@ -145,6 +155,7 @@ /** * 查询所有人员标签 * * @return 标签集合 */ @PostMapping("listtag") @@ -154,6 +165,7 @@ /** * 查询当前社区所有标签以及预设标签 * * @return 标签集合 */ @PostMapping("listtag/getTag") @@ -163,6 +175,7 @@ /** * 人员详情 * * @param userId 用户id * @return 人员详情 */ @@ -173,6 +186,7 @@ /** * 设置用户标签 * * @param loginUserInfoVO 标签信息 * @return 设置结果 */ @@ -183,6 +197,7 @@ /** * 修改用户志愿者状态 * * @param phone 志愿者手机号 * @param type 1是志愿者 0 不是 */ @@ -193,6 +208,7 @@ /** * 修改用户志愿者状态 * * @param userId 志愿者ID * @param type 1是志愿者 0 不是 */ @@ -203,6 +219,7 @@ /** * 用户绑定社区、小区 * * @param loginUserInfoVO 社区小区数据 * @return 绑定结果 */ @@ -213,6 +230,7 @@ /** * 用户实名认证 * * @param loginUserInfoVO 认证数据 * @return 认证结果 */ @@ -223,6 +241,7 @@ /** * 修改用户手机号 * * @param userPhoneVO 手机号信息 * @return 修改结果 */ @@ -233,6 +252,7 @@ /** * 修改用户信息 * * @param loginUserInfoVO 修改内容 * @return 修改结果 */ @@ -243,16 +263,20 @@ /** * 家庭成员列表 * * @param userId 登录用户 * @return 成员集合 */ @PostMapping("listfamily") public R listFamily(@RequestParam("userId")Long userId){ return userService.listFamily(userId); public R listFamily(@RequestParam("userId") Long userId, @RequestParam(value = "pageNum") Long pageNum, @RequestParam("pageNum") Long pageSize) { return userService.listFamily(userId, pageNum, pageSize); } /** * 新增家庭成员 * * @param comMngFamilyInfoVO 家庭成员基本信息 * @return 增加结果 */ @@ -263,6 +287,7 @@ /** * 编辑家庭成员 * * @param comMngFamilyInfoVO 家庭成员信息 * @return 编辑结果 */ @@ -273,6 +298,7 @@ /** * 新增运营、社区后台账户 * * @param administratorsUserVO 账户信息 * @return 新增结果 */ @@ -284,6 +310,7 @@ /** * 编辑运营、社区后台账户 * * @param administratorsUserVO 编辑账户内容 * @return 编辑结果 */ @@ -294,6 +321,7 @@ /** * 删除后台用户 * * @param administratorsUserVO 用户主键 * @return 删除结果 */ @@ -304,6 +332,7 @@ /** * 分页查询后台用户 * * @param administratorsUserVO 查询参数 * @return 后台用户 */ @@ -314,6 +343,7 @@ /** * 保存操作日志 * * @param operlog 日志内容 * @return 保存结果 */ @@ -324,6 +354,7 @@ /** * 分页展示操作日志 * * @param sysOperLogVO 分页参数 * @return 分页集合 */ @@ -334,6 +365,7 @@ /** * 用户协议 * * @return 协议集合 */ @PostMapping("listagreement") @@ -343,6 +375,7 @@ /** * 编辑用户协议 * * @param sysUserAgreementVO 编辑内容 * @return 编辑结果 */ @@ -353,6 +386,7 @@ /** * 用户标签 * * @param communityId 社区id * @return 标签集合 */ @@ -363,6 +397,7 @@ /** * 新增删除用户标签 * * @param systemmanagementConfigVO 操作内容 * @return 操作结果 */ @@ -373,6 +408,7 @@ /** * 分页查询小程序用户 * * @param pageUserAppletsBackstageDTO 查询参数 * @return 分页集合 */ @@ -383,6 +419,7 @@ /** * 编辑用户状态 * * @param pageUserAppletsBackstageDTO 启用或者禁用 1 启用 2 禁用 * @return 编辑结果 */ @@ -393,6 +430,7 @@ /** * 调试接口--清除昵称、社区、小区 * * @param userId 登录用户id * @return 清除结果 */ @@ -403,6 +441,7 @@ /** * 用户协议和隐私政策 * * @param type 所属app 1居民端app 2网格员端app 3商家端app * @return 协议内容 */ @@ -413,6 +452,7 @@ /** * 意见反馈 * * @param sysUserFeedbackDTO 反馈内容 * @return 反馈结果 */ @@ -423,6 +463,7 @@ /** * 分页通知列表 * * @param pageDTO 分页参数 * @return 分页结果 */ @@ -433,6 +474,7 @@ /** * 通知已读 * * @param noticeReadDTO 通知已读 * @return 修改状态 */ @@ -443,6 +485,7 @@ /** * 分页查询用户意见反馈 * * @param pageFeedBackDTO 分页查询参数 * @return 意见集合 */ @@ -453,6 +496,7 @@ /** * 未读消息汇总 * * @param userId 登录用户信息 * @return 未读汇总 */ @@ -463,9 +507,9 @@ /** * 反馈意见详情 * * @param id 反馈主键 * @return 反馈详情 * */ @PostMapping("detailfeedback") public R detailFeedback(@RequestParam("id")Long id){ @@ -474,6 +518,7 @@ /** * 数据看板 * * @return 运营后台数据看板 */ @PostMapping("datakanban") @@ -483,6 +528,7 @@ /** * 社区管理后台数据看板 * * @param communityId 社区id * @return 看板用户数据 */ @@ -493,6 +539,7 @@ /** * 定时任务维护用户持续登录时间 * * @return 维护结果 */ @PostMapping("timedtaskcontinuouslandingdays") @@ -502,6 +549,7 @@ /** * 新增用户通知 * * @param sysUserNoticeVO 通知内容 * @return 新增结果 */ @@ -512,6 +560,7 @@ /** * 修改用户的党员状态 * * @param idCard 身份证号 * @return 修改结果 */ @@ -522,6 +571,7 @@ /** * 获取各种协议 * * @param type 1居民端app协议 2网格员端app协议 3商家端app协议 4隐私政策 * @return 协议内容 */ @@ -532,6 +582,7 @@ /** * 维护用户最后登录时间 * * @param userId 用户主键 * @return 维护结果 */ @@ -542,6 +593,7 @@ /** * 删除意见反馈 * * @param id 主键 * @return 删除结果 */ @@ -552,6 +604,7 @@ /** * 校验小区是否存在 * * @param areaName 小区名字 * @return 校验结果 */ @@ -562,6 +615,7 @@ /** * 批量导入居民用户 * * @param list 居民用户集合 * @param areaName 小区名字 * @return 导入结果 @@ -588,6 +642,7 @@ /** * 社区人员详情包括导入人员 * * @param userId 人员id * @return CommunityUserInfoVO */ @@ -604,6 +659,7 @@ /** * 用户搜索了就下载搜索的用户否则下载所有用户 * * @param exportUserDTO 用户搜索内容 * @return List<EexcelUserDTO> excel内容 */ @@ -614,6 +670,7 @@ /** * 通过手机号码查询用户信息 * * @param phone * @return */ @@ -624,6 +681,7 @@ /** * 通过账号和渠道查询用户信息 * * @param account * @return */ @@ -634,6 +692,7 @@ /** *分页查询人口管理 * * @param pageInputUserDTO 查询参数 * @return 分页数据 */ @@ -644,6 +703,7 @@ /** * 设置用户标签 * * @param inputUserTagsDTO 标签信息 * @return 设置结果 */ @@ -654,6 +714,7 @@ /** * 批量导入居民用户 * * @param list 居民用户集合 * @param areaName 小区名字 * @return 导入结果 @@ -680,6 +741,7 @@ /** * 居民管理》居民详情 * * @param id 人员id * @return CommunityUserInfoVO */ @@ -690,6 +752,7 @@ /** * 用户搜索了就下载搜索的用户否则下载所有用户 * * @param exportUserDTO 用户搜索内容 * @return List<EexcelUserDTO> excel内容 */ @@ -700,6 +763,7 @@ /** * 特殊群体 * * @param pageInputUserDTO * @return */ @@ -710,6 +774,7 @@ /** * 特殊群体 * * @param id * @return */ @@ -717,8 +782,10 @@ R deleteSpecialInputUser(@RequestParam(value = "id") Long id) { return sysUserInputService.deleteSpecialInputUser(id); } /** * 特殊群体标签列表 * * @param comMngUserTagDTO * @return */ @@ -729,6 +796,7 @@ /** * 新增或修改特殊群体标签 * * @param comMngTagVO * @return */ @@ -739,6 +807,7 @@ /** * 删除特殊群体标签 * * @param id * @return */ @@ -749,6 +818,7 @@ /** * 特殊群体导出 * * @param exportSpecialUserDTO * @return */ @@ -759,6 +829,7 @@ /** * 创建SysUser用户信息以及权限 * * @param storeVO 请求参数 * @return 创建结果 */ @@ -769,6 +840,7 @@ /** * 修改SysUser用户信息 * * @param storeVO 请求参数 * @return 修改结果 */ @@ -779,6 +851,7 @@ /** * 修改用户小程序首页活动提示 * * @param userEditTipsDTO 请求参数 * @return 修改结果 */ @@ -789,6 +862,7 @@ /** * 获取用户电子档案 * * @param userId 家庭成员信息 * @return 结果 */ @@ -799,6 +873,7 @@ /** * 编辑用户电子档案 * * @param userArchivesVO 编辑的信息 * @return 编辑结果 */ springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserFeedbackDAO.java
@@ -40,7 +40,9 @@ "f.photo_path,\n" + "c.name communityName\n" + "from sys_user_feedback f\n" + "join sys_user u on f.user_id=u.user_id\n" + "left join sys_user u on f.user_id=u.user_id\n" + "left join com_act c on u.community_id=c.community_id\n" + "<where>" + "<if test='pageFeedBackDTO.phone != null and pageFeedBackDTO.phone.trim() != ""'>" + "and u.phone=#{pageFeedBackDTO.phone}\n" + " </if> " + @@ -48,9 +50,9 @@ "and u.name like concat('%',#{pageFeedBackDTO.name},'%') \n" + " </if> " + "<if test='pageFeedBackDTO.nickName != null and pageFeedBackDTO.nickName.trim() != ""'>" + "and u.nick_name=like concat('%',#{pageFeedBackDTO.nickName},'%') \n" + "and u.nick_name like concat('%',#{pageFeedBackDTO.nickName},'%') \n" + " </if> " + "join com_act c on u.community_id=c.community_id\n" + "</where> " + "order by f.create_at desc\n" + "</script>") IPage<SysUserFeedbackVO> pageFeedback(Page page, @Param("pageFeedBackDTO") PageFeedBackDTO pageFeedBackDTO); springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
@@ -317,16 +317,16 @@ "FROM\n" + "\t com_pb_member_role a \n" + "WHERE\n" + "\t a.phone = #{phone}") Integer selectCountMemberRole(@Param("phone")String phone); "\t a.phone = #{phone} and community_id=#{userCommunityId} ") Integer selectCountMemberRole(@Param("phone")String phone, @Param("userCommunityId")Long userCommunityId); @Select("SELECT\n" + "\t COUNT(a.id)\n" + "FROM\n" + "\t com_pb_service_team a \n" + "WHERE\n" + "\t a.phone = #{phone}") Integer selectCountTeam(@Param("phone")String phone); "\t a.phone = #{phone} and community_id=#{userCommunityId} ") Integer selectCountTeam(@Param("phone")String phone, @Param("userCommunityId")Long userCommunityId); @Update("update com_pb_member_role u set u.phone=#{newphone},is_reg=1 where u.phone=#{oldphone}") @@ -339,8 +339,8 @@ "FROM\n" + "\t sys_user u LEFT JOIN sys_user_role ur ON u.user_id = ur.user_id \n" + "\t LEFT JOIN sys_role r ON ur.role_id = r.role_id \n" + "WHERE ur.role_id IS NOT NULL AND u.phone = #{phone} ") Integer selectCountSysUser(@Param("phone")String phone); "WHERE ur.role_id IS NOT NULL AND u.phone = #{phone} and r.community_id=#{userCommunityId} ") Integer selectCountSysUser(@Param("phone")String phone, @Param("userCommunityId")Long userCommunityId); @Select("update com_shop_store set sys_user_id = #{sysUserId} where phone = #{phone}") void updateStoreByPhone(@Param("phone")String phone, @Param("sysUserId")Long sysUserId); springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
@@ -12,6 +12,7 @@ import com.panzhihua.common.model.vos.SystemmanagementConfigVO; import com.panzhihua.common.model.vos.shop.ShopStoreVO; import com.panzhihua.common.model.vos.user.*; import org.springframework.web.bind.annotation.RequestParam; /** * @program: springcloud_k8s_panzhihuazhihuishequ @@ -380,7 +381,7 @@ * @param userId 登录用户 * @return 成员集合 */ R listFamily(Long userId); R listFamily(Long userId,Long pageNum, Long pageSize); /** * 新增家庭成员 * @param comMngFamilyInfoVO 家庭成员基本信息 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -230,6 +230,7 @@ loginUserInfoVO.setIsmemberrole(2); // 志愿者状态 String phone = sysUserDO.getPhone(); Long userCommunityId = sysUserDO.getCommunityId(); if (!ObjectUtils.isEmpty(phone)) { ComMngVolunteerMngVO comMngVolunteerMngVO = userDao.selectVolunteerMngByPhone(phone); if (ObjectUtils.isEmpty(comMngVolunteerMngVO)) { @@ -238,9 +239,10 @@ int state = comMngVolunteerMngVO.getState().intValue(); loginUserInfoVO.setVolunteerStatus(state); } Integer countTeam = userDao.selectCountTeam(phone); Integer selectCountMemberRole = userDao.selectCountMemberRole(phone); Integer isSysUser = userDao.selectCountSysUser(phone); //是否是"管理员"或者 本社区 "社区团队"、"党委成员" Integer countTeam = userDao.selectCountTeam(phone, userCommunityId); Integer selectCountMemberRole = userDao.selectCountMemberRole(phone, userCommunityId); Integer isSysUser = userDao.selectCountSysUser(phone, userCommunityId); if (countTeam != null && countTeam > 0) { loginUserInfoVO.setIsmemberrole(1); } else if (selectCountMemberRole != null && selectCountMemberRole > 0) { @@ -710,11 +712,12 @@ * @return 成员集合 */ @Override public R listFamily(Long userId) { public R listFamily(Long userId,Long pageNum, Long pageSize) { List<ComMngFamilyInfoVO> comMngFamilyInfoVOS = new ArrayList<>(); List<ComMngFamilyInfoDO> comMngFamilyInfoDOS = comMngFamilyInfoDAO.selectList(new QueryWrapper<ComMngFamilyInfoDO>().lambda().eq(ComMngFamilyInfoDO::getUserId, userId)); if (!ObjectUtils.isEmpty(comMngFamilyInfoDOS)) { comMngFamilyInfoDOS.forEach(comMngFamilyInfoDO -> { LambdaQueryWrapper<ComMngFamilyInfoDO> query = new QueryWrapper<ComMngFamilyInfoDO>().lambda().eq(ComMngFamilyInfoDO::getUserId, userId); IPage<ComMngFamilyInfoDO> pageData = comMngFamilyInfoDAO.selectPage(new Page<>(pageNum,pageSize), query); if (!ObjectUtils.isEmpty(pageData.getRecords())) { pageData.getRecords().forEach(comMngFamilyInfoDO -> { ComMngFamilyInfoVO comMngFamilyInfoVO = new ComMngFamilyInfoVO(); BeanUtils.copyProperties(comMngFamilyInfoDO, comMngFamilyInfoVO); comMngFamilyInfoVOS.add(comMngFamilyInfoVO);
