Merge remote-tracking branch 'origin/master'

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/controller/UserInfoController.java

@@ -0,0 +1,57 @@
+package com.jeeplus.test.user.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jeeplus.sys.utils.StringUtils;
+import com.jeeplus.test.user.domain.SysUserInfo;
+import com.jeeplus.test.user.domain.dto.UserInfoDetailDto;
+import com.jeeplus.test.user.domain.dto.UserListDto;
+import com.jeeplus.test.user.service.UserInfoService;
+import com.jeeplus.test.workClientInfo.domain.WorkClientInfo;
+import com.jeeplus.test.workClientInfo.domain.dto.PageInfoDto;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@Slf4j
+@Api(tags ="userInfo")
+@RestController
+@RequestMapping(value = "/sys/userInfo")
+public class UserInfoController {
+
+    @Resource
+    private UserInfoService userInfoService;
+
+    /**
+     * 用户信息列表
+     */
+    @ApiOperation(value = "用户信息列表")
+    @PostMapping(value = "/list")
+    public Page<SysUserInfo> list(Page<SysUserInfo> page, @RequestBody UserListDto userListDto) {
+        return userInfoService.list(userListDto, page);
+    }
+
+    @ApiOperation(value = "删除用户信息")
+    @GetMapping(value = "/remove")
+    public String remove(@RequestParam String id) {
+        return userInfoService.remove(id);
+    }
+
+    @ApiOperation(value = "根据id获取用户信息")
+    @GetMapping(value = "/getUserInfoById")
+    public UserInfoDetailDto getUserInfoById(@RequestParam String id) {
+        return userInfoService.getUserInfoById(id);
+    }
+
+    @ApiOperation(value = "保存、更新数据")
+    @PostMapping(value = "/save")
+    public String save(@RequestBody UserInfoDetailDto userInfoDetailDto) {
+        if (StringUtils.isEmpty(userInfoDetailDto.getId())) {
+            return userInfoService.add(userInfoDetailDto);
+        }else {
+            return userInfoService.modify(userInfoDetailDto);
+        }
+    }
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/domain/SysUserAchievement.java

@@ -2,6 +2,7 @@ package com.jeeplus.test.user.domain;
 
 import java.io.Serializable;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import java.util.Date;
@@ -38,6 +39,7 @@ public class SysUserAchievement implements Serializable {
     private Date updateDate;
 
     // 逻辑删除标记
+    @TableLogic
     @TableField("del_flag")
     private String delFlag;
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/domain/SysUserArchives.java

@@ -2,6 +2,7 @@ package com.jeeplus.test.user.domain;
 
 import java.io.Serializable;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import java.util.Date;
@@ -38,6 +39,7 @@ public class SysUserArchives implements Serializable {
     private Date updateDate;
 
     // 逻辑删除标记
+    @TableLogic
     @TableField("del_flag")
     private String delFlag;
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/domain/SysUserCertificate.java

@@ -2,6 +2,7 @@ package com.jeeplus.test.user.domain;
 
 import java.io.Serializable;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import java.util.Date;
@@ -38,6 +39,7 @@ public class SysUserCertificate implements Serializable {
     private Date updateDate;
 
     // 逻辑删除标记
+    @TableLogic
     @TableField("del_flag")
     private String delFlag;
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/domain/SysUserContract.java

@@ -2,6 +2,7 @@ package com.jeeplus.test.user.domain;
 
 import java.io.Serializable;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import java.util.Date;
@@ -38,6 +39,7 @@ public class SysUserContract implements Serializable {
     private Date updateDate;
 
     // 逻辑删除标记
+    @TableLogic
     @TableField("del_flag")
     private String delFlag;
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/domain/SysUserDuties.java

@@ -2,6 +2,7 @@ package com.jeeplus.test.user.domain;
 
 import java.io.Serializable;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import java.util.Date;
@@ -38,6 +39,7 @@ public class SysUserDuties implements Serializable {
     private Date updateDate;
 
     // 逻辑删除标记
+    @TableLogic
     @TableField("del_flag")
     private String delFlag;
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/domain/SysUserEducation.java

@@ -2,6 +2,7 @@ package com.jeeplus.test.user.domain;
 
 import java.io.Serializable;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import java.util.Date;
@@ -38,6 +39,7 @@ public class SysUserEducation implements Serializable {
     private Date updateDate;
 
     // 逻辑删除标记
+    @TableLogic
     @TableField("del_flag")
     private String delFlag;
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/domain/SysUserFamily.java

@@ -2,6 +2,7 @@ package com.jeeplus.test.user.domain;
 
 import java.io.Serializable;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import java.util.Date;
@@ -38,6 +39,7 @@ public class SysUserFamily implements Serializable {
     private Date updateDate;
 
     // 逻辑删除标记
+    @TableLogic
     @TableField("del_flag")
     private String delFlag;
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/domain/SysUserInfo.java

@@ -2,6 +2,7 @@ package com.jeeplus.test.user.domain;
 
 import java.io.Serializable;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import java.util.Date;
@@ -38,12 +39,13 @@ public class SysUserInfo implements Serializable {
     private Date updateDate;
 
     // 逻辑删除标记
+    @TableLogic
     @TableField("del_flag")
     private String delFlag;
 
     // 工号
     @TableField("jobNo")
-    private String jobno;
+    private String jobNo;
 
     // 姓名
     @TableField("name")
@@ -147,11 +149,11 @@ public class SysUserInfo implements Serializable {
 
     // 所属部门
     @TableField("department")
-    private Integer department;
+    private String department;
 
     // 岗位
     @TableField("position")
-    private Integer position;
+    private String position;
 
     // 最高学历
     @TableField("highest_education")
@@ -172,4 +174,8 @@ public class SysUserInfo implements Serializable {
     // 手签章地址
     @TableField("signature_url")
     private String signatureUrl;
+
+    //员工状态(中文)
+    @TableField(exist = false)
+    private String userStatus;
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/domain/SysUserLanguages.java

@@ -2,6 +2,7 @@ package com.jeeplus.test.user.domain;
 
 import java.io.Serializable;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import java.util.Date;
@@ -38,6 +39,7 @@ public class SysUserLanguages implements Serializable {
     private Date updateDate;
 
     // 逻辑删除标记
+    @TableLogic
     @TableField("del_flag")
     private String delFlag;
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/domain/SysUserRewards.java

@@ -2,6 +2,7 @@ package com.jeeplus.test.user.domain;
 
 import java.io.Serializable;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import java.util.Date;
@@ -38,6 +39,7 @@ public class SysUserRewards implements Serializable {
     private Date updateDate;
 
     // 逻辑删除标记
+    @TableLogic
     @TableField("del_flag")
     private String delFlag;
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/domain/SysUserTitle.java

@@ -2,6 +2,7 @@ package com.jeeplus.test.user.domain;
 
 import java.io.Serializable;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import java.util.Date;
@@ -38,6 +39,7 @@ public class SysUserTitle implements Serializable {
     private Date updateDate;
 
     // 逻辑删除标记
+    @TableLogic
     @TableField("del_flag")
     private String delFlag;
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/domain/SysUserTrain.java

@@ -2,6 +2,7 @@ package com.jeeplus.test.user.domain;
 
 import java.io.Serializable;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import java.util.Date;
@@ -38,6 +39,7 @@ public class SysUserTrain implements Serializable {
     private Date updateDate;
 
     // 逻辑删除标记
+    @TableLogic
     @TableField("del_flag")
     private String delFlag;
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/domain/SysUserWork.java

@@ -2,6 +2,7 @@ package com.jeeplus.test.user.domain;
 
 import java.io.Serializable;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import java.util.Date;
@@ -38,6 +39,7 @@ public class SysUserWork implements Serializable {
     private Date updateDate;
 
     // 逻辑删除标记
+    @TableLogic
     @TableField("del_flag")
     private String delFlag;
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/domain/dto/UserInfoDetailDto.java

@@ -0,0 +1,165 @@
+package com.jeeplus.test.user.domain.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.jeeplus.test.user.domain.*;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class UserInfoDetailDto {
+
+    // 主键
+    private String id;
+
+    // 创建者
+    private String createBy;
+
+    // 创建时间
+    private Date createDate;
+
+    // 更新者
+    private String updateBy;
+
+    // 更新时间
+    private Date updateDate;
+
+    // 逻辑删除标记
+    private String delFlag;
+
+    // 工号
+    private String jobNo;
+
+    // 姓名
+    private String name;
+
+    // 性别
+    private Short sex;
+
+    // 民族
+    private Short nation;
+
+    // 身份证号码
+    private String idCard;
+
+    // 年龄
+    private Integer age;
+
+    // 出生日期
+    private Date birthday;
+
+    // 电子邮箱
+    private String eMail;
+
+    // 移动电话
+    private String mobilePhone;
+
+    // 座机
+    private String phone;
+
+    // 员工状态
+    private Short userType;
+
+    // 银行卡号
+    private String bankNumber;
+
+    // 婚姻状态
+    private Short maritalStatus;
+
+    // 政治面貌
+    private Short politicalOutlook;
+
+    // 籍贯
+    private Byte nativePlace;
+
+    // 户口所在地
+    private String registeredResidence;
+
+    // 常住地址
+    private String permanentAddress;
+
+    // 社保账号
+    private String socialInsuranceNo;
+
+    // 医保账号
+    private String medicalInsuranceNo;
+
+    // 公积金账号
+    private String accumulationFundNo;
+
+    // 微信号
+    private String wx;
+
+    // qq
+    private String qq;
+
+    // 入职时间
+    private Date entryDate;
+
+    // 试用岗位
+    private String probationPosition;
+
+    // 试用期(月)
+    private String probationTime;
+
+    // 试用期结束日期
+    private Date probationEndDate;
+
+    // 所属部门
+    private String department;
+
+    // 岗位
+    private String position;
+
+    // 最高学历
+    private String highestEducation;
+
+    // 备注
+    private String remarks;
+
+    // 个人简介
+    private String personalProfile;
+
+    // 头像地址
+    private String headPortraitUrl;
+
+    // 手签章地址
+    private String signatureUrl;
+
+    //用户教育经历
+    private List<SysUserEducation> sysUserEducations;
+
+    //用户劳动关系
+    private List<SysUserContract> sysUserContracts;
+
+    //用户外语语种
+    private List<SysUserLanguages> sysUserLanguages;
+
+    //用户工作经历
+    private List<SysUserWork> sysUserWorks;
+
+    //用户执业资格证书
+    private List<SysUserCertificate> sysUserCertificates;
+
+    //用户职称
+    private List<SysUserTitle> sysUserTitles;
+
+    //用户家庭情况
+    private List<SysUserFamily> sysUserFamilies;
+
+    //用户培训经历
+    private List<SysUserTrain> sysUserTrains;
+
+    //用户社会及行业职务
+    private List<SysUserDuties> sysUserDuties;
+
+    //用户奖惩情况
+    private List<SysUserRewards> sysUserRewards;
+
+    //用户工作业绩
+    private List<SysUserAchievement> sysUserAchievements;
+
+    //用户电子档案
+    private List<SysUserArchives> sysUserArchives;
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/domain/dto/UserListDto.java

@@ -0,0 +1,12 @@
+package com.jeeplus.test.user.domain.dto;
+
+import lombok.Data;
+
+@Data
+public class UserListDto {
+
+    private String name;
+
+    private String mobilePhone;
+
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/mapper/SysUserAchievementMapper.java

@@ -1,6 +1,7 @@
 package com.jeeplus.test.user.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jeeplus.test.user.domain.SysUserAchievement;
 
-public interface SysUserAchievementMapper extends BaseMapper<SysUserAchievementMapper> {
+public interface SysUserAchievementMapper extends BaseMapper<SysUserAchievement> {
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/mapper/SysUserInfoMapper.java

@@ -1,7 +1,15 @@
 package com.jeeplus.test.user.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.test.user.domain.SysUserInfo;
+import org.apache.ibatis.annotations.Param;
 
 public interface SysUserInfoMapper extends BaseMapper<SysUserInfo> {
+
+    Page<SysUserInfo> findPageList(Page<SysUserInfo> page,
+                                   @Param("name") String name,
+                                   @Param("mobilePhone") String mobilePhone,
+                                   @Param("userStatus") String USER_STATUS);
+
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/mapper/xml/SysUserInfoMapper.xml

@@ -0,0 +1,28 @@
+<?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="com.jeeplus.test.user.mapper.SysUserInfoMapper">
+
+	<select id="findPageList" resultType="com.jeeplus.test.user.domain.SysUserInfo">
+		SELECT
+			a.id,
+			a.jobNo,
+			a.`name`,
+			a.id_card,
+			a.mobile_phone,
+			(SELECT NAME FROM sys_office b WHERE b.id = a.department) AS department,
+			(SELECT NAME FROM sys_role c WHERE c.id = a.position) AS position,
+			highest_education,
+			(SELECT e.label FROM sys_dict_type d LEFT JOIN sys_dict_value e ON d.id = e.dict_type_id WHERE d.type = #{userStatus} AND e.`value` = a.user_type) AS user_status
+		FROM
+			sys_user_info a
+		WHERE a.del_flag = 0
+		<if test="name != null and name != ''">
+			AND `name` LIKE CONCAT('%',#{name},'%')
+		</if>
+		<if test="mobilePhone != null and mobilePhone !=''">
+			AND mobile_phone LIKE CONCAT('%',#{mobilePhone},'%')
+		</if>
+		ORDER BY update_date DESC
+	</select>
+
+</mapper>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/service/UserInfoService.java

@@ -1,10 +1,558 @@
 package com.jeeplus.test.user.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jeeplus.sys.service.dto.UserDTO;
+import com.jeeplus.sys.utils.UserUtils;
+import com.jeeplus.test.user.domain.*;
+import com.jeeplus.test.user.domain.dto.UserInfoDetailDto;
+import com.jeeplus.test.user.domain.dto.UserListDto;
+import com.jeeplus.test.user.mapper.*;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.*;
 
 @Service
 public class UserInfoService {
 
+    @Resource
+    private SysUserInfoMapper sysUserInfoMapper;
+    @Resource
+    private SysUserEducationMapper sysUserEducationMapper;
+    @Resource
+    private SysUserContractMapper sysUserContractMapper;
+    @Resource
+    private SysUserLanguagesMapper sysUserLanguagesMapper;
+    @Resource
+    private SysUserWorkMapper sysUserWorkMapper;
+    @Resource
+    private SysUserCertificateMapper sysUserCertificateMapper;
+    @Resource
+    private SysUserTitleMapper sysUserTitleMapper;
+    @Resource
+    private SysUserFamilyMapper sysUserFamilyMapper;
+    @Resource
+    private SysUserTrainMapper sysUserTrainMapper;
+    @Resource
+    private SysUserDutiesMapper sysUserDutiesMapper;
+    @Resource
+    private SysUserRewardsMapper sysUserRewardsMapper;
+    @Resource
+    private SysUserAchievementMapper sysUserAchievementMapper;
+    @Resource
+    private SysUserArchivesMapper sysUserArchivesMapper;
+
+    private static final String USER_STATUS = "sys_user_status";
+
+    /**
+     * 用户信息列表
+     * @param userListDto
+     * @param page
+     * @return
+     */
+    public Page<SysUserInfo> list(UserListDto userListDto, Page<SysUserInfo> page) {
+        return sysUserInfoMapper.findPageList(page,userListDto.getName(),userListDto.getMobilePhone(),USER_STATUS);
+    }
+
+    /**
+     * 删除用户信息
+     * @param id
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public String remove (String id) {
+        //删除基本信息
+        sysUserInfoMapper.deleteById(id);
+        Map<String, Object> map = new HashMap<>();
+        map.put("user_info_id", id);
+        sysUserEducationMapper.deleteByMap(map);
+        sysUserContractMapper.deleteByMap(map);
+        sysUserLanguagesMapper.deleteByMap(map);
+        sysUserWorkMapper.deleteByMap(map);
+        sysUserCertificateMapper.deleteByMap(map);
+        sysUserTitleMapper.deleteByMap(map);
+        sysUserFamilyMapper.deleteByMap(map);
+        sysUserTrainMapper.deleteByMap(map);
+        sysUserDutiesMapper.deleteByMap(map);
+        sysUserRewardsMapper.deleteByMap(map);
+        sysUserAchievementMapper.deleteByMap(map);
+        sysUserArchivesMapper.deleteByMap(map);
+        return "操作成功";
+    }
+
+    /**
+     * 根据id查询用户信息
+     * @param id
+     * @return
+     */
+    public UserInfoDetailDto getUserInfoById (String id) {
+        UserInfoDetailDto detailDto = new UserInfoDetailDto();
+        //查询基本信息
+        SysUserInfo sysUserInfo = sysUserInfoMapper.selectById(id);
+        BeanUtils.copyProperties(sysUserInfo, detailDto);
+        //查询用户教育经历
+        LambdaQueryWrapper<SysUserEducation> wrapper1 = new LambdaQueryWrapper<>();
+        wrapper1.eq(SysUserEducation::getUserInfoId, id);
+        wrapper1.eq(SysUserEducation::getDelFlag, 0);
+        List<SysUserEducation> sysUserEducations = sysUserEducationMapper.selectList(wrapper1);
+        detailDto.setSysUserEducations(sysUserEducations);
+        //查询用户劳动关系
+        LambdaQueryWrapper<SysUserContract> wrapper2 = new LambdaQueryWrapper<>();
+        wrapper2.eq(SysUserContract::getUserInfoId, id);
+        wrapper2.eq(SysUserContract::getDelFlag, 0);
+        List<SysUserContract> sysUserContracts = sysUserContractMapper.selectList(wrapper2);
+        detailDto.setSysUserContracts(sysUserContracts);
+        //查询用户外语语种
+        LambdaQueryWrapper<SysUserLanguages> wrapper3 = new LambdaQueryWrapper<>();
+        wrapper3.eq(SysUserLanguages::getUserInfoId, id);
+        wrapper3.eq(SysUserLanguages::getDelFlag, 0);
+        List<SysUserLanguages> sysUserLanguages = sysUserLanguagesMapper.selectList(wrapper3);
+        detailDto.setSysUserLanguages(sysUserLanguages);
+        //查询用户工作经历
+        LambdaQueryWrapper<SysUserWork> wrapper4 = new LambdaQueryWrapper<>();
+        wrapper4.eq(SysUserWork::getUserInfoId, id);
+        wrapper4.eq(SysUserWork::getDelFlag, 0);
+        List<SysUserWork> sysUserWorks = sysUserWorkMapper.selectList(wrapper4);
+        detailDto.setSysUserWorks(sysUserWorks);
+        //查询用户执业资格证书
+        LambdaQueryWrapper<SysUserCertificate> wrapper5 = new LambdaQueryWrapper<>();
+        wrapper5.eq(SysUserCertificate::getUserInfoId, id);
+        wrapper5.eq(SysUserCertificate::getDelFlag, 0);
+        List<SysUserCertificate> sysUserCertificates = sysUserCertificateMapper.selectList(wrapper5);
+        detailDto.setSysUserCertificates(sysUserCertificates);
+        //查询用户职称
+        LambdaQueryWrapper<SysUserTitle> wrapper6 = new LambdaQueryWrapper<>();
+        wrapper6.eq(SysUserTitle::getUserInfoId, id);
+        wrapper6.eq(SysUserTitle::getDelFlag, 0);
+        List<SysUserTitle> sysUserTitles = sysUserTitleMapper.selectList(wrapper6);
+        detailDto.setSysUserTitles(sysUserTitles);
+        //查询用户家庭情况
+        LambdaQueryWrapper<SysUserFamily> wrapper7 = new LambdaQueryWrapper<>();
+        wrapper7.eq(SysUserFamily::getUserInfoId, id);
+        wrapper7.eq(SysUserFamily::getDelFlag, 0);
+        List<SysUserFamily> sysUserFamilies = sysUserFamilyMapper.selectList(wrapper7);
+        detailDto.setSysUserFamilies(sysUserFamilies);
+        //查询用户培训经历
+        LambdaQueryWrapper<SysUserTrain> wrapper8 = new LambdaQueryWrapper<>();
+        wrapper8.eq(SysUserTrain::getUserInfoId, id);
+        wrapper8.eq(SysUserTrain::getDelFlag, 0);
+        List<SysUserTrain> sysUserTrains = sysUserTrainMapper.selectList(wrapper8);
+        detailDto.setSysUserTrains(sysUserTrains);
+        //查询用户社会及行业职务
+        LambdaQueryWrapper<SysUserDuties> wrapper9 = new LambdaQueryWrapper<>();
+        wrapper9.eq(SysUserDuties::getUserInfoId, id);
+        wrapper9.eq(SysUserDuties::getDelFlag, 0);
+        List<SysUserDuties> sysUserDuties = sysUserDutiesMapper.selectList(wrapper9);
+        detailDto.setSysUserDuties(sysUserDuties);
+        //查询用户奖惩情况
+        LambdaQueryWrapper<SysUserRewards> wrapper10 = new LambdaQueryWrapper<>();
+        wrapper10.eq(SysUserRewards::getUserInfoId, id);
+        wrapper10.eq(SysUserRewards::getDelFlag, 0);
+        List<SysUserRewards> sysUserRewards = sysUserRewardsMapper.selectList(wrapper10);
+        detailDto.setSysUserRewards(sysUserRewards);
+        //查询用户工作业绩
+        LambdaQueryWrapper<SysUserAchievement> wrapper11 = new LambdaQueryWrapper<>();
+        wrapper11.eq(SysUserAchievement::getUserInfoId, id);
+        wrapper11.eq(SysUserAchievement::getDelFlag, 0);
+        List<SysUserAchievement> sysUserAchievements = sysUserAchievementMapper.selectList(wrapper11);
+        detailDto.setSysUserAchievements(sysUserAchievements);
+        //查询用户电子档案
+        LambdaQueryWrapper<SysUserArchives> wrapper12 = new LambdaQueryWrapper<>();
+        wrapper12.eq(SysUserArchives::getUserInfoId, id);
+        wrapper12.eq(SysUserArchives::getDelFlag, 0);
+        List<SysUserArchives> sysUserArchives = sysUserArchivesMapper.selectList(wrapper12);
+        detailDto.setSysUserArchives(sysUserArchives);
+        return detailDto;
+    }
 
+    /**
+     * 用户信息新增
+     * @param detailDto
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public String add (UserInfoDetailDto detailDto) {
+        //获取当前登录人信息
+        UserDTO dto = UserUtils.getCurrentUserDTO();
+        SysUserInfo sysUserInfo = new SysUserInfo();
+        BeanUtils.copyProperties(detailDto, sysUserInfo);
+        String id = UUID.randomUUID().toString().replace("-", "");
+        sysUserInfo.setId(id);
+        sysUserInfo.setCreateBy(dto.getId());
+        sysUserInfo.setCreateDate(new Date());
+        sysUserInfo.setUpdateBy(dto.getId());
+        sysUserInfo.setUpdateDate(new Date());
+        sysUserInfo.setDelFlag("0");
+        sysUserInfoMapper.insert(sysUserInfo);
+        //用户教育经历
+        if (CollectionUtils.isNotEmpty(detailDto.getSysUserEducations())) {
+            for (SysUserEducation education : detailDto.getSysUserEducations()) {
+                education.setId(UUID.randomUUID().toString().replace("-", ""));
+                education.setUserInfoId(id);
+                education.setCreateBy(dto.getId());
+                education.setCreateDate(new Date());
+                education.setUpdateBy(dto.getId());
+                education.setUpdateDate(new Date());
+                education.setDelFlag("0");
+                sysUserEducationMapper.insert(education);
+            }
+         }
+        //用户劳动关系
+        if (CollectionUtils.isNotEmpty(detailDto.getSysUserContracts())) {
+            for (SysUserContract contract : detailDto.getSysUserContracts()) {
+                contract.setId(UUID.randomUUID().toString().replace("-", ""));
+                contract.setUserInfoId(id);
+                contract.setCreateBy(dto.getId());
+                contract.setCreateDate(new Date());
+                contract.setUpdateBy(dto.getId());
+                contract.setUpdateDate(new Date());
+                contract.setDelFlag("0");
+                sysUserContractMapper.insert(contract);
+            }
+        }
+        //用户外语语种
+        if (CollectionUtils.isNotEmpty(detailDto.getSysUserLanguages())) {
+            for (SysUserLanguages languages : detailDto.getSysUserLanguages()) {
+                languages.setId(UUID.randomUUID().toString().replace("-", ""));
+                languages.setUserInfoId(id);
+                languages.setCreateBy(dto.getId());
+                languages.setCreateDate(new Date());
+                languages.setUpdateBy(dto.getId());
+                languages.setUpdateDate(new Date());
+                languages.setDelFlag("0");
+                sysUserLanguagesMapper.insert(languages);
+            }
+        }
+        //用户工作经历
+        if (CollectionUtils.isNotEmpty(detailDto.getSysUserWorks())) {
+            for (SysUserWork work : detailDto.getSysUserWorks()) {
+                work.setId(UUID.randomUUID().toString().replace("-", ""));
+                work.setUserInfoId(id);
+                work.setCreateBy(dto.getId());
+                work.setCreateDate(new Date());
+                work.setUpdateBy(dto.getId());
+                work.setUpdateDate(new Date());
+                work.setDelFlag("0");
+                sysUserWorkMapper.insert(work);
+            }
+        }
+        //用户执业资格证书
+        if (CollectionUtils.isNotEmpty(detailDto.getSysUserCertificates())) {
+            for (SysUserCertificate certificate : detailDto.getSysUserCertificates()) {
+                certificate.setId(UUID.randomUUID().toString().replace("-", ""));
+                certificate.setUserInfoId(id);
+                certificate.setCreateBy(dto.getId());
+                certificate.setCreateDate(new Date());
+                certificate.setUpdateBy(dto.getId());
+                certificate.setUpdateDate(new Date());
+                certificate.setDelFlag("0");
+                sysUserCertificateMapper.insert(certificate);
+            }
+        }
+        //用户职称
+        if (CollectionUtils.isNotEmpty(detailDto.getSysUserTitles())) {
+            for (SysUserTitle title : detailDto.getSysUserTitles()) {
+                title.setId(UUID.randomUUID().toString().replace("-", ""));
+                title.setUserInfoId(id);
+                title.setCreateBy(dto.getId());
+                title.setCreateDate(new Date());
+                title.setUpdateBy(dto.getId());
+                title.setUpdateDate(new Date());
+                title.setDelFlag("0");
+                sysUserTitleMapper.insert(title);
+            }
+        }
+        //用户家庭情况
+        if (CollectionUtils.isNotEmpty(detailDto.getSysUserFamilies())) {
+            for (SysUserFamily family : detailDto.getSysUserFamilies()) {
+                family.setId(UUID.randomUUID().toString().replace("-", ""));
+                family.setUserInfoId(id);
+                family.setCreateBy(dto.getId());
+                family.setCreateDate(new Date());
+                family.setUpdateBy(dto.getId());
+                family.setUpdateDate(new Date());
+                family.setDelFlag("0");
+                sysUserFamilyMapper.insert(family);
+            }
+        }
+        //用户培训经历
+        if (CollectionUtils.isNotEmpty(detailDto.getSysUserTrains())) {
+            for (SysUserTrain train : detailDto.getSysUserTrains()) {
+                train.setId(UUID.randomUUID().toString().replace("-", ""));
+                train.setUserInfoId(id);
+                train.setCreateBy(dto.getId());
+                train.setCreateDate(new Date());
+                train.setUpdateBy(dto.getId());
+                train.setUpdateDate(new Date());
+                train.setDelFlag("0");
+                sysUserTrainMapper.insert(train);
+            }
+        }
+        //用户社会及行业职务
+        if (CollectionUtils.isNotEmpty(detailDto.getSysUserDuties())) {
+            for (SysUserDuties duties : detailDto.getSysUserDuties()) {
+                duties.setId(UUID.randomUUID().toString().replace("-", ""));
+                duties.setUserInfoId(id);
+                duties.setCreateBy(dto.getId());
+                duties.setCreateDate(new Date());
+                duties.setUpdateBy(dto.getId());
+                duties.setUpdateDate(new Date());
+                duties.setDelFlag("0");
+                sysUserDutiesMapper.insert(duties);
+            }
+        }
+        //用户奖惩情况
+        if (CollectionUtils.isNotEmpty(detailDto.getSysUserRewards())) {
+            for (SysUserRewards rewards : detailDto.getSysUserRewards()) {
+                rewards.setId(UUID.randomUUID().toString().replace("-", ""));
+                rewards.setUserInfoId(id);
+                rewards.setCreateBy(dto.getId());
+                rewards.setCreateDate(new Date());
+                rewards.setUpdateBy(dto.getId());
+                rewards.setUpdateDate(new Date());
+                rewards.setDelFlag("0");
+                sysUserRewardsMapper.insert(rewards);
+            }
+        }
+        //用户工作业绩
+        if (CollectionUtils.isNotEmpty(detailDto.getSysUserAchievements())) {
+            for (SysUserAchievement achievement : detailDto.getSysUserAchievements()) {
+                achievement.setId(UUID.randomUUID().toString().replace("-", ""));
+                achievement.setUserInfoId(id);
+                achievement.setCreateBy(dto.getId());
+                achievement.setCreateDate(new Date());
+                achievement.setUpdateBy(dto.getId());
+                achievement.setUpdateDate(new Date());
+                achievement.setDelFlag("0");
+                sysUserAchievementMapper.insert(achievement);
+            }
+        }
+        //用户电子档案
+        if (CollectionUtils.isNotEmpty(detailDto.getSysUserArchives())) {
+            for (SysUserArchives archives : detailDto.getSysUserArchives()) {
+                archives.setId(UUID.randomUUID().toString().replace("-", ""));
+                archives.setUserInfoId(id);
+                archives.setCreateBy(dto.getId());
+                archives.setCreateDate(new Date());
+                archives.setUpdateBy(dto.getId());
+                archives.setUpdateDate(new Date());
+                archives.setDelFlag("0");
+                sysUserArchivesMapper.insert(archives);
+            }
+        }
+        return "操作成功";
+    }
 
+    /**
+     * 用户信息修改
+     * @param detailDto
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public String modify (UserInfoDetailDto detailDto) {
+        //获取当前登录人信息
+        UserDTO dto = UserUtils.getCurrentUserDTO();
+        SysUserInfo sysUserInfo = new SysUserInfo();
+        BeanUtils.copyProperties(detailDto, sysUserInfo);
+        sysUserInfo.setUpdateBy(dto.getId());
+        sysUserInfo.setUpdateDate(new Date());
+        sysUserInfoMapper.updateById(sysUserInfo);
+        //用户教育经历
+        if (CollectionUtils.isNotEmpty(detailDto.getSysUserEducations())) {
+            LambdaQueryWrapper<SysUserEducation> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(SysUserEducation::getUserInfoId, sysUserInfo.getId());
+            sysUserEducationMapper.delete(wrapper);
+            for (SysUserEducation education : detailDto.getSysUserEducations()) {
+                education.setId(UUID.randomUUID().toString().replace("-", ""));
+                education.setUserInfoId(sysUserInfo.getId());
+                education.setCreateBy(dto.getId());
+                education.setCreateDate(new Date());
+                education.setUpdateBy(dto.getId());
+                education.setUpdateDate(new Date());
+                education.setDelFlag("0");
+                sysUserEducationMapper.insert(education);
+            }
+        }
+        //用户劳动关系
+        if (CollectionUtils.isNotEmpty(detailDto.getSysUserContracts())) {
+            LambdaQueryWrapper<SysUserContract> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(SysUserContract::getUserInfoId, sysUserInfo.getId());
+            sysUserContractMapper.delete(wrapper);
+            for (SysUserContract contract : detailDto.getSysUserContracts()) {
+                contract.setId(UUID.randomUUID().toString().replace("-", ""));
+                contract.setUserInfoId(sysUserInfo.getId());
+                contract.setCreateBy(dto.getId());
+                contract.setCreateDate(new Date());
+                contract.setUpdateBy(dto.getId());
+                contract.setUpdateDate(new Date());
+                contract.setDelFlag("0");
+                sysUserContractMapper.insert(contract);
+            }
+        }
+        //用户外语语种
+        if (CollectionUtils.isNotEmpty(detailDto.getSysUserLanguages())) {
+            LambdaQueryWrapper<SysUserLanguages> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(SysUserLanguages::getUserInfoId, sysUserInfo.getId());
+            sysUserLanguagesMapper.delete(wrapper);
+            for (SysUserLanguages languages : detailDto.getSysUserLanguages()) {
+                languages.setId(UUID.randomUUID().toString().replace("-", ""));
+                languages.setUserInfoId(sysUserInfo.getId());
+                languages.setCreateBy(dto.getId());
+                languages.setCreateDate(new Date());
+                languages.setUpdateBy(dto.getId());
+                languages.setUpdateDate(new Date());
+                languages.setDelFlag("0");
+                sysUserLanguagesMapper.insert(languages);
+            }
+        }
+        //用户工作经历
+        if (CollectionUtils.isNotEmpty(detailDto.getSysUserWorks())) {
+            LambdaQueryWrapper<SysUserWork> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(SysUserWork::getUserInfoId, sysUserInfo.getId());
+            sysUserWorkMapper.delete(wrapper);
+            for (SysUserWork work : detailDto.getSysUserWorks()) {
+                work.setId(UUID.randomUUID().toString().replace("-", ""));
+                work.setUserInfoId(sysUserInfo.getId());
+                work.setCreateBy(dto.getId());
+                work.setCreateDate(new Date());
+                work.setUpdateBy(dto.getId());
+                work.setUpdateDate(new Date());
+                work.setDelFlag("0");
+                sysUserWorkMapper.insert(work);
+            }
+        }
+        //用户执业资格证书
+        if (CollectionUtils.isNotEmpty(detailDto.getSysUserCertificates())) {
+            LambdaQueryWrapper<SysUserCertificate> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(SysUserCertificate::getUserInfoId, sysUserInfo.getId());
+            sysUserCertificateMapper.delete(wrapper);
+            for (SysUserCertificate certificate : detailDto.getSysUserCertificates()) {
+                certificate.setId(UUID.randomUUID().toString().replace("-", ""));
+                certificate.setUserInfoId(sysUserInfo.getId());
+                certificate.setCreateBy(dto.getId());
+                certificate.setCreateDate(new Date());
+                certificate.setUpdateBy(dto.getId());
+                certificate.setUpdateDate(new Date());
+                certificate.setDelFlag("0");
+                sysUserCertificateMapper.insert(certificate);
+            }
+        }
+        //用户职称
+        if (CollectionUtils.isNotEmpty(detailDto.getSysUserTitles())) {
+            LambdaQueryWrapper<SysUserTitle> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(SysUserTitle::getUserInfoId, sysUserInfo.getId());
+            sysUserTitleMapper.delete(wrapper);
+            for (SysUserTitle title : detailDto.getSysUserTitles()) {
+                title.setId(UUID.randomUUID().toString().replace("-", ""));
+                title.setUserInfoId(sysUserInfo.getId());
+                title.setCreateBy(dto.getId());
+                title.setCreateDate(new Date());
+                title.setUpdateBy(dto.getId());
+                title.setUpdateDate(new Date());
+                title.setDelFlag("0");
+                sysUserTitleMapper.insert(title);
+            }
+        }
+        //用户家庭情况
+        if (CollectionUtils.isNotEmpty(detailDto.getSysUserFamilies())) {
+            LambdaQueryWrapper<SysUserFamily> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(SysUserFamily::getUserInfoId, sysUserInfo.getId());
+            sysUserFamilyMapper.delete(wrapper);
+            for (SysUserFamily family : detailDto.getSysUserFamilies()) {
+                family.setId(UUID.randomUUID().toString().replace("-", ""));
+                family.setUserInfoId(sysUserInfo.getId());
+                family.setCreateBy(dto.getId());
+                family.setCreateDate(new Date());
+                family.setUpdateBy(dto.getId());
+                family.setUpdateDate(new Date());
+                family.setDelFlag("0");
+                sysUserFamilyMapper.insert(family);
+            }
+        }
+        //用户培训经历
+        if (CollectionUtils.isNotEmpty(detailDto.getSysUserTrains())) {
+            LambdaQueryWrapper<SysUserTrain> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(SysUserTrain::getUserInfoId, sysUserInfo.getId());
+            sysUserTrainMapper.delete(wrapper);
+            for (SysUserTrain train : detailDto.getSysUserTrains()) {
+                train.setId(UUID.randomUUID().toString().replace("-", ""));
+                train.setUserInfoId(sysUserInfo.getId());
+                train.setCreateBy(dto.getId());
+                train.setCreateDate(new Date());
+                train.setUpdateBy(dto.getId());
+                train.setUpdateDate(new Date());
+                train.setDelFlag("0");
+                sysUserTrainMapper.insert(train);
+            }
+        }
+        //用户社会及行业职务
+        if (CollectionUtils.isNotEmpty(detailDto.getSysUserDuties())) {
+            LambdaQueryWrapper<SysUserDuties> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(SysUserDuties::getUserInfoId, sysUserInfo.getId());
+            sysUserDutiesMapper.delete(wrapper);
+            for (SysUserDuties duties : detailDto.getSysUserDuties()) {
+                duties.setId(UUID.randomUUID().toString().replace("-", ""));
+                duties.setUserInfoId(sysUserInfo.getId());
+                duties.setCreateBy(dto.getId());
+                duties.setCreateDate(new Date());
+                duties.setUpdateBy(dto.getId());
+                duties.setUpdateDate(new Date());
+                duties.setDelFlag("0");
+                sysUserDutiesMapper.insert(duties);
+            }
+        }
+        //用户奖惩情况
+        if (CollectionUtils.isNotEmpty(detailDto.getSysUserRewards())) {
+            LambdaQueryWrapper<SysUserRewards> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(SysUserRewards::getUserInfoId, sysUserInfo.getId());
+            sysUserRewardsMapper.delete(wrapper);
+            for (SysUserRewards rewards : detailDto.getSysUserRewards()) {
+                rewards.setId(UUID.randomUUID().toString().replace("-", ""));
+                rewards.setUserInfoId(sysUserInfo.getId());
+                rewards.setCreateBy(dto.getId());
+                rewards.setCreateDate(new Date());
+                rewards.setUpdateBy(dto.getId());
+                rewards.setUpdateDate(new Date());
+                rewards.setDelFlag("0");
+                sysUserRewardsMapper.insert(rewards);
+            }
+        }
+        //用户工作业绩
+        if (CollectionUtils.isNotEmpty(detailDto.getSysUserAchievements())) {
+            LambdaQueryWrapper<SysUserAchievement> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(SysUserAchievement::getUserInfoId, sysUserInfo.getId());
+            sysUserAchievementMapper.delete(wrapper);
+            for (SysUserAchievement achievement : detailDto.getSysUserAchievements()) {
+                achievement.setId(UUID.randomUUID().toString().replace("-", ""));
+                achievement.setUserInfoId(sysUserInfo.getId());
+                achievement.setCreateBy(dto.getId());
+                achievement.setCreateDate(new Date());
+                achievement.setUpdateBy(dto.getId());
+                achievement.setUpdateDate(new Date());
+                achievement.setDelFlag("0");
+                sysUserAchievementMapper.insert(achievement);
+            }
+        }
+        //用户电子档案
+        if (CollectionUtils.isNotEmpty(detailDto.getSysUserArchives())) {
+            LambdaQueryWrapper<SysUserArchives> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(SysUserArchives::getUserInfoId, sysUserInfo.getId());
+            sysUserArchivesMapper.delete(wrapper);
+            for (SysUserArchives archives : detailDto.getSysUserArchives()) {
+                archives.setId(UUID.randomUUID().toString().replace("-", ""));
+                archives.setUserInfoId(sysUserInfo.getId());
+                archives.setCreateBy(dto.getId());
+                archives.setCreateDate(new Date());
+                archives.setUpdateBy(dto.getId());
+                archives.setUpdateDate(new Date());
+                archives.setDelFlag("0");
+                sysUserArchivesMapper.insert(archives);
+            }
+        }
+        return "操作成功";
+    }
 }