股東表插入、查詢

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

@@ -19,7 +19,7 @@ public class AppUserPositionChangeRecordDTO implements Serializable {
     private Integer id;
 
     /**
-     * 用户id
+     * 用户手机号
      */
     private String phone;
 
@@ -109,4 +109,9 @@ public class AppUserPositionChangeRecordDTO implements Serializable {
      * 员工职位、所属公司、离职、入职等的实际上任时间
      */
     private Timestamp relTime;
+
+    /**
+     * 用户id
+     */
+    private Integer userId;
 }

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

@@ -24,6 +24,10 @@ public class AppUserPositionChangeRecord implements Serializable {
     private Integer id;
 
     @ApiModelProperty("用户id")
+    @Column(name = "user_id")
+    private Integer userId;
+
+    @ApiModelProperty("员工手机号")
     @Column(name = "phone")
     private String phone;
 

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

@@ -77,6 +77,7 @@ public class AppUserPositionChangeRecordBiz extends BaseBiz<AppUserPositionChang
             appUserPositionChangeRecord.setJobRemark(COMPANY_CHANGE);
         }
 
+        appUserPositionChangeRecord.setUserId(userPositionTemp.getId());
         appUserPositionChangeRecord.setPhone(userPositionTemp.getPhone());
         appUserPositionChangeRecord.setRelTime(relTime);
         appUserPositionChangeRecord.setUserName(userPositionTemp.getName());
@@ -99,6 +100,7 @@ public class AppUserPositionChangeRecordBiz extends BaseBiz<AppUserPositionChang
         appUserPositionChangeRecord.setCrtTime(new Timestamp(System.currentTimeMillis()));
         appUserPositionChangeRecord.setJobRemark(USER_ADD_COMPANY);
         appUserPositionChangeRecord.setOperatorId(updUserId);
+        appUserPositionChangeRecord.setUserId(userPositionTemp.getId());
         mapper.insert(appUserPositionChangeRecord);
     }
 
@@ -176,6 +178,9 @@ public class AppUserPositionChangeRecordBiz extends BaseBiz<AppUserPositionChang
     public List<AppUserPositionChangeRecordDTO> findPositionChangeRecord(AppUserPositionTemp userPositionTemp) {
         Example example = new Example(AppUserPositionChangeRecord.class);
         example.createCriteria().andEqualTo("phone", userPositionTemp.getPhone());
+        if (userPositionTemp.getId()!=null){
+            example.createCriteria().andEqualTo("userId", userPositionTemp.getId());
+        }
         List<AppUserPositionChangeRecord> list = selectByExample(example);
         List<AppUserPositionChangeRecordDTO> listAppUserPositionChangeRecordDTO = new ArrayList<>();
         list.stream().forEach(x -> {

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

@@ -105,8 +105,10 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         userPositionTemp.setCompanyName(companyName);
         //编辑
         if (id == null || id == 0) {
-            insertSelective(userPositionTemp);
+            int ids = addUserFindId(userPositionTemp).getId();
+            appUserPositionTempDTO.setId(ids);
             //记录表插入
+            //  appUserPositionTempDTO.setId();
             appUserPositionChangeRecordBiz.addJoinJobRecord(appUserPositionTempDTO, updUserId);
         } else {
             updateSelectiveById(userPositionTemp);
@@ -118,6 +120,15 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         return ObjectRestResponse.succ();
     }
 
+    //新增员工表时，获取自增长主键ID，插入变动记录表对应user_id字段
+    public AppUserPositionTemp addUserFindId(AppUserPositionTemp userPositionTemp) {
+        AppUserPositionTemp newAppUserPositionTemp = new AppUserPositionTemp();
+        insertSelective(userPositionTemp);
+        BeanUtils.copyProperties(userPositionTemp, newAppUserPositionTemp);
+        return newAppUserPositionTemp;
+
+    }
+
     public void updateAppuserPostionStatusById(Integer id, int status) {
         AppUserPositionTemp appUserPositionTemp = new AppUserPositionTemp();
         appUserPositionTemp.setId(id);
@@ -426,12 +437,12 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
                 }
                 //身份变更
                 if (StaffChangeStatusEnum.IDENTITY_CHANE.getCode() == changeStatus) {
-                      //不是离职状态下
-                      if(Objects.nonNull(userPositionTemp.getIsQuit()) && userPositionTemp.getIsQuit()!=1){
-                          postionId = Objects.nonNull(postionId) ? postionId : appUserPositionTempDTO.getPositionId();
-                          //更改为股东身份
-                          loginBiz.updateUserPosition(appUserDetail.getUserid(), postionId);
-                      }
+                    //不是离职状态下
+                    if (Objects.nonNull(userPositionTemp.getIsQuit()) && userPositionTemp.getIsQuit() != 1) {
+                        postionId = Objects.nonNull(postionId) ? postionId : appUserPositionTempDTO.getPositionId();
+                        //更改为股东身份
+                        loginBiz.updateUserPosition(appUserDetail.getUserid(), postionId);
+                    }
                 }
             }
         }