1、修改人员详情功能1

src/main/java/com/ydtech/modules/admin/controller/AppLoginController.java

@@ -69,7 +69,7 @@ public class AppLoginController{
             return HttpResult.ok("修改失败");
         }
 
-        sysUser.setSex(record.getSex());
+//        sysUser.setSex(record.getSex());
         sysUser.setId(record.getId());
         sysUser.setName(record.getName());
         // 新注册的信息提交
@@ -101,7 +101,7 @@ public class AppLoginController{
         if (esmUserInternal != null) {
             EsmUserInternalVo esmUserInternalVo = EsmUserInternalConvert.INSTANCE.dto2Vo(esmUserInternal);
             SysUser sysUser = sysUserService.getById(jobNumber);
-            esmUserInternalVo.setSex(sysUser.getSex());
+//            esmUserInternalVo.setSex(sysUser.getSex());
             esmUserInternalVo.setName(sysUser.getName());
             return HttpResult.ok("成功", esmUserInternalVo);
         }

src/main/java/com/ydtech/modules/admin/controller/SysUserController.java

@@ -21,7 +21,6 @@ import com.ydtech.modules.admin.vo.SysUserVo;
 import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.base.model.dto.PageDto;
 import com.ydtech.modules.base.model.vo.PageVo;
-import com.ydtech.modules.esm.model.EsmUserInternal;
 import com.ydtech.modules.esm.model.EsmUserReferrer;
 import com.ydtech.modules.esm.service.EsmUserInternalService;
 import com.ydtech.modules.esm.service.EsmUserReferrerService;
@@ -180,76 +179,6 @@ public class SysUserController extends BaseController {
         return HttpResult.ok();
     }
 
-//    //    @PreAuthorize("hasAuthority('sys:user:view')")
-//    @ApiOperation(value = "用户查询分页", notes = "查询参数：\n" +
-//            "userId 工号 字符串 |" +
-//            "realName 姓名 字符串 |" +
-//            "mobile 手机号 字符串 |" +
-//            "approvalStatus 审核状态 字符串 |" +
-//            "usertype 用户类型 字符串 |" +
-//            "delFlag 是否删除  -1：已删除  0：正常 |" +
-//            "")
-//    @PostMapping(value = "/findPage")
-//    public HttpResult<PageResult<SysUserBaseVO>> findPage(@RequestBody PageRequest pageRequest) {
-//
-//
-//        return HttpResult.ok(sysUserService.gainUserPage(pageRequest));
-//
-//    }
-
-
-//    @ApiOperation(value = "保存更新用户Internal")
-//    @PostMapping(value = "/saveEditUserInternal")
-//    public HttpResult saveEditUserInternal(@RequestBody SysUserInternalVO vo) {
-//
-//
-//        SysUser sysUser = vo.getSysUser();
-//
-//        if (StringUtils.isNullOrEmpty(sysUser.getMobile())) return HttpResult.error("手机不能为空");
-//        if (StringUtils.isNullOrEmpty(sysUser.getDeptId())) return HttpResult.error("机构ID不能为空");
-//
-////        LambdaQueryWrapper<SysUser> lqw = new LambdaQueryWrapper<>();
-////        lqw.or().eq(StringUtils.isNotEmpty(sysUser.getDeptId()), SysUser::getDeptId, sysUser.getDeptId());
-////        ;
-////        //手机号不能重复
-////        SysUser userMobile = sysUserService.findByPhone(sysUser.getMobile());
-////        if(null != userMobile) return HttpResult.error("已经存在该手机号");
-//
-//        //处理密码
-//        if (StringUtils.isNotEmpty(sysUser.getPassword())) {
-//            String salt = PasswordUtils.getSalt();
-//            String pwd = PasswordUtils.encode(sysUser.getPassword(), salt);
-//            sysUser.setPassword(pwd);
-//            sysUser.setSalt(salt);
-//        }
-//
-//        if (StringUtils.isNullOrEmpty(vo.getSysUser().getId())) {
-//            //新增
-//
-//            sysUser.setId(sysUserService.gainNextUserId(sysUser.getDeptId()));
-//            sysUser.setDelFlag(0);
-//            sysUser.setMobile(sysUser.getMobile());
-//            sysUser.setStatus(1);
-//            sysUser.setApprovalStatus(0);
-//            sysUser.setCreateBy(getUserName());
-//            sysUser.setCreateTime(new Date());
-//            sysUserService.save(sysUser);
-//
-////            //详情表
-////            esmUserInternalService.
-//
-//
-//        } else {
-//            //更新
-//            sysUserService.updateById(sysUser);
-//            sysUser.setLastUpdateBy(getUserName());
-//            sysUser.setLastUpdateTime(new Date());
-//
-//        }
-//        return HttpResult.ok(sysUser);
-//
-//
-//    }
 
     @ApiOperation(value = "获取用户综合信息")
     @PostMapping(value = "/gainUserSynthesisInfo/{userId}")
@@ -515,19 +444,12 @@ public class SysUserController extends BaseController {
             sysUser.setReferrerName(referrer.getReferrerName());
         }
         //查询详情信息
+        SysUserInfo userInfo = sysUserInfoService.getById(userId);
 
-        EsmUserInternal userInternal = esmUserInternalService.getById(userId);
-        if (!ObjectUtils.isEmpty(userInternal)){
-            sysUser.setId(userInternal.getId());
-        }
-
-//        SysUserInfo userInfo = sysUserInfoService.getById(userId);
-//        if (!ObjectUtils.isEmpty(userInfo)){
-//            sysUser.setId(userInfo.getId());
-//        }
         SysUserVo sysUserVo = new SysUserVo();
         sysUserVo.setSysUser(sysUser);
-        sysUserVo.setUserInternal(userInternal);
+
+        sysUserVo.setSysUserInfo(userInfo);
         return HttpResult.ok(sysUserVo);
 
     }
@@ -686,16 +608,16 @@ public class SysUserController extends BaseController {
                     a.setStatus(2);
                 }
 
-                //性别
-                if (a.getSex().equals("未知")) {
-                    a.setSex("U");
-                }
-                if (a.getSex().equals("男")) {
-                    a.setSex("M");
-                }
-                if (a.getSex().equals("女")) {
-                    a.setSex("W");
-                }
+//                //性别
+//                if (a.getSex().equals("未知")) {
+//                    a.setSex("U");
+//                }
+//                if (a.getSex().equals("男")) {
+//                    a.setSex("M");
+//                }
+//                if (a.getSex().equals("女")) {
+//                    a.setSex("W");
+//                }
 
 
                 if (StringUtils.isNullOrEmpty(a.getDeptId())) throw new SystemException("机构ID不能为空");

src/main/java/com/ydtech/modules/admin/dao/SysUserMapper.java

@@ -42,7 +42,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
             "where 1=1  and t2.isteamleader = '1' and t1.dept_id=#{deptId}";
 
 
-    String selectUserParamSql = "select su.id as userId,su.name,su.sex,su.mobile,su.status" +
+    String selectUserParamSql = "select su.id as userId,su.name,info.sex,su.mobile,su.status" +
             ",sd.id as deptId,sd.name as deptName" +
             ",psd.id as pDeptId,psd.name as pDeptName" +
             ",t4.id as roleId" +

src/main/java/com/ydtech/modules/admin/model/SysUser.java

@@ -61,12 +61,7 @@ public class SysUser extends BaseEntity {
     @TableField(value = "salt")
     private String salt;
 
-    /**
-     * 邮箱
-     */
-    @ApiModelProperty(value = "邮箱")
-    @TableField(value = "email")
-    private String email;
+
 
     /**
      * 手机号
@@ -92,12 +87,7 @@ public class SysUser extends BaseEntity {
     @TableField(value = "dept_id")
     private String deptId;
 
-    /**
-     * 性别
-     */
-    @Excel(name = "性别")
-    @TableField(value = "sex")
-    private String sex;
+
 
     /**
      * 微信id
@@ -112,6 +102,12 @@ public class SysUser extends BaseEntity {
     @TableField(value = "approval_opinion")
     private String approvalOpinion;
 
+    @ApiModelProperty(value = "身份证号")
+    @TableField(value = "identity")
+    private String identity;
+
+
+    //------------------
 
     /**
      * 角色ID
@@ -131,7 +127,6 @@ public class SysUser extends BaseEntity {
     /**
      * 机构名称
      */
-
     @ApiModelProperty(value = "机构名称")
     @TableField(exist = false)
     private String deptName;

src/main/java/com/ydtech/modules/admin/model/SysUserInfo.java

@@ -1,16 +1,15 @@
 package com.ydtech.modules.admin.model;
 
 
+import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.ydtech.modules.base.model.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -27,6 +26,21 @@ public class SysUserInfo implements Serializable {
     @NotBlank(message = "用户ID不能为空")
     private String id;
 
+    /**
+     * 邮箱
+     */
+    @ApiModelProperty(value = "邮箱")
+    @TableField(value = "email")
+    private String email;
+
+    /**
+     * 性别
+     */
+    @Excel(name = "性别")
+    @TableField(value = "sex")
+    private String sex;
+
+
     @ApiModelProperty(value = "居住地址")
     @TableField(value = "address")
     private String address;
@@ -35,9 +49,7 @@ public class SysUserInfo implements Serializable {
     @TableField(value = "nations")
     private String nations;
 
-    @ApiModelProperty(value = "身份证号")
-    @TableField(value = "identity")
-    private String identity;
+
 
     @ApiModelProperty(value = "开户行")
     @TableField(value = "bank_name")
@@ -59,6 +71,55 @@ public class SysUserInfo implements Serializable {
     @TableField(value = "marital_status")
     private String maritalStatus;
 
+    //---
+    @ApiModelProperty(value = "政治面貌")
+    @TableField(value = "politics_status")
+    private String politicsStatus;
+
+    @ApiModelProperty(value = "健康状况")
+    @TableField(value = "health")
+    private String health;
+
+    @ApiModelProperty(value = "邮政编码")
+    @TableField(value = "postal_code")
+    private String postalCode;
+
+    @ApiModelProperty(value = "血型")
+    @TableField(value = "blood_type")
+    private String bloodType;
+
+    @ApiModelProperty(value = "学历")
+    @TableField(value = "education")
+    private String education;
+
+    @ApiModelProperty(value = "毕业院校")
+    @TableField(value = "school")
+    private String school;
+
+    @ApiModelProperty(value = "毕业时间")
+    @TableField(value = "graduation_time")
+    private Date graduationTime;
+
+    @ApiModelProperty(value = "原工作单位")
+    @TableField(value = "former_employer")
+    private String formerEmployer;
+
+    @ApiModelProperty(value = "入司时间")
+    @TableField(value = "entry_time")
+    private Date entryTime;
+
+    @ApiModelProperty(value = "代理人资格证号")
+    @TableField(value = "agent_qualification_code")
+    private String agentQualificationCode;
+
+    @ApiModelProperty(value = "紧急联系人电话")
+    @TableField(value = "emergency_contact_tel")
+    private String emergencyContactTel;
+
+    @ApiModelProperty(value = "紧急联系人姓名")
+    @TableField(value = "emergency_contact_name")
+    private String emergencyContactName;
+
     @ApiModelProperty(value = "")
     @TableField(value = "remark")
     private String remark;

src/main/java/com/ydtech/modules/admin/service/impl/SysUserServiceImpl.java

@@ -19,10 +19,8 @@ import com.ydtech.modules.admin.vo.SysUserVo;
 import com.ydtech.modules.base.model.dto.PageDto;
 import com.ydtech.modules.base.model.vo.PageVo;
 import com.ydtech.modules.esm.model.EsmUserAgent;
-import com.ydtech.modules.esm.model.EsmUserInternal;
 import com.ydtech.modules.esm.model.EsmUserReferrer;
 import com.ydtech.modules.esm.service.EsmUserAgentService;
-import com.ydtech.modules.esm.service.EsmUserInternalService;
 import com.ydtech.modules.esm.service.EsmUserReferrerService;
 import com.ydtech.utils.StringUtils;
 import com.ydtech.utils.idgen.IdGenerate;
@@ -58,8 +56,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
     @Resource
     private EsmUserReferrerService esmUserReferrerService;
 
-    @Autowired
-    private EsmUserInternalService esmUserInternalService;
+    @Resource
+    private SysUserInfoService sysUserInfoService;
 
 
     @Override
@@ -378,28 +376,18 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
 
         //推荐人
         EsmUserReferrer eur = new EsmUserReferrer();
-//        if (!StringUtils.isNullOrEmpty(referrerId)) {
-//            EsmUserReferrer referrer = esmUserReferrerService.getById(referrerId);
-//            if (null != referrer) {
-//                eur.setLevel(referrer.getLevel() + 1);
-//            } else {
-//                eur.setLevel(1);
-//            }
-//        }
         eur.setId(sysUser.getId());
         eur.setReferrerName(sysUser.getReferrerName());
         eur.setReferrerId(sysUser.getReferrerId());
         eur.setLevel(1);
         esmUserReferrerService.save(eur);
 
-//        SysUserInfo userInfo = sysUserVo.getSysUserInfo();
-//        userInfo.setId(sysUser.getId());
-//        sysUserInfoService.save(userInfo);
-        EsmUserInternal userInternal = sysUserVo.getUserInternal();
-        if (userInternal != null){
-            userInternal.setId(sysUser.getId());
+        SysUserInfo userInfo = sysUserVo.getSysUserInfo();
+        if (userInfo != null){
+            userInfo.setId(sysUser.getId());
         }
-        esmUserInternalService.save(userInternal);
+//        userInfo.setId(sysUser.getId());
+        sysUserInfoService.save(userInfo);
         return HttpResult.ok("新增成功");
     }
 
@@ -431,9 +419,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
         esmUserReferrerService.updateById(eur);
 
         //用户详情信息
-        EsmUserInternal userInternal = sysUserVo.getUserInternal();
-        userInternal.setId(userId);
-        esmUserInternalService.updateById(userInternal);
+        SysUserInfo sysUserInfo = sysUserVo.getSysUserInfo();
+        sysUserInfo.setId(userId);
+        sysUserInfoService.saveOrUpdate(sysUserInfo);
+//        sysUserInfoService.updateById(sysUserInfo);
         return HttpResult.ok("修改成功");
     }
 }

src/main/java/com/ydtech/modules/admin/vo/SysUserVo.java

@@ -5,7 +5,6 @@ import com.ydtech.modules.admin.model.SysUserInfo;
 import com.ydtech.modules.admin.model.SysUserRole;
 import com.ydtech.modules.admin.model.dto.AgentUserDto;
 import com.ydtech.modules.base.model.BaseEntity;
-import com.ydtech.modules.esm.model.EsmUserInternal;
 import com.ydtech.modules.esm.model.EsmUserReferrer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -14,14 +13,14 @@ import lombok.Data;
 import java.util.List;
 
 @Data
-@ApiModel("人员管理代理人信息")
+@ApiModel("人员信息")
 public class SysUserVo extends BaseEntity {
     @ApiModelProperty("用户信息")
     private SysUser sysUser;
-    //    @ApiModelProperty("用户详情信息")
-//    private SysUserInfo sysUserInfo;
-    @ApiModelProperty("用户详细信息")
-    private EsmUserInternal userInternal;
+    @ApiModelProperty("用户详情信息")
+    private SysUserInfo sysUserInfo;
+//    @ApiModelProperty("用户详细信息")
+//    private EsmUserInternal userInternal;
 
 
 }

src/main/java/com/ydtech/modules/esm/controller/EsmUserController.java

@@ -126,7 +126,7 @@ public class EsmUserController extends BaseController {
             vo.setId(a.getId());
             vo.setName(a.getName());
             vo.setMobile(a.getMobile());
-            vo.setSex(a.getSex());
+//            vo.setSex(a.getSex());
 
             SysDept sysDept = sysDeptService.getById(a.getDeptId());
             if(null != sysDept){

src/main/java/com/ydtech/modules/esm/model/EsmUserInternal.java

@@ -1,8 +1,11 @@
 package com.ydtech.modules.esm.model;
 
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -58,4 +61,6 @@ public class EsmUserInternal implements Serializable {
 
 
 
+
+
 }