员工数据补录

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/bo/UserBo.java

@@ -20,7 +20,9 @@ public class UserBo implements Serializable {
      private String phone;
      private String name;
      private String leaderName;
+     private Integer leaderId;
      private String leaderPhone;
      private Integer facilitateId;
      private String facilitateName;
+     private String companyName;
 }

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

@@ -3,7 +3,6 @@ package com.github.wxiaoqi.security.admin.entity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Builder;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 import tk.mybatis.mapper.annotation.KeySql;
 import tk.mybatis.mapper.code.IdentityDialect;
 
@@ -11,6 +10,7 @@ import javax.persistence.Column;
 import javax.persistence.Id;
 import javax.persistence.Table;
 import java.util.Date;
+import java.util.Objects;
 
 /**
  * @author Administrator
@@ -49,4 +49,17 @@ public class AppStaffUser {
     @ApiModelProperty("状态:0-未删除 1-已删除")
     private Integer isDel;
     private Integer status;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof AppStaffUser)) return false;
+        AppStaffUser that = (AppStaffUser) o;
+        return Objects.equals(phone, that.phone);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(phone);
+    }
 }

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

@@ -8,7 +8,6 @@ import com.github.wxiaoqi.security.admin.entity.ModifiedUsers;
 import com.github.wxiaoqi.security.admin.mapper.AppStaffUserMapper;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
-import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.xxfc.platform.im.utils.StringUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -125,9 +124,9 @@ public class AppStaffUserBiz extends BaseBiz<AppStaffUserMapper, AppStaffUser> {
         appStaffUser.setStatus(1);
 
         if (select(appStaffUser)) {
-             insertSelective(appStaffUser);
+            insertSelective(appStaffUser);
         }else {
-             updateByPhone(appStaffUser);
+            updateByPhone(appStaffUser);
         }
     }
 
@@ -143,4 +142,12 @@ public class AppStaffUserBiz extends BaseBiz<AppStaffUserMapper, AppStaffUser> {
         }
     }
 
+
+    public void insertBatch(List<AppStaffUser> appStaffUsers){
+        mapper.insertList(appStaffUsers);
+    }
+
+    public void saveStaffUser(AppStaffUser appStaffUser) {
+        mapper.saveStaffUser(appStaffUser);
+    }
 }

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

@@ -2,6 +2,7 @@ package com.github.wxiaoqi.security.admin.biz;
 
 import com.ace.cache.annotation.Cache;
 import com.ace.cache.annotation.CacheClear;
+import com.github.wxiaoqi.security.admin.bo.UserBo;
 import com.github.wxiaoqi.security.admin.bo.UserStaffBo;
 import com.github.wxiaoqi.security.admin.dto.AccountBindDTO;
 import com.github.wxiaoqi.security.admin.dto.StaffStatisticsFindDTO;
@@ -12,7 +13,6 @@ import com.github.wxiaoqi.security.admin.vo.AppUserInfoVo;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
-import com.xxfc.platform.im.utils.BeanUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.collections.CollectionUtils;
@@ -207,4 +207,9 @@ public class AppUserDetailBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
 
         return mapper.getUser(userId);
     }
+
+    public List<UserBo> findUserBosByPhones(List<String> phones) {
+         List<UserBo> userBoList = mapper.findUserBosByPhones(phones);
+        return CollectionUtils.isEmpty(userBoList)?Collections.emptyList():userBoList;
+    }
 }

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

@@ -2,12 +2,15 @@ package com.github.wxiaoqi.security.admin.biz;
 
 import com.ace.cache.annotation.Cache;
 import com.ace.cache.annotation.CacheClear;
+import com.github.wxiaoqi.security.admin.bo.InviteMemberBO;
+import com.github.wxiaoqi.security.admin.bo.UserBo;
 import com.github.wxiaoqi.security.admin.dto.UserRelationDTO;
 import com.github.wxiaoqi.security.admin.entity.*;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
+import com.github.wxiaoqi.security.admin.mapper.AppUserRelationMapper;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
-import com.github.wxiaoqi.security.admin.bo.InviteMemberBO;
 import com.github.wxiaoqi.security.admin.vo.InviteMemberVo;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
@@ -18,8 +21,6 @@ import org.springframework.aop.framework.AopContext;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import com.github.wxiaoqi.security.admin.mapper.AppUserRelationMapper;
-import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import tk.mybatis.mapper.entity.Example;
 
 import java.util.*;
@@ -405,5 +406,10 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper, AppUserRe
         }
 
     }
+
+    public List<UserBo>  findAllRelations(){
+        List<UserBo> userBoList = mapper.findAllRelations();
+        return CollectionUtils.isEmpty(userBoList)?Collections.emptyList():userBoList;
+    }
 }
 

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

@@ -3,19 +3,19 @@ package com.github.wxiaoqi.security.admin.mapper;
 import com.github.wxiaoqi.security.admin.entity.AppStaffUser;
 import com.github.wxiaoqi.security.admin.entity.ModifiedUsers;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
+import tk.mybatis.mapper.additional.insert.InsertListMapper;
 import tk.mybatis.mapper.common.Mapper;
 
-import javax.persistence.Id;
 import java.util.List;
 
 /**
  * @author Administrator
  */
-public interface AppStaffUserMapper extends Mapper<AppStaffUser> {
+public interface AppStaffUserMapper extends Mapper<AppStaffUser>, InsertListMapper<AppStaffUser> {
     List<AppStaffUser> selectByBysuIdOrUsername(@Param("id") Integer id,@Param("username") String username);
 
     void updateByPositionId(ModifiedUsers modifiedUsers);
 
     void update(ModifiedUsers modifiedUsers);
+    void saveStaffUser(AppStaffUser appStaffUser);
 }

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

 package com.github.wxiaoqi.security.admin.mapper;
 
+import com.github.wxiaoqi.security.admin.bo.UserBo;
 import com.github.wxiaoqi.security.admin.bo.UserStaffBo;
 import com.github.wxiaoqi.security.admin.dto.AppUserManageDTO;
 import com.github.wxiaoqi.security.admin.dto.StaffStatisticsFindDTO;
@@ -35,4 +36,6 @@ public interface AppUserDetailMapper extends Mapper<AppUserDetail> {
     List<UserStaffBo> findAllStaffsByCompanyIdAndPostionId(StaffStatisticsFindDTO staffStatisticsFindDTO);
 
     AppUserVo getUser(Integer userId);
+
+    List<UserBo> findUserBosByPhones(@Param("phones") List<String> phones);
 }
\ No newline at end of file

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

 package com.github.wxiaoqi.security.admin.mapper;
 
+import com.github.wxiaoqi.security.admin.bo.UserBo;
 import com.github.wxiaoqi.security.admin.entity.AppUserRelation;
 import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.Mapper;
 
 import java.util.List;
-import java.util.Set;
 
 /**
  * 用户关系表
@@ -25,4 +25,7 @@ public interface AppUserRelationMapper extends Mapper<AppUserRelation> {
     List<AppUserRelation> selectByUserIds(@Param("userIds") List<Integer> userIds);
 
     List<AppUserRelation> selectCountByLeaderId(Integer userId);
+
+    List<UserBo> findAllRelations();
+
 }

ace-modules/ace-admin/src/main/resources/mapper/AppStaffUserMapper.xml

@@ -50,4 +50,10 @@
     <update id="update" parameterType="com.github.wxiaoqi.security.admin.entity.ModifiedUsers">
        update app_staff_user set  u_name=#{name}, phone= #{phone} where  u_id=#{userid}
    </update>
+
+    <select id="saveStaffUser">
+        INSERT IGNORE INTO `app_staff_user`(`su_phone`,`su_id`,`u_name`,`phone`,`company`,`remarks`,`crt_time`,`is_del`,`status`)VALUES(
+        #{suPhone},#{suId},#{uName},#{phone},#{company},#{remarks},#{crtTime},#{isDel},#{status}
+        )
+    </select>
 </mapper>
\ No newline at end of file

ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml

@@ -328,4 +328,14 @@ from   `app_user_detail` as `aud` left join `app_user_login` as `aul` on aul.id=
     on d.userid = l.id
      where l.id = #{userId}  limit 1
   </select>
+
+    <select id="findUserBosByPhones" resultType="com.github.wxiaoqi.security.admin.bo.UserBo">
+        select aul.id as `userId`,aul.username as `phone`,IFNULL(aud.realname,aud.nickname) as `name` from (select `id`,`username` from `app_user_login`
+        <if test="phones!=null and phones.size()>0">
+         where username in
+        <foreach collection="phones" item="phone" open="(" close=")" separator=",">
+          #{phone}
+     </foreach>
+     </if>) as aul inner join `app_user_detail` as aud on aud.userid=aul.id
+    </select>
 </mapper>
\ No newline at end of file

ace-modules/ace-admin/src/main/resources/mapper/AppUserRelationMapper.xml

@@ -25,4 +25,16 @@
     <select id="selectCountByLeaderId" resultType="com.github.wxiaoqi.security.admin.entity.AppUserRelation">
         select * from   `app_user_relation` as `aur` inner join  `app_user_login` as `aul` on aul.id=aur.user_id where aur.is_del=0 and aul.isdel=0  and aur.parent_id=#{userId}
     </select>
+
+    <select id="findAllRelations" resultType="com.github.wxiaoqi.security.admin.bo.UserBo">
+        select  aulp.id as `leaderId`,aulp.username as `leaderPhone`,aulc.id as `userId`,aulc.username  as `phone`,
+         IFNULL(audp.realname,audp.nickname) as `leaderName`,IFNULL(audc.realname,audc.nickname) as `name`,aupt.company_name as `companyName`
+         from `app_user_relation` as aur
+         inner join `app_user_login` as aulp on aulp.id = aur.parent_id
+         inner join `app_user_login` as aulc on aulc.id=aur.user_id
+         inner join `app_user_detail` as audp on audp.userid= aulp.id
+         inner join `app_user_detail` as `audc` on audc.userid= aulc.id
+         left join  `app_user_position_temp` as `aupt` on aupt.user_id = aulc.id
+          where aur.is_del=0 and aulp.isdel=0 and aulc.isdel=0
+    </select>
 </mapper>
\ No newline at end of file