Merge branch 'feature-emploee-upd' into dev

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserPositionChangeRecordDTO.java

+package com.github.wxiaoqi.security.admin.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.sql.Timestamp;
+
+/**
+ * 员工变更记录表
+ */
+@Data
+public class AppUserPositionChangeRecordDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    private Integer id;
+
+    /**
+     * 用户id
+     */
+    private String phone;
+
+    /**
+     * 用户名称
+     */
+    private String userName;
+
+    /**
+     * 变更后所在公司ID
+     */
+    private Integer newCompanyId;
+
+    /**
+     * 变更前所在公司ID
+     */
+    private Integer oldCompanyId;
+
+    /**
+     * 变更后所在公司名称
+     */
+    private String newCompanyName;
+
+    /**
+     * 变更前所在公司名称
+     */
+
+    private String oldCompanyName;
+
+    /**
+     * 旧职位ID
+     */
+    private Integer oldJobId;
+
+    /**
+     * 新职位ID
+     */
+    private Integer newJobId;
+
+    /**
+     * 新职位名称
+     */
+    private String newJobName;
+
+    /**
+     * 旧职位名称
+     */
+    private String oldJobName;
+
+    /**
+     * 操作人名称
+     */
+    private Integer operatorId;
+
+    /**
+     * 操作时间
+     */
+    private Timestamp crtTime;
+
+    /**
+     * 状态
+     * 1:入职；2：职位变更；3：身份变更 4：公司所属变更；5离职
+     */
+    private Integer jobRemark;
+
+    /***
+     * 旧身份ID
+     */
+    private Integer oldPositionId;
+
+    /***
+     * 新身份ID
+     */
+    private Integer newPositionId;
+
+    /***
+     * 新身份名称
+     */
+    private String newPositionName;
+
+    /***
+     * 旧身份名称
+     */
+    private String oldPositionName;
+
+    /**
+     * 员工职位、所属公司、离职、入职等的实际上任时间
+     */
+    private Timestamp relTime;
+}

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserPositionTempDTO.java

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Builder;
 import lombok.Data;
 
+import java.sql.Timestamp;
+
 /**
  * @author libin
  * @version 1.0
@@ -37,4 +39,13 @@ public class AppUserPositionTempDTO {
     @ApiModelProperty(value = "分公司")
     private String companyName;
 
+    @ApiModelProperty(value = "变动操作内容")
+    private Integer ChangeStatus;
+
+    @ApiModelProperty(value = "员工职位、所属公司、离职、入职等的实际上任时间")
+    private Timestamp relTime;
+
+    @ApiModelProperty(value = "是否删除：0-正常；1-删除")
+    private Integer isDel;
+
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/AppUserPositionChangeRecord.java

+package com.github.wxiaoqi.security.admin.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.sql.Timestamp;
+import java.util.Date;
+
+/**
+ * 员工变更记录表
+ */
+@Table(name = "app_user_position_change_record")
+@Data
+public class AppUserPositionChangeRecord implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @Id
+    @GeneratedValue(generator = "JDBC")//此处加上注解
+    @ApiModelProperty("主键id")
+    private Integer id;
+
+    @ApiModelProperty("用户id")
+    @Column(name = "phone")
+    private String phone;
+
+    @ApiModelProperty("用户名称")
+    @Column(name = "user_name")
+    private String userName;
+
+    @ApiModelProperty("变更后所在公司ID")
+    @Column(name = "new_company_id")
+    private Integer newCompanyId;
+
+    @ApiModelProperty("变更前所在公司ID")
+    @Column(name = "old_company_id")
+    private Integer oldCompanyId;
+
+    @ApiModelProperty("变更后所在公司名称")
+    @Column(name = "new_company_name")
+    private String newCompanyName;
+
+    @ApiModelProperty("变更前所在公司名称")
+    @Column(name = "old_company_name")
+    private String oldCompanyName;
+
+    @ApiModelProperty("旧职位ID")
+    @Column(name = "old_job_id")
+    private Integer oldJobId;
+
+    @ApiModelProperty("新职位ID")
+    @Column(name = "new_job_id")
+    private Integer newJobId;
+
+    @ApiModelProperty("操作人名称")
+    @Column(name = "operator_id")
+    private Integer operatorId;
+
+    @ApiModelProperty("操作时间")
+    @Column(name = "crt_time")
+    private Timestamp crtTime;
+
+    @ApiModelProperty("员工职位、所属公司、离职、入职等的实际上任时间")
+    @Column(name = "rel_time")
+    private Timestamp relTime;
+
+    @ApiModelProperty("新身份ID")
+    @Column(name = "new_position_id")
+    private Integer newPositionId;
+
+    @ApiModelProperty("旧身份ID")
+    @Column(name = "old_position_id")
+    private Integer oldPositionId;
+
+    @ApiModelProperty("1:入职；2：职位变更；3：身份变更 4：公司所属变更；5离职")
+    @Column(name = "job_remark")
+    private Integer jobRemark;
+
+    @ApiModelProperty("新身份名称")
+    @Column(name = "new_position_name")
+    private String newPositionName;
+
+    @ApiModelProperty("旧身份名称")
+    @Column(name = "old_position_name")
+    private String oldPositionName;
+
+    @ApiModelProperty("新职位名称")
+    @Column(name = "new_job_name")
+    private String newJobName;
+
+    @ApiModelProperty("旧职位名称")
+    @Column(name = "old_job_name")
+    private String oldJobName;
+
+
+
+}

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserPositionChangeRecordBiz.java

+package com.github.wxiaoqi.security.admin.biz;
+
+
+import com.alibaba.druid.sql.visitor.functions.If;
+import com.github.wxiaoqi.security.admin.dto.AppUserPositionChangeRecordDTO;
+import com.github.wxiaoqi.security.admin.dto.AppUserPositionTempDTO;
+import com.github.wxiaoqi.security.admin.entity.AppUserPosition;
+import com.github.wxiaoqi.security.admin.entity.AppUserPositionChangeRecord;
+import com.github.wxiaoqi.security.admin.entity.AppUserPositionTemp;
+import com.github.wxiaoqi.security.admin.mapper.AppUserPositionChangeRecordMapper;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import org.apache.commons.lang3.StringUtils;
+import org.jsoup.select.Evaluator;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import tk.mybatis.mapper.entity.Example;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@Transactional
+@Service("appUserPositionChangeRecordBiz")
+public class AppUserPositionChangeRecordBiz extends BaseBiz<AppUserPositionChangeRecordMapper, AppUserPositionChangeRecord> {
+
+
+    @Autowired
+    private AppUserPositionBiz appUserPositionBiz;
+
+    @Autowired
+    private AppUserJobLevelBiz appUserJobLevelBiz;
+
+    public static final int USER_ADD_COMPANY = 1;
+    public static final int JOB_CHANGE = 2;
+    public static final int POSITION_CHANGE = 3;
+    public static final int COMPANY_CHANGE = 4;
+    public static final int USER_LEAVE_COMPANT = 5;
+
+    /**
+     * 变更记录表插入
+     *
+     * @param userPositionTemp
+     */
+    public void addPositionChangeRecord(AppUserPositionTemp userPositionTemp, AppUserPositionTemp oldData, Integer operatorId, Timestamp relTime) {
+        AppUserPositionChangeRecord appUserPositionChangeRecord = new AppUserPositionChangeRecord();
+
+        if (!(userPositionTemp.getIsDel().equals(oldData.getIsDel()))) {
+            appUserPositionChangeRecord.setJobRemark(USER_LEAVE_COMPANT);
+        }
+
+        //状态1：职位变动
+        if (!(userPositionTemp.getJobId().equals(oldData.getJobId()))) {
+            appUserPositionChangeRecord.setOldJobId(oldData.getJobId());
+            appUserPositionChangeRecord.setNewJobId(userPositionTemp.getJobId());
+            appUserPositionChangeRecord.setJobRemark(JOB_CHANGE);
+            findUserJobName(appUserPositionChangeRecord);
+        }
+        //状态2：身份变动
+        if (!(userPositionTemp.getPositionId().equals(oldData.getPositionId()))) {
+            appUserPositionChangeRecord.setOldPositionId(oldData.getPositionId());
+            appUserPositionChangeRecord.setNewPositionId(userPositionTemp.getPositionId());
+            appUserPositionChangeRecord.setJobRemark(POSITION_CHANGE);
+            findUserPositionName(appUserPositionChangeRecord);
+        }
+        //状态3：公司变动调整
+        if (!(userPositionTemp.getCompanyId().equals(oldData.getCompanyId()))) {
+            appUserPositionChangeRecord.setOldCompanyId(oldData.getCompanyId());
+            appUserPositionChangeRecord.setOldCompanyName(oldData.getCompanyName());
+            appUserPositionChangeRecord.setNewCompanyId(userPositionTemp.getCompanyId());
+            appUserPositionChangeRecord.setNewCompanyName(userPositionTemp.getCompanyName());
+            appUserPositionChangeRecord.setJobRemark(COMPANY_CHANGE);
+        }
+
+        appUserPositionChangeRecord.setPhone(userPositionTemp.getPhone());
+        appUserPositionChangeRecord.setRelTime(relTime);
+        appUserPositionChangeRecord.setUserName(userPositionTemp.getName());
+        appUserPositionChangeRecord.setCrtTime(new Timestamp(System.currentTimeMillis()));
+        appUserPositionChangeRecord.setOperatorId(operatorId);
+        mapper.insert(appUserPositionChangeRecord);
+    }
+
+    /**
+     * 入职时插入记录表
+     *
+     * @param userPositionTemp
+     * @param updUserId
+     */
+    public void addJoinJobRecord(AppUserPositionTempDTO userPositionTemp, Integer updUserId) {
+        AppUserPositionChangeRecord appUserPositionChangeRecord = new AppUserPositionChangeRecord();
+        appUserPositionChangeRecord.setPhone(userPositionTemp.getPhone());
+        appUserPositionChangeRecord.setUserName(userPositionTemp.getName());
+        appUserPositionChangeRecord.setRelTime(userPositionTemp.getRelTime());
+        appUserPositionChangeRecord.setCrtTime(new Timestamp(System.currentTimeMillis()));
+        appUserPositionChangeRecord.setJobRemark(USER_ADD_COMPANY);
+        appUserPositionChangeRecord.setOperatorId(updUserId);
+        mapper.insert(appUserPositionChangeRecord);
+    }
+
+    /**
+     * 查询新旧职位名称
+     * zyh
+     *
+     * @param appUserPositionChangeRecord
+     * @return
+     */
+
+    public AppUserPositionChangeRecord findUserJobName(AppUserPositionChangeRecord appUserPositionChangeRecord) {
+        appUserPositionChangeRecord.setNewJobName(appUserJobLevelBiz.selectById(appUserPositionChangeRecord.getNewJobId()).getName());
+        appUserPositionChangeRecord.setOldJobName(appUserJobLevelBiz.selectById(appUserPositionChangeRecord.getOldJobId()).getName());
+        return appUserPositionChangeRecord;
+    }
+
+    /**
+     * 查询新旧身份名称
+     * zyh
+     *
+     * @param appUserPositionChangeRecord
+     * @return
+     */
+    public AppUserPositionChangeRecord findUserPositionName(AppUserPositionChangeRecord appUserPositionChangeRecord) {
+        appUserPositionChangeRecord.setOldPositionName(appUserPositionBiz.selectById(appUserPositionChangeRecord.getOldPositionId()).getName());
+        appUserPositionChangeRecord.setNewPositionName(appUserPositionBiz.selectById(appUserPositionChangeRecord.getNewPositionId()).getName());
+        return appUserPositionChangeRecord;
+    }
+
+
+    /**
+     * 查询员工信息变更记录表
+     */
+    public List<AppUserPositionChangeRecordDTO> findPositionChangeRecord(AppUserPositionTemp userPositionTemp) {
+        Example example = new Example(AppUserPositionChangeRecord.class);
+        example.createCriteria().andEqualTo("phone", userPositionTemp.getPhone());
+        List<AppUserPositionChangeRecord> list = selectByExample(example);
+        List<AppUserPositionChangeRecordDTO> listAppUserPositionChangeRecordDTO = new ArrayList<>();
+        list.stream().forEach(x -> {
+            AppUserPositionChangeRecordDTO appUserPositionChangeRecordDTO = new AppUserPositionChangeRecordDTO();
+            BeanUtils.copyProperties(x, appUserPositionChangeRecordDTO);
+            listAppUserPositionChangeRecordDTO.add(appUserPositionChangeRecordDTO);
+        });
+        return listAppUserPositionChangeRecordDTO;
+    }
+}

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserPositionTempBiz.java

 package com.github.wxiaoqi.security.admin.biz;
 
+import com.github.wxiaoqi.security.admin.dto.AppUserPositionChangeRecordDTO;
 import com.github.wxiaoqi.security.admin.dto.AppUserPositionTempDTO;
 import com.github.wxiaoqi.security.admin.dto.AppUserPositionTempFindDTO;
 import com.github.wxiaoqi.security.admin.entity.AppUserJobLevel;
@@ -32,6 +33,8 @@ import java.time.Instant;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.github.wxiaoqi.security.admin.biz.AppUserPositionChangeRecordBiz.*;
+
 
 /**
  * 用户身份职位表
@@ -63,8 +66,10 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
     @Autowired
     AppUserJobLevelBiz jobLevelBiz;
 
+    @Autowired
+    AppUserPositionChangeRecordBiz appUserPositionChangeRecordBiz;
 
-    public ObjectRestResponse add(AppUserPositionTempDTO appUserPositionTempDTO) {
+    public ObjectRestResponse add(AppUserPositionTempDTO appUserPositionTempDTO, Integer updUserId) {
         if (appUserPositionTempDTO == null || StringUtils.isBlank(appUserPositionTempDTO.getPhone()) || StringUtils.isBlank(appUserPositionTempDTO.getName())
                 || appUserPositionTempDTO.getPositionId() == null || appUserPositionTempDTO.getPositionId() == 0) {
             return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "参数不能为空");
@@ -106,6 +111,8 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         if (userId != 0) {
             detailBiz.updateUserPositionByUserId(userId, appUserPositionTempDTO.getPositionId());
         }
+        //记录表插入
+        appUserPositionChangeRecordBiz.addJoinJobRecord(appUserPositionTempDTO, updUserId);
         return ObjectRestResponse.succ();
     }
 
@@ -164,7 +171,6 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
             appUserPositionTempVo.setStatus(appUserPositionTemp.getUserId() == null ? DataStatus.NO_USERED.code : appUserPositionTemp.getUserId() == 0 ? DataStatus.NO_USERED.code : DataStatus.USERED.code);
             appUserPositionTempVos.add(appUserPositionTempVo);
         }
-
         dataVO.setData(appUserPositionTempVos);
         dataVO.setPageSize(pageDataVO.getPageSize());
         dataVO.setPageNum(pageDataVO.getPageNum());
@@ -361,6 +367,62 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
 
 
     public List<Integer> getUserIdByParentCompany(List<Integer> parentCompanyId) {
-       return mapper.getUserIdByParentCompany(parentCompanyId);
+        return mapper.getUserIdByParentCompany(parentCompanyId);
+    }
+
+
+    /**
+     * 员工信息修改，插入变更记录表
+     * zuoyh
+     *
+     * @param changeStatus
+     * @param appUserPositionTempDTO
+     * @return
+     */
+    public ObjectRestResponse addUserPositionChangeRecord(Integer changeStatus, AppUserPositionTempDTO appUserPositionTempDTO, Integer operatorId) {
+
+        if (changeStatus == null) {
+            return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "操作类型参数不能为空");
+        }
+        if (appUserPositionTempDTO == null || StringUtils.isBlank(appUserPositionTempDTO.getPhone()) || StringUtils.isBlank(appUserPositionTempDTO.getName())
+                || appUserPositionTempDTO.getPositionId() == null || appUserPositionTempDTO.getPositionId() == 0 || appUserPositionTempDTO.getCompanyId() == null) {
+            return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "参数不能为空");
+        }
+        AppUserPositionTemp userPositionTemp = new AppUserPositionTemp();
+        Example example = new Example(AppUserPositionTemp.class);
+        example.createCriteria().andEqualTo("id", appUserPositionTempDTO.getId());
+        BeanUtils.copyProperties(appUserPositionTempDTO, userPositionTemp);
+        AppUserPositionTemp oldData = selectById(appUserPositionTempDTO.getId());
+        Long nowTime = System.currentTimeMillis();
+        //2:人事变动(更换职位、身份)：需要删除记录后再新增一条记录
+        //3：修改所属公司 直接修改即可
+        //4：离职
+        if (changeStatus.equals(POSITION_CHANGE)||changeStatus.equals(JOB_CHANGE)) {
+            mapper.deleteByExample(example);
+            userPositionTemp.setCrtTime(nowTime);
+            userPositionTemp.setUpdTime(nowTime);
+            insertSelective(userPositionTemp);
+            //变更记录表插入
+            appUserPositionChangeRecordBiz.addPositionChangeRecord(userPositionTemp, oldData, operatorId,appUserPositionTempDTO.getRelTime());
+        } else if (changeStatus.equals(COMPANY_CHANGE)) {
+            userPositionTemp.setUpdTime(nowTime);
+            updateSelectiveById(userPositionTemp);
+            //变更记录表插入
+            appUserPositionChangeRecordBiz.addPositionChangeRecord(userPositionTemp, oldData, operatorId,appUserPositionTempDTO.getRelTime());
+        } else {
+            userPositionTemp.setUpdTime(nowTime);
+            updateSelectiveById(userPositionTemp);
+            appUserPositionChangeRecordBiz.addPositionChangeRecord(userPositionTemp, oldData, operatorId,appUserPositionTempDTO.getRelTime());
+        }
+        return ObjectRestResponse.succ();
     }
+
+    /**
+     * 查询员工信息变更记录表
+     */
+
+    public List<AppUserPositionChangeRecordDTO> findPositionChangeRecord(AppUserPositionTemp userPositionTemp) {
+        return appUserPositionChangeRecordBiz.findPositionChangeRecord(userPositionTemp);
+    }
+
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppUserPositionChangeRecordMapper.java

+package com.github.wxiaoqi.security.admin.mapper;
+
+import com.github.wxiaoqi.security.admin.entity.AppUserPositionChangeRecord;
+import tk.mybatis.mapper.common.Mapper;
+
+public interface AppUserPositionChangeRecordMapper extends Mapper<AppUserPositionChangeRecord> {
+}

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/admin/AppUserPositionController.java

@@ -6,15 +6,22 @@ import com.github.wxiaoqi.security.admin.biz.AppUserPositionTempBiz;
 import com.github.wxiaoqi.security.admin.dto.AppUserPositionTempDTO;
 import com.github.wxiaoqi.security.admin.dto.AppUserPositionTempFindDTO;
 import com.github.wxiaoqi.security.admin.dto.UserPostionDTO;
+import com.github.wxiaoqi.security.admin.entity.AppUserPositionTemp;
 import com.github.wxiaoqi.security.admin.vo.AppUserPositionTempVo;
 import com.github.wxiaoqi.security.admin.vo.WalletPostionVo;
+import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
+import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
+import com.github.wxiaoqi.security.auth.common.util.jwt.IJWTInfo;
+import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.excel.ExcelImport;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
 
@@ -24,6 +31,7 @@ import java.util.Map;
  * @description
  * @data 2019/7/17 16:13
  */
+@Slf4j
 @RestController
 @RequestMapping("/postion/admin")
 public class AppUserPositionController {
@@ -37,8 +45,16 @@ public class AppUserPositionController {
     @Autowired
     private AppUserPositionTempBiz appUserPositionTempBiz;
 
+    @Autowired
+    private UserAuthUtil userAuthUtil;
+
+    @Autowired
+    private UserAuthConfig userAuthConfig;
+
+
+
     @GetMapping("/jobs")
-    public ObjectRestResponse  findAllJobs() {
+    public ObjectRestResponse findAllJobs() {
         return ObjectRestResponse.succ(jobLevelBiz.selectListAll());
     }
 
@@ -57,11 +73,19 @@ public class AppUserPositionController {
 
     /**
      * 新增或编辑身份信息
+     *
      * @return
      */
     @PostMapping("/addUserPostion")
-    public ObjectRestResponse<Void> addUserPostion(@RequestBody AppUserPositionTempDTO appUserPositionTempDTO){
-        return appUserPositionTempBiz.add(appUserPositionTempDTO);
+    public ObjectRestResponse<Void> addUserPostion(@RequestBody AppUserPositionTempDTO appUserPositionTempDTO, HttpServletRequest request) {
+        try {
+            IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request));
+            Integer s=  Integer.valueOf(infoFromToken.getId());
+            return appUserPositionTempBiz.add(appUserPositionTempDTO, Integer.valueOf(infoFromToken.getId()));
+        } catch (Exception e) {
+            log.error("新增失败【{}】", e);
+            throw new BaseException("新增失败");
+        }
     }
 
     /**
@@ -77,51 +101,88 @@ public class AppUserPositionController {
 
     /**
      * 新增或编辑身份信息
+     *
      * @return
      */
     @PostMapping("/updUserPostion")
-    public ObjectRestResponse<Void> updUserPostion(@RequestBody AppUserPositionTempDTO appUserPositionTempDTO){
+    public ObjectRestResponse<Void> updUserPostion(@RequestBody AppUserPositionTempDTO appUserPositionTempDTO, HttpServletRequest request) {
+        try {
+            IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request));
+            return appUserPositionTempBiz.add(appUserPositionTempDTO, Integer.valueOf(infoFromToken.getId()));
+        } catch (Exception e) {
+            log.error("修改失败【{}】", e);
+            throw new BaseException("修改失败");
+        }
+    }
+
+    /**
+     * 员工信息更改,并插入变更记录表
+     * zuoyh
+     *
+     * @return
+     */
+    @PostMapping("/updUserChange")
+    public ObjectRestResponse<Void> updUserChange(@RequestBody AppUserPositionTempDTO appUserPositionTempDTO, HttpServletRequest request) {
+        try {
+            IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request));
+            Integer operatorId = Integer.valueOf(infoFromToken.getId());
+            appUserPositionTempBiz.addUserPositionChangeRecord(appUserPositionTempDTO.getChangeStatus(), appUserPositionTempDTO, operatorId);
+            return ObjectRestResponse.succ();
+        } catch (Exception e) {
+            log.error("修改失败【{}】", e);
+            throw new BaseException("修改失败");
+        }
 
-        return appUserPositionTempBiz.add(appUserPositionTempDTO);
     }
 
+    /**
+     * 查询员工信息变更记录表
+     */
+    @GetMapping("/findPositionChangeRecord")
+    public ObjectRestResponse findPositionChangeRecord(AppUserPositionTemp appUserPositionTemp) {
+        return ObjectRestResponse.succ(appUserPositionTempBiz.findPositionChangeRecord(appUserPositionTemp));
+    }
+
+
     /**
      * 批量导入
+     *
      * @param userPostionExcel
      * @return
      */
     @PostMapping("/excel/import")
-    public ObjectRestResponse<Map<String,Object>> importUserPostion(@RequestPart("file") MultipartFile userPostionExcel) {
+    public ObjectRestResponse<Map<String, Object>> importUserPostion(@RequestPart("file") MultipartFile userPostionExcel) {
         List<String[]> userPostionData = ExcelImport.getExcelData(userPostionExcel);
         if (userPostionData.size() < 2) {
             return ObjectRestResponse.createFailedResult(1001, "导入不能没数据！！！");
         }
         userPostionData.remove(0);
-        Map<String,Object> result = appUserPositionTempBiz.importUserPostion(userPostionData);
+        Map<String, Object> result = appUserPositionTempBiz.importUserPostion(userPostionData);
         return ObjectRestResponse.succ(result);
     }
 
     /**
      * 删除
+     *
      * @param id
      * @return
      */
     @DeleteMapping("/{id}")
-    public ObjectRestResponse<Void> deleteUserPostion(@PathVariable(value = "id") Integer id){
-        appUserPositionTempBiz.updateAppuserPostionStatusById(id,1);
+    public ObjectRestResponse<Void> deleteUserPostion(@PathVariable(value = "id") Integer id) {
+        appUserPositionTempBiz.updateAppuserPostionStatusById(id, 1);
         return ObjectRestResponse.succ();
     }
 
     @PostMapping("/page")
-    public ObjectRestResponse<PageDataVO<AppUserPositionTempVo>> findWithPage(@RequestBody AppUserPositionTempFindDTO appUserPositionTempFindDTO){
-       PageDataVO<AppUserPositionTempVo>  dataVO =  appUserPositionTempBiz.findWithPage(appUserPositionTempFindDTO);
-       return ObjectRestResponse.succ(dataVO);
+    public ObjectRestResponse<PageDataVO<AppUserPositionTempVo>> findWithPage(@RequestBody AppUserPositionTempFindDTO appUserPositionTempFindDTO) {
+        PageDataVO<AppUserPositionTempVo> dataVO = appUserPositionTempBiz.findWithPage(appUserPositionTempFindDTO);
+        return ObjectRestResponse.succ(dataVO);
     }
 
 
     @GetMapping("/userid")
-    public List<Integer> getUserIdByParentCompany(@RequestParam("parentCompanyId") List<Integer> parentCompanyId){
-     return appUserPositionTempBiz.getUserIdByParentCompany(parentCompanyId);
+    public List<Integer> getUserIdByParentCompany(@RequestParam("parentCompanyId") List<Integer> parentCompanyId) {
+        return appUserPositionTempBiz.getUserIdByParentCompany(parentCompanyId);
     }
 
 }