Merge remote-tracking branch 'origin/dev' into dev

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

@@ -48,4 +48,8 @@ public class AppUserPositionTempDTO {
     @ApiModelProperty(value = "是否删除：0-正常；1-删除")
     private Integer isDel;
 
+    @ApiModelProperty(value = "用户id")
+    private Integer userId;
+
+
 }

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

@@ -39,6 +39,7 @@ public class AppUserPositionChangeRecordBiz extends BaseBiz<AppUserPositionChang
     public static final int POSITION_CHANGE = 3;
     public static final int COMPANY_CHANGE = 4;
     public static final int USER_LEAVE_COMPANT = 5;
+    public static final int USER_AND_ADD_COMPANY=6;
 
     /**
      * 变更记录表插入
@@ -100,6 +101,27 @@ public class AppUserPositionChangeRecordBiz extends BaseBiz<AppUserPositionChang
         mapper.insert(appUserPositionChangeRecord);
     }
 
+    /**
+     * 员工复职
+     * @param userPositionTemp
+     * @param updUserId
+     */
+    public void andAddJoinJobRecord(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_AND_ADD_COMPANY);
+        appUserPositionChangeRecord.setOperatorId(updUserId);
+        mapper.insert(appUserPositionChangeRecord);
+    }
+
+
+
+
+
+
     /**
      * 查询新旧职位名称
      * zyh

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

@@ -397,26 +397,43 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         //2:人事变动(更换职位、身份)：需要删除记录后再新增一条记录
         //3：修改所属公司 直接修改即可
         //4：离职
-        if (changeStatus.equals(POSITION_CHANGE)||changeStatus.equals(JOB_CHANGE)) {
+        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());
+            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());
+            appUserPositionChangeRecordBiz.addPositionChangeRecord(userPositionTemp, oldData, operatorId, appUserPositionTempDTO.getRelTime());
         } else {
             userPositionTemp.setUpdTime(nowTime);
             updateSelectiveById(userPositionTemp);
-            appUserPositionChangeRecordBiz.addPositionChangeRecord(userPositionTemp, oldData, operatorId,appUserPositionTempDTO.getRelTime());
+            appUserPositionChangeRecordBiz.addPositionChangeRecord(userPositionTemp, oldData, operatorId, appUserPositionTempDTO.getRelTime());
         }
         return ObjectRestResponse.succ();
     }
 
+    /**
+     * 员工复职
+     */
+    public ObjectRestResponse andAddUserPositionChangeRecord(AppUserPositionTempDTO appUserPositionTempDTO, Integer operatorId) {
+        if (appUserPositionTempDTO == null || StringUtils.isBlank(appUserPositionTempDTO.getPhone()) || StringUtils.isBlank(appUserPositionTempDTO.getName())
+        ) {
+            return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "参数不能为空");
+        }
+        AppUserPositionTemp userPositionTemp = new AppUserPositionTemp();
+        BeanUtils.copyProperties(appUserPositionTempDTO, userPositionTemp);
+        updateSelectiveById(userPositionTemp);
+        userPositionTemp.setUpdTime(System.currentTimeMillis());
+        appUserPositionChangeRecordBiz.andAddJoinJobRecord(appUserPositionTempDTO, operatorId);
+        return ObjectRestResponse.succ();
+    }
+
+
     /**
      * 查询员工信息变更记录表
      */

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

@@ -52,7 +52,6 @@ public class AppUserPositionController {
     private UserAuthConfig userAuthConfig;
 
 
-
     @GetMapping("/jobs")
     public ObjectRestResponse findAllJobs() {
         return ObjectRestResponse.succ(jobLevelBiz.selectListAll());
@@ -80,7 +79,7 @@ public class AppUserPositionController {
     public ObjectRestResponse<Void> addUserPostion(@RequestBody AppUserPositionTempDTO appUserPositionTempDTO, HttpServletRequest request) {
         try {
             IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request));
-            Integer s=  Integer.valueOf(infoFromToken.getId());
+            Integer s = Integer.valueOf(infoFromToken.getId());
             return appUserPositionTempBiz.add(appUserPositionTempDTO, Integer.valueOf(infoFromToken.getId()));
         } catch (Exception e) {
             log.error("新增失败【{}】", e);
@@ -132,6 +131,21 @@ public class AppUserPositionController {
         return ObjectRestResponse.succ(appUserPositionTempBiz.findPositionChangeRecord(appUserPositionTemp));
     }
 
+    /**
+     * 员工复职位
+     */
+    @GetMapping("/updAddPositionChangeRecord")
+    public ObjectRestResponse updAddPositionChangeRecord(@RequestBody AppUserPositionTempDTO appUserPositionTempDTO, HttpServletRequest request) {
+        try {
+            IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request));
+            Integer operatorId = Integer.valueOf(infoFromToken.getId());
+            appUserPositionTempBiz.andAddUserPositionChangeRecord(appUserPositionTempDTO,operatorId);
+            return ObjectRestResponse.succ();
+        } catch (Exception e) {
+            log.error("修改失败【{}】", e);
+            throw new BaseException("修改失败");
+        }
+    }
 
     /**
      * 批量导入