Merge branch 'feature-emploee-upd' into dev

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

@@ -26,8 +26,7 @@ public class AppUserPositionTempDTO {
     @ApiModelProperty(value = "姓名")
     private String name;
 
-
-    @ApiModelProperty(value = "身份id")
+   @ApiModelProperty(value = "身份id")
     private Integer positionId;
 
     @ApiModelProperty(value = "员工职位id")
@@ -48,6 +47,9 @@ public class AppUserPositionTempDTO {
     @ApiModelProperty(value = "是否删除：0-正常；1-删除")
     private Integer isDel;
 
+    @ApiModelProperty(value = "员工职位状态：0-正常；1-离职")
+    private Integer isQuit;
+
     @ApiModelProperty(value = "用户id")
     private Integer userId;
 

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

@@ -76,4 +76,8 @@ public class AppUserPositionTemp implements Serializable {
     private Integer isDel;
 
 
+    @Column(name = "is_quit")
+    @ApiModelProperty(value = "员工职位状态：0-正常；1-离职")
+    private Integer isQuit;
+
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/AppUserPositionTempVo.java

@@ -51,4 +51,7 @@ public class AppUserPositionTempVo {
 
     @ApiModelProperty(value = "分公司名称")
     private String companyName;
+
+  @ApiModelProperty(value = "员工职位状态 0：在职 1：离职")
+    private Integer idQuit;
 }

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

@@ -49,7 +49,7 @@ public class AppUserPositionChangeRecordBiz extends BaseBiz<AppUserPositionChang
     public void addPositionChangeRecord(AppUserPositionTemp userPositionTemp, AppUserPositionTemp oldData, Integer operatorId, Timestamp relTime) {
         AppUserPositionChangeRecord appUserPositionChangeRecord = new AppUserPositionChangeRecord();
 
-        if (!(userPositionTemp.getIsDel().equals(oldData.getIsDel()))) {
+        if (!(userPositionTemp.getIsQuit().equals(oldData.getIsQuit()))) {
             appUserPositionChangeRecord.setJobRemark(USER_LEAVE_COMPANT);
         }
 

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

@@ -168,6 +168,7 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
             String jobName = jobMap == null ? "" : jobMap.get(appUserPositionTemp.getJobId()) == null ? "" : jobMap.get(appUserPositionTemp.getJobId()).getName();
             appUserPositionTempVo.setPositionName(postionName);
             appUserPositionTempVo.setJobName(jobName);
+            appUserPositionTempVo.setIdQuit(appUserPositionTemp.getIsQuit());
             appUserPositionTempVo.setStatus(appUserPositionTemp.getUserId() == null ? DataStatus.NO_USERED.code : appUserPositionTemp.getUserId() == 0 ? DataStatus.NO_USERED.code : DataStatus.USERED.code);
             appUserPositionTempVos.add(appUserPositionTempVo);
         }
@@ -421,8 +422,7 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
      * 员工复职
      */
     public ObjectRestResponse andAddUserPositionChangeRecord(AppUserPositionTempDTO appUserPositionTempDTO, Integer operatorId) {
-        if (appUserPositionTempDTO == null || StringUtils.isBlank(appUserPositionTempDTO.getPhone()) || StringUtils.isBlank(appUserPositionTempDTO.getName())
-        ) {
+        if (appUserPositionTempDTO == null || StringUtils.isBlank(appUserPositionTempDTO.getPhone())) {
             return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "参数不能为空");
         }
         AppUserPositionTemp userPositionTemp = new AppUserPositionTemp();