人员管理-代理人管理：新增和修改推荐人

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

@@ -31,11 +31,14 @@ import com.ydtech.utils.excel.ExcelUtils2;
 import com.ydtech.utils.idgen.IdGenerate;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.Valid;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Date;
@@ -368,6 +371,14 @@ public class SysUserController extends BaseController {
 //        return HttpResult.ok(sysUserService.selectByDeptId(deptId));
     }
 
+    /**
+     * 根据部门id查询该部门的推荐人信息
+     */
+    @GetMapping("/selectfindByreferrerId")
+    public HttpResult findByreferrerId(@Valid String deptId) {
+        return HttpResult.ok(sysUserService.findByreferrerId(deptId));
+    }
+
 
 //    /**
 //     * 审批
@@ -404,8 +415,13 @@ public class SysUserController extends BaseController {
     @Transactional
     public HttpResult saveOrUpdate(@RequestBody SysUser sysUser) {
 
-        if (StringUtils.isNullOrEmpty(sysUser.getMobile())) return HttpResult.error("手机不能为空");
-        if (StringUtils.isNullOrEmpty(sysUser.getDeptId())) return HttpResult.error("机构ID不能为空");
+        if (StringUtils.isNullOrEmpty(sysUser.getMobile())) {
+            return HttpResult.error("手机不能为空");
+        }
+
+        if (StringUtils.isNullOrEmpty(sysUser.getDeptId())) {
+            return HttpResult.error("机构ID不能为空");
+        }
 
         //处理密码
         if (StringUtils.isNotEmpty(sysUser.getPassword())) {
@@ -414,6 +430,7 @@ public class SysUserController extends BaseController {
             sysUser.setPassword(pwd);
             sysUser.setSalt(salt);
         }
+
         sysUserService.saveUser(sysUser);
 
         return HttpResult.ok(sysUser);
@@ -482,9 +499,20 @@ public class SysUserController extends BaseController {
     })
     @GetMapping(value = "/{userId}")
     public HttpResult findUserById(@PathVariable String userId) {
+        // 查询用户
         SysUser sysUser = sysUserService.getById(userId);
+        // 查询角色
         SysUserRole sysUserRole = sysUserRoleService.selectByUserId(userId);
         sysUser.setRoleId(StringUtils.toString(sysUserRole.getRoleId()));
+        // 查询推荐人
+        EsmUserReferrer referrer = esmUserReferrerService.getById(userId);
+        if (ObjectUtils.isEmpty(referrer)) {
+            sysUser.setReferrerId(null);
+            sysUser.setReferrerName(null);
+        } else {
+            sysUser.setReferrerId(referrer.getReferrerId());
+            sysUser.setReferrerName(referrer.getReferrerName());
+        }
         return HttpResult.ok(sysUser);
 
     }
@@ -509,7 +537,6 @@ public class SysUserController extends BaseController {
     }
 
 
-
     /**
      * 个代注册
      *
@@ -549,7 +576,7 @@ public class SysUserController extends BaseController {
         SysUser sysUser = sysUserService.findByPhone(dto.getMobile());
         if (sysUser != null) {
             return HttpResult.error("手机号已存在");
-        }else{
+        } else {
             sysUser = new SysUser();
         }
         String nextPK = "001";
@@ -591,7 +618,7 @@ public class SysUserController extends BaseController {
         eur.setReferrerId(dto.getReferrerId());
         if (null != referrer) {
             eur.setLevel(referrer.getLevel() + 1);
-        }else{
+        } else {
             eur.setLevel(1);
         }
         esmUserReferrerService.save(eur);
@@ -600,25 +627,23 @@ public class SysUserController extends BaseController {
     }
 
 
-
-
     @PostMapping(value = "/newUserImport")
     @ApiOperation(value = "新用户导入")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "file", value = "excel文件", required = true, dataType = "__file"),
-            @ApiImplicitParam(name = "deptId", value = "机构部门ID", required = true, dataType = "String",paramType = "formData")
+            @ApiImplicitParam(name = "deptId", value = "机构部门ID", required = true, dataType = "String", paramType = "formData")
     })
     @Transactional
     public HttpResult newUserImport(@RequestPart MultipartFile file, @RequestParam String deptId) {
 
         SysDept sd = sysDeptService.getById(deptId);
-        if(null == sd) return HttpResult.error("机构部门不存在");
+        if (null == sd) return HttpResult.error("机构部门不存在");
 
         try {
             List<SysUser> userList = ExcelEasypoiUtils.importExcel(file, SysUser.class, 0, 1, 1);
             userList = userList.stream().filter(l -> StringUtils.isNotEmpty(l.getMobile())).collect(Collectors.toList());
 
-            userList.stream().forEach(a ->{
+            userList.stream().forEach(a -> {
 
                 if (StringUtils.isNullOrEmpty(a.getMobile())) throw new SystemException("手机不能为空");
                 //处理密码
@@ -633,27 +658,27 @@ public class SysUserController extends BaseController {
 
                 //获取角色
                 LambdaQueryWrapper<SysRole> lqwRole = new LambdaQueryWrapper<>();
-                lqwRole.like(SysRole::getName,a.getRoleName());
+                lqwRole.like(SysRole::getName, a.getRoleName());
                 SysRole sr = sysRoleService.getOne(lqwRole);
                 a.setRoleId(sr.getId().toString());
                 a.setRoleName(sr.getName());
 
                 //状态
-                if(a.getExcelStatus().equals("正常")){
+                if (a.getExcelStatus().equals("正常")) {
                     a.setStatus(1);
                 }
-                if(a.getExcelStatus().equals("新注册")){
+                if (a.getExcelStatus().equals("新注册")) {
                     a.setStatus(2);
                 }
 
                 //性别
-                if(a.getSex().equals("未知")){
+                if (a.getSex().equals("未知")) {
                     a.setSex("U");
                 }
-                if(a.getSex().equals("男")){
+                if (a.getSex().equals("男")) {
                     a.setSex("M");
                 }
-                if(a.getSex().equals("女")){
+                if (a.getSex().equals("女")) {
                     a.setSex("W");
                 }
 
@@ -669,14 +694,10 @@ public class SysUserController extends BaseController {
         }
 
 
-
         return HttpResult.ok("导入成功");
     }
 
 
-
-
-
     /**
      * ==================用户详情=================
      */

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

@@ -107,6 +107,11 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
     @Select(internalUserByDeptIdSql)
     SysUserVO gainInternalUserByDeptId(@Param("deptId") String deptId);
 
+    @Select("SELECT u.id,u.name,r.id roleId,r.name roleName FROM sys_user u " +
+            "LEFT JOIN sys_user_role sur ON sur.user_id = u.id " +
+            "LEFT JOIN sys_role r ON r.id = sur.role_id WHERE r.id IN ('20','21') ")
+    List<SysUserVO> findByreferrerId(@Param("deptId") String deptId);
+
 
     //    @Select("select * from (" + selectUserParamSql + selectUserFromSql + selectUserFromWhereSql + " limit #{page.pageNum},#{page.pageSize} ) aaa")
     @Select({"<script>",

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

@@ -12,6 +12,7 @@ import com.ydtech.security.utils.PasswordUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.apache.ibatis.annotations.Select;
 import springfox.documentation.annotations.ApiIgnore;
 
 import javax.validation.constraints.NotBlank;
@@ -26,6 +27,9 @@ import javax.validation.constraints.Size;
 @Data
 @ApiModel
 public class SysUser extends BaseEntity {
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+
     /**
      * 编号
      */
@@ -125,7 +129,7 @@ public class SysUser extends BaseEntity {
     private String roleName;
 
     /**
-     * 角色名称
+     * 机构名称
      */
 
     @ApiModelProperty(value = "机构名称")
@@ -133,14 +137,18 @@ public class SysUser extends BaseEntity {
     private String deptName;
 
 
-    @TableField(exist = false)
-    private static final long serialVersionUID = 1L;
 
     @TableField(exist = false)
     @Excel(name = "状态")
     private String excelStatus;
 
+    @TableField(exist = false)
+    @Excel(name = "推荐人ID")
+    private String referrerId;
 
+    @TableField(exist = false)
+    @Excel(name = "推荐人名称")
+    private String referrerName;
 
     /**
      *  验证用户

src/main/java/com/ydtech/modules/admin/model/vo/SysUserVO.java

@@ -11,6 +11,10 @@ public class SysUserVO {
     private String name;
     private String deptid;
     private String deptname;
+    private String roleId;
+    private String roleName;
+    private String referrerId;
+    private String referrerName;
     private String comid;
     private String comname;
     private String status;
@@ -47,6 +51,38 @@ public class SysUserVO {
         this.deptname = deptname;
     }
 
+    public String getRoleId() {
+        return roleId;
+    }
+
+    public void setRoleId(String roleId) {
+        this.roleId = roleId;
+    }
+
+    public String getRoleName() {
+        return roleName;
+    }
+
+    public void setRoleName(String roleName) {
+        this.roleName = roleName;
+    }
+
+    public String getReferrerId() {
+        return referrerId;
+    }
+
+    public void setReferrerId(String referrerId) {
+        this.referrerId = referrerId;
+    }
+
+    public String getReferrerName() {
+        return referrerName;
+    }
+
+    public void setReferrerName(String referrerName) {
+        this.referrerName = referrerName;
+    }
+
     public String getComid() {
         return comid;
     }

src/main/java/com/ydtech/modules/admin/service/SysUserService.java

@@ -50,6 +50,7 @@ public interface SysUserService extends IService<SysUser> {
 
     SysUserVO gainUserInternalByDeptId(String deptId);
 
+    List<SysUserVO> findByreferrerId(String deptId);
     PageVo gainUserPage(PageDto pageDto);
 
 
@@ -75,6 +76,7 @@ public interface SysUserService extends IService<SysUser> {
     SysUserBaseVO selectUserById(String userId);
 
 
+
     boolean saveUser(SysUser sysUser);
 
 

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

@@ -3,19 +3,23 @@ package com.ydtech.modules.admin.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageResult;
+import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.dao.SysUserMapper;
-import com.ydtech.modules.admin.model.SysDept;
-import com.ydtech.modules.admin.model.SysMenu;
-import com.ydtech.modules.admin.model.SysUser;
-import com.ydtech.modules.admin.model.SysUserRole;
+import com.ydtech.modules.admin.model.*;
 import com.ydtech.modules.admin.service.*;
 import com.ydtech.modules.admin.model.vo.SysUserBaseVO;
 import com.ydtech.modules.admin.model.vo.SysUserInternalVO;
 import com.ydtech.modules.admin.model.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.EsmUserReferrer;
+import com.ydtech.modules.esm.service.EsmUserAgentService;
+import com.ydtech.modules.esm.service.EsmUserReferrerService;
 import com.ydtech.utils.StringUtils;
 import com.ydtech.utils.idgen.IdGenerate;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +27,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.io.Serializable;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -44,6 +49,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
     @Resource
     private SysUserRoleService sysUserRoleService;
 
+    @Resource
+    private EsmUserReferrerService esmUserReferrerService;
+
     @Override
     public SysUser findByUsername(String username) {
         SysUser sysUser = null;
@@ -194,14 +202,19 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
         return super.baseMapper.gainInternalUserByDeptId(deptId);
     }
 
+    @Override
+    public List<SysUserVO> findByreferrerId(String deptId) {
+        return super.baseMapper.findByreferrerId(deptId);
+    }
+
     @Override
     public PageVo gainUserPage(PageDto pageDto) {
 
         PageVo<SysUserBaseVO> pageVo = new PageVo();
+
         //获取分页数量
         int total = super.baseMapper.gainUserBaseInfoCount(pageDto);
 
-
         //计算mysql分页起索引
         int firstIndex = pageDto.getPageNum() == 1 ? 0 : (pageDto.getPageNum() - 1) * pageDto.getPageSize();
 //        int firstIndex = pageDto.getPageNum() == 1 ? 0 : (pageDto.getPageNum() - 1) * pageDto.getPageSize() + 1;
@@ -310,27 +323,37 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
     @Override
     @Transactional
     public boolean saveUser(SysUser sysUser) {
-
-
+        // 判断用户id是否存在
         if (StringUtils.isNullOrEmpty(sysUser.getId())) {
-            //新增
             sysUser.setId(gainNextUserId(sysUser.getDeptId()));
             sysUser.setMobile(sysUser.getMobile());
-
         }
 
-        saveOrUpdate(sysUser);
-
-        sysUserRoleService.deleteByUserId(sysUser.getId());
+        // 角色信息
         SysUserRole sur = new SysUserRole();
         sur.setUserId(sysUser.getId());
         sur.setRoleId(StringUtils.toLong(sysUser.getRoleId()));
-        sysUserRoleService.save(sur);
 
+        // 删除角色
+        sysUserRoleService.deleteByUserId(sysUser.getId());
+        // 删除推荐人
+        esmUserReferrerService.deldeleteByReferrerId(sysUser.getId());
+
+        // 构建推荐人信息
+        EsmUserReferrer eur = new EsmUserReferrer();
+        eur.setId(sysUser.getId());
+        eur.setReferrerId(sysUser.getReferrerId());//推荐人
+        eur.setReferrerName(sysUser.getReferrerName());
+
+        // 新增或跟新用户表
+        saveOrUpdate(sysUser);
+        // 保存推荐人
+        esmUserReferrerService.save(eur);
+        // 保存角色
+        sysUserRoleService.save(sur);
         return true;
     }
 
-
 }
 
 

src/main/java/com/ydtech/modules/esm/service/EsmUserReferrerService.java

@@ -13,7 +13,7 @@ public interface EsmUserReferrerService extends IService<EsmUserReferrer> {
 
     Map buildLevelInfo(SysUser agent);
 
-
+    boolean deldeleteByReferrerId(String userId);
     void buildLevelList(SysUser user,List<SysUser> oneList,List<SysUser> oneTempList);
 
 }

src/main/java/com/ydtech/modules/esm/service/impl/EsmUserReferrerServiceImpl.java

@@ -1,18 +1,13 @@
 package com.ydtech.modules.esm.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ydtech.modules.admin.dao.SysUserInfoMapper;
 import com.ydtech.modules.admin.model.SysUser;
-import com.ydtech.modules.admin.model.SysUserInfo;
-import com.ydtech.modules.admin.service.SysUserInfoService;
 import com.ydtech.modules.admin.service.SysUserService;
 import com.ydtech.modules.esm.dao.EsmUserReferrerMapper;
-import com.ydtech.modules.esm.dao.impl.EsmAgreementGroupDaoImpl;
 import com.ydtech.modules.esm.model.EsmUserReferrer;
-import com.ydtech.modules.esm.service.EsmAgreementGroupService;
 import com.ydtech.modules.esm.service.EsmUserReferrerService;
-import com.ydtech.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -63,6 +58,14 @@ public class EsmUserReferrerServiceImpl extends ServiceImpl<EsmUserReferrerMappe
             oneTempList.addAll(oneMap.get("list2"));
 
     }
+
+
+    @Override
+    public boolean deldeleteByReferrerId(String userId) {
+        LambdaQueryWrapper<EsmUserReferrer> queryWrapper = new LambdaQueryWrapper();
+        queryWrapper.eq(EsmUserReferrer::getId,userId);
+        return remove(queryWrapper);
+    }
 }