用户管理新增修改对应人员管理新增修改

itdmServer/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/ItdmPersonManageTask.java

@@ -0,0 +1,78 @@
+package org.jeecg.modules.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+
+@Data
+@TableName("itdm_person_manage")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="itdm_person_manage对象", description="人员管理")
+public class ItdmPersonManageTask  implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**主键*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+    /**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+    /**创建日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+    /**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+    /**更新日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+    /**人员姓名*/
+    @Excel(name = "人员姓名", width = 15)
+    @ApiModelProperty(value = "人员姓名")
+    private java.lang.String name;
+    /**人员性别*/
+    @Excel(name = "人员性别", width = 15, dicCode = "sex")
+    @Dict(dicCode = "sex")
+    @ApiModelProperty(value = "人员性别")
+    private java.lang.Integer sex;
+    /**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+    /**职位*/
+    @Excel(name = "职位", width = 15)
+    @ApiModelProperty(value = "职位")
+    private java.lang.String position;
+    /**工作组*/
+    @Excel(name = "工作组", width = 15)
+    @ApiModelProperty(value = "工作组")
+    private java.lang.String workGroup;
+    /**手机号*/
+    @Excel(name = "手机号", width = 15)
+    @ApiModelProperty(value = "手机号")
+    private java.lang.String tel;
+    /**备注*/
+    @Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private java.lang.String remark;
+    /**用户id*/
+    @ApiModelProperty(value = "用户id")
+    private java.lang.String userId;
+}
+

itdmServer/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/ItdmPersonManageTaskMapper.java

@@ -0,0 +1,33 @@
+package org.jeecg.modules.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.jeecg.modules.system.entity.ItdmPersonManageTask;
+
+import java.util.List;
+
+public interface ItdmPersonManageTaskMapper extends BaseMapper<ItdmPersonManageTask> {
+
+    /**
+     * 新增一条人员管理
+     */
+    @Select("insert into itdm_person_manage set id=#{id}, name = #{name}, sex = #{sex}, tel = #{tel}, position = #{position}, user_id = #{userId}" )
+    void insertIntoPersonManage(@Param("id") String id,
+                               @Param("name") String name,
+                               @Param("sex") Integer sex,
+                               @Param("tel") String tel,
+                               @Param("position") String position,
+                               @Param("userId") String userId);
+
+    /**
+     * 修改对应的人员管理
+     */
+    @Select("update itdm_person_manage set name = #{name}, sex = #{sex}, tel = #{tel}, position = #{position} where user_id = #{userId}" )
+    void updatePersonManage(@Param("name") String name,
+                            @Param("sex") Integer sex,
+                            @Param("tel") String tel,
+                            @Param("position") String position,
+                            @Param("userId") String userId);
+}

itdmServer/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/ItdmPersonManageTaskMapper.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.system.mapper.ItdmPersonManageTaskMapper">
+</mapper>

itdmServer/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.incrementer.DefaultIdentifierGenerator;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -44,7 +45,7 @@ import java.util.stream.Collectors;
 @Service
 @Slf4j
 public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements ISysUserService {
-	
+
 	@Autowired
 	private SysUserMapper userMapper;
 	@Autowired
@@ -71,6 +72,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 	ThirdAppDingtalkServiceImpl dingtalkService;
 	@Autowired
 	SysRoleIndexMapper sysRoleIndexMapper;
+	@Autowired
+	ItdmPersonManageTaskMapper personManageMapper;
 
     @Override
     @CacheEvict(value = {CacheConstant.SYS_USERS_CACHE}, allEntries = true)
@@ -125,8 +128,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 	public SysUser getUserByName(String username) {
 		return userMapper.getUserByName(username);
 	}
-	
-	
+
+
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void addUserWithRole(SysUser user, String roles) {
@@ -187,7 +190,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 				roleIndex = list.get(0);
 			}
 		}
-		
+
 		//如果componentUrl为空，则返回空
 		if(oConvertUtils.isEmpty(roleIndex.getComponent())){
 			return null;
@@ -253,7 +256,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 			info.setSysUserName(sysUser.getRealname());
 			info.setSysOrgCode(sysUser.getOrgCode());
 		}
-		
+
 		//多部门支持in查询
 		List<SysDepart> list = sysDepartMapper.queryUserDeparts(sysUser.getId());
 		List<String> sysMultiOrgCode = new ArrayList<String>();
@@ -269,7 +272,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 			}
 		}
 		info.setSysMultiOrgCode(sysMultiOrgCode);
-		
+
 		return info;
 	}
 
@@ -515,14 +518,18 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void saveUser(SysUser user, String selectedRoles, String selectedDeparts) {
+		String role = null;//
+
 		//step.1 保存用户
 		this.save(user);
+		SysUser u = user;
 		//step.2 保存角色
 		if(oConvertUtils.isNotEmpty(selectedRoles)) {
 			String[] arr = selectedRoles.split(",");
 			for (String roleId : arr) {
 				SysUserRole userRole = new SysUserRole(user.getId(), roleId);
 				sysUserRoleMapper.insert(userRole);
+				role = sysRoleMapper.selectById(roleId).getRoleName();//
 			}
 		}
 		//step.3 保存所属部门
@@ -533,12 +540,16 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 				sysUserDepartMapper.insert(userDeaprt);
 			}
 		}
+		//新增用户管理
+		DefaultIdentifierGenerator digester = new DefaultIdentifierGenerator();
+		personManageMapper.insertIntoPersonManage(String.valueOf(digester.nextId(null)),user.getRealname(),user.getSex(),user.getPhone(),role,user.getId());
 	}
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	@CacheEvict(value={CacheConstant.SYS_USERS_CACHE}, allEntries=true)
 	public void editUser(SysUser user, String roles, String departs) {
+		String role = null;
 		//step.1 修改用户基础信息
 		this.updateById(user);
 		//step.2 修改角色
@@ -549,6 +560,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 			for (String roleId : arr) {
 				SysUserRole userRole = new SysUserRole(user.getId(), roleId);
 				sysUserRoleMapper.insert(userRole);
+				role = sysRoleMapper.selectById(roleId).getRoleName(); //
 			}
 		}
 
@@ -585,6 +597,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 		// 更新手机号、邮箱空字符串为 null
 		userMapper.updateNullByEmptyString("email");
 		userMapper.updateNullByEmptyString("phone");
+		//修改对应的用户管理
+		personManageMapper.updatePersonManage(user.getRealname(),user.getSex(),user.getPhone(),role,user.getId());
 
 	}
 

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmPersonManage/convert/ItdmPersonManageConvert.java

@@ -0,0 +1,25 @@
+package org.jeecg.modules.itdmPersonManage.convert;
+
+
+import org.jeecg.modules.itdmPersonManage.entity.ItdmPersonManage;
+import org.jeecg.modules.system.entity.SysUser;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.ReportingPolicy;
+import org.mapstruct.factory.Mappers;
+import org.springframework.util.CollectionUtils;
+
+import java.util.stream.Collectors;
+
+@Mapper(unmappedTargetPolicy = ReportingPolicy.IGNORE,imports ={ CollectionUtils.class, Collectors.class})
+public interface ItdmPersonManageConvert {
+
+    ItdmPersonManageConvert INSTANCE = Mappers.getMapper(ItdmPersonManageConvert.class);
+
+
+    @Mapping(target = "name", source = "user.realname")
+    @Mapping(target = "userId", source = "user.id")
+    @Mapping(target = "position", source = "role")
+    ItdmPersonManage convert(SysUser user,String role);
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmPersonManage/entity/ItdmPersonManage.java

@@ -60,7 +60,7 @@ public class ItdmPersonManage implements Serializable {
 	@Excel(name = "人员性别", width = 15, dicCode = "sex")
 	@Dict(dicCode = "sex")
     @ApiModelProperty(value = "人员性别")
-    private java.lang.String sex;
+    private java.lang.Integer sex;
 	/**所属部门*/
     @ApiModelProperty(value = "所属部门")
     private java.lang.String sysOrgCode;