springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
@@ -10,6 +10,7 @@ import com.panzhihua.common.model.vos.partybuilding.PartyBuildingMemberVO; import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO; import com.panzhihua.common.model.vos.user.SysUserNoticeVO; import com.panzhihua.common.model.vos.user.UpdateUserArchivesVO; import com.panzhihua.common.model.vos.user.UserPhoneVO; import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.service.partybuilding.PartyBuildingService; @@ -379,4 +380,25 @@ return partyBuildingService.userCertification(userId); } @ApiOperation(value = "获取用户电子档案") @PostMapping("getUserArchives") public R getUserArchives() { Long userId = this.getUserId(); if(userId == null){ return R.fail("请重新登录"); } return userService.getUserArchives(userId); } @ApiOperation(value = "编辑用户电子档案") @PostMapping("updateUserArchives") public R updateUserArchives(@RequestBody UpdateUserArchivesVO userArchivesVO) { Long userId = this.getUserId(); if(userId == null){ return R.fail("请重新登录"); } userArchivesVO.setUserId(userId); return userService.updateUserArchives(userArchivesVO); } } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngFamilyInfoVO.java
@@ -42,8 +42,7 @@ @NotBlank(groups = {AddGroup.class},message ="手机号不能为空" ) private String phone; @ApiModelProperty("年龄") @Min(value = 1,groups = {AddGroup.class},message ="年龄不能为空" ) @ApiModelProperty(value = "年龄",hidden = true) private Integer age; @ApiModelProperty("健康状况") @@ -52,6 +51,15 @@ @ApiModelProperty("工作") private String job; @ApiModelProperty("证件照（人像面）照片") private String cardPhotoFront; @ApiModelProperty("证件照（国徽面）照片") private String cardPhotoBack; @ApiModelProperty("户口本照片 逗号隔开") private String familyBook; @ApiModelProperty(value = "create_at",hidden = true) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createAt; springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UpdateUserArchivesVO.java
New file @@ -0,0 +1,25 @@ package com.panzhihua.common.model.vos.user; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** * @auther llming * @describe */ @ApiModel("修改用户电子档案") @Data public class UpdateUserArchivesVO { @ApiModelProperty(value = "用户id",hidden = false) private Long userId; @ApiModelProperty("证件照（人像面）照片") private String cardPhotoFront; @ApiModelProperty("证件照（国徽面）照片") private String cardPhotoBack; @ApiModelProperty("户口本照片 逗号隔开") private String familyBook; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UserArchivesVO.java
New file @@ -0,0 +1,42 @@ package com.panzhihua.common.model.vos.user; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; /** * @auther llming * @describe 用户电子档案 */ @ApiModel("用户电子档案") @Data public class UserArchivesVO { @ApiModelProperty("用户id") private Long userId; @ApiModelProperty("身份证号") private String idCard; @ApiModelProperty("性别 1 男 2 女") private Integer sex; @ApiModelProperty("生日") private Date birthday; @ApiModelProperty("职业") private String job; @ApiModelProperty("证件照（人像面）照片") private String cardPhotoFront; @ApiModelProperty("证件照（国徽面）照片") private String cardPhotoBack; @ApiModelProperty("户口本照片 逗号隔开") private String familyBook; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -678,4 +678,20 @@ */ @PostMapping("editUserTips") R editUserTips(@RequestBody SysUserEditTipsDTO userEditTipsDTO); /** * 获取用户电子档案 * @param userId 家庭成员信息 * @return 结果 */ @GetMapping("getUserArchives") R getUserArchives(@RequestParam("userId") Long userId); /** * 编辑用户电子档案 * @param userArchivesVO 编辑的信息 * @return 编辑结果 */ @PostMapping("updateUserArchives") R updateUserArchives(@RequestBody UpdateUserArchivesVO userArchivesVO); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActWorkGuideDAO.java
@@ -5,13 +5,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.model.dtos.community.PageActWorkGuideDTO; import com.panzhihua.common.model.vos.community.ComActWorkGuideVO; import com.panzhihua.common.model.vos.community.ComCvtServeVO; import com.panzhihua.service_community.model.dos.ComActWorkGuideDO; import com.panzhihua.service_community.model.dos.ComMngFamilyDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.springframework.web.bind.annotation.RequestParam; /** springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActWorkGuideMaterialDAO.java
@@ -2,7 +2,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.panzhihua.service_community.model.dos.ComActWorkGuideMaterialDO; import com.panzhihua.service_community.model.dos.ComMngFamilyDO; import org.apache.ibatis.annotations.Mapper;
File was deleted springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngFamilyDO.java
File was deleted springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
@@ -786,4 +786,24 @@ public R editUserTips(@RequestBody SysUserEditTipsDTO userEditTipsDTO) { return userService.editUserTips(userEditTipsDTO); } /** * 获取用户电子档案 * @param userId 家庭成员信息 * @return 结果 */ @GetMapping("getUserArchives") public R getUserArchives(@RequestParam("userId") Long userId){ return userService.getUserArchives(userId); } /** * 编辑用户电子档案 * @param userArchivesVO 编辑的信息 * @return 编辑结果 */ @PostMapping("updateUserArchives") public R updateUserArchives(@RequestBody UpdateUserArchivesVO userArchivesVO){ return userService.updateUserArchives(userArchivesVO); } } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
@@ -16,6 +16,7 @@ import com.panzhihua.common.model.vos.user.AdministratorsUserVO; import com.panzhihua.common.model.vos.user.SysUserNoticeVO; import com.panzhihua.common.model.vos.user.SysUserVO; import com.panzhihua.common.model.vos.user.UpdateUserArchivesVO; import com.panzhihua.service_user.model.dos.SysUserDO; import com.panzhihua.service_user.model.dtos.DataKanbanDTO; import org.apache.ibatis.annotations.Mapper; @@ -346,4 +347,12 @@ @Select("delete from com_shop_store where delete_status = 1 and phone = #{phone}") void deleteStoreByPhoneAndStatus(@RequestParam("phone") String phone); @Select("update sys_user set" + " card_photo_front = #{userArchivesVO.cardPhotoFront}" + "and card_photo_back = #{userArchivesVO.cardPhotoBack}" + "and family_book = #{userArchivesVO.familyBook}" + " where user_id = #{userArchivesVO.userId}") void updateUserArchives(@Param("userArchivesVO") UpdateUserArchivesVO userArchivesVO); } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/ComMngFamilyInfoDO.java
@@ -64,6 +64,19 @@ private String job; /** * 证件照（人像面）照片 */ private String cardPhotoFront; /** * 证件照（国徽面）照片 */ private String cardPhotoBack; /** * 户口本照片 逗号隔开 */ private String familyBook; /** * create_at */ @TableField(fill = FieldFill.INSERT) springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserDO.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -10,20 +11,19 @@ /** * 用户对象 sys_user * * * @author HAUGNHONGFA */ @Data @TableName("sys_user") public class SysUserDO implements Serializable { public class SysUserDO implements Serializable { private static final long serialVersionUID = 1L; /** * user_id */ @TableId(type=IdType.AUTO) @TableId(type = IdType.AUTO) private Long userId; /** @@ -165,4 +165,19 @@ */ private Integer isTips; /** * 证件照（人像面）照片 */ private String cardPhotoFront; /** * 证件照（国徽面）照片 */ private String cardPhotoBack; /** * 户口本照片 逗号隔开 */ private String familyBook; } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
@@ -146,24 +146,6 @@ R putUser(LoginUserInfoVO loginUserInfoVO); /** * 家庭成员列表 * @param userId 登录用户 * @return 成员集合 */ R listFamily(Long userId); /** * 新增家庭成员 * @param comMngFamilyInfoVO 家庭成员基本信息 * @return 增加结果 */ R addFamily(ComMngFamilyInfoVO comMngFamilyInfoVO); /** * 编辑家庭成员 * @param comMngFamilyInfoVO 家庭成员信息 * @return 编辑结果 */ R putFamily(ComMngFamilyInfoVO comMngFamilyInfoVO); /** * 新增运营、社区后台账户 * @param administratorsUserVO 账户信息 * @return 新增结果 @@ -392,4 +374,37 @@ * @return 修改结果 */ R editUserTips(SysUserEditTipsDTO userEditTipsDTO); /** * 家庭成员列表 * @param userId 登录用户 * @return 成员集合 */ R listFamily(Long userId); /** * 新增家庭成员 * @param comMngFamilyInfoVO 家庭成员基本信息 * @return 增加结果 */ R addFamily(ComMngFamilyInfoVO comMngFamilyInfoVO); /** * 编辑家庭成员 * @param comMngFamilyInfoVO 家庭成员信息 * @return 编辑结果 */ R putFamily(ComMngFamilyInfoVO comMngFamilyInfoVO); /** * 当前登陆用户的电子档案 * @param userId * @return */ R getUserArchives(Long userId); /** * 编辑电子档案 * @param userArchivesVO * @return */ R updateUserArchives(UpdateUserArchivesVO userArchivesVO); } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -532,12 +532,12 @@ sysUserDO.setUserId(userId); SysUserDO userInDB = userDao.selectById(userId); if(userInDB!=null) { boolean isVol = userInDB.getIsVolunteer()==1; if(isVol){ if (userInDB != null) { boolean isVol = userInDB.getIsVolunteer() == 1; if (isVol) { return R.fail("用户已是志愿者"); } if(userInDB.getType()!=1){ if (userInDB.getType() != 1) { return R.fail("用户不是小程序用户"); } int update = userDao.updateById(sysUserDO); @@ -547,6 +547,7 @@ } return R.fail(); } /** * 用户绑定社区、小区 * @@ -736,6 +737,7 @@ if (!ObjectUtils.isEmpty(comMngFamilyInfoDO1)) { return R.fail("家庭成员已经存在"); } comMngFamilyInfoDO.setAge(IdCard.IdNOToAge(comMngFamilyInfoVO.getIdCard())); int insert = comMngFamilyInfoDAO.insert(comMngFamilyInfoDO); if (insert > 0) { return R.ok(); @@ -753,6 +755,7 @@ public R putFamily(ComMngFamilyInfoVO comMngFamilyInfoVO) { ComMngFamilyInfoDO comMngFamilyInfoDO = new ComMngFamilyInfoDO(); BeanUtils.copyProperties(comMngFamilyInfoVO, comMngFamilyInfoDO); comMngFamilyInfoDO.setAge(IdCard.IdNOToAge(comMngFamilyInfoVO.getIdCard())); int update = comMngFamilyInfoDAO.updateById(comMngFamilyInfoDO); if (update > 0) { return R.ok(); @@ -1702,4 +1705,26 @@ return R.fail(); } } @Override public R getUserArchives(Long userId) { //查询用户信息 SysUserDO userDO = userDao.selectById(userId); if (userDO == null) { return R.fail("未查询到用户信息"); } UserArchivesVO userArchivesVO = new UserArchivesVO(); BeanUtils.copyProperties(userDO, userArchivesVO); userArchivesVO.setUserId(userDO.getUserId()); return R.ok(userArchivesVO); } @Override public R updateUserArchives(UpdateUserArchivesVO userArchivesVO) { if(userArchivesVO.getUserId()==null){ return R.fail("未查询到用户信息"); } userDao.updateUserArchives(userArchivesVO); return R.ok(); } }
