.对接人员结构树接口

.对接人员详情接口

app/src/main/java/com/unis/sxzcl/ui/aeration/AerationListFragment.java

@@ -1,5 +1,6 @@
 package com.unis.sxzcl.ui.aeration;
 
+import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 
@@ -90,7 +91,9 @@ public class AerationListFragment extends BaseListFragment<FragmentBaseListTitle
     }
 
     private void goAdd() {
-
+        Bundle bundle = new Bundle();
+        bundle.putString("pageType", "add");
+        navigation(R.id.aerationDetailFragment, bundle);
     }
 
 

app/src/main/java/com/unis/sxzcl/ui/basic/PersonDetailFragment.java

@@ -6,12 +6,16 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import com.bumptech.glide.Glide;
-import com.unis.model.bean.PersonBean;
+import com.unis.model.DataCallBack;
+import com.unis.model.UrlPath;
+import com.unis.model.UserModel;
+import com.unis.model.bean.person.PersonBean;
 import com.unis.sxzcl.R;
 import com.unis.sxzcl.base.BaseFragment;
 import com.unis.sxzcl.databinding.FragmentPersonDetailBinding;
 import com.xyxsbj.mylibrary.tool.CallUtils;
 import com.xyxsbj.mylibrary.tool.ETTool;
+import com.xyxsbj.mylibrary.tool.ToastTool;
 
 /**
  * 包名: com.unis.sxzcl.ui.basic
@@ -26,10 +30,12 @@ import com.xyxsbj.mylibrary.tool.ETTool;
  */
 public class PersonDetailFragment extends BaseFragment<FragmentPersonDetailBinding> {
 
-    public static PersonDetailFragment newFragment(boolean showTitle, String data) {
+    private String mId;
+
+    public static PersonDetailFragment newFragment(boolean showTitle, String id) {
         Bundle bundle = new Bundle();
         bundle.putBoolean("showTitle", showTitle);
-        bundle.putString("data", data);
+        bundle.putString("id", id);
         PersonDetailFragment fragment = new PersonDetailFragment();
         fragment.setArguments(bundle);
         return fragment;
@@ -48,11 +54,7 @@ public class PersonDetailFragment extends BaseFragment<FragmentPersonDetailBindi
         boolean showTitle = bundle.getBoolean("showTitle", true);
         mBinding.bar.setVisibility(showTitle ? View.VISIBLE : View.GONE);
 
-        String data = bundle.getString("data");
-        PersonBean bean = getGson().fromJson(data, PersonBean.class);
-        if (bean == null) mBinding.bar.setTitle("");
-        else mBinding.bar.setTitle(bean.name);
-
+        mBinding.bar.setTitle("");
         mBinding.bar.setLeftClickListener(v -> onBack());
 
         mBinding.tvCall.setOnClickListener(v -> {
@@ -64,17 +66,41 @@ public class PersonDetailFragment extends BaseFragment<FragmentPersonDetailBindi
 
     @Override
     protected void onFirstShow() {
-        Glide.with(getContext())
-                .load(R.drawable.no_banner)
-                .placeholder(R.drawable.ic_img_loading)
-                .error(R.drawable.no_banner)
-                .into(mBinding.ivShow);
-        mBinding.tvName.setText("王全德");
-        mBinding.tvSex.setText("男");
-        mBinding.tvCompany.setText("中储粮XX直属库有限公司");
-        mBinding.tvDeportment.setText("仓储科");
-        mBinding.tvPost.setText("保管员");
-        mBinding.tvPhone.setText("13000000000");
+
+        mId = getArguments().getString("id");
+        if (mId == null) {
+            ToastTool.showLong("没有id参数");
+            onBack();
+            return;
+        }
+        showProgress("正在加载...", false);
+        UserModel.get().getPersonDetail(mId, new DataCallBack<PersonBean>() {
+            @Override
+            public void onSuccess(PersonBean data) {
+                if (!isActive()) return;
+                hideProgress();
+                mBinding.bar.setTitle(data.getUname());
+
+                Glide.with(getContext())
+                        .load(UrlPath.image_host + data.getPheadPortrait())
+                        .placeholder(R.drawable.ic_img_loading)
+                        .error(R.drawable.no_banner)
+                        .into(mBinding.ivShow);
+                mBinding.tvName.setText(data.getUname());
+                mBinding.tvSex.setText(data.getUsex());
+                mBinding.tvCompany.setText(data.getDepotName());
+                mBinding.tvDeportment.setText(data.getDepartmentName());
+                mBinding.tvPost.setText(data.getPpost());
+                mBinding.tvPhone.setText(data.getUphone());
+            }
+
+            @Override
+            public void onError(String error) {
+                super.onError(error);
+                if (!isActive()) return;
+                hideProgress();
+            }
+        });
     }
 
 

app/src/main/java/com/unis/sxzcl/ui/basic/PersonFrameFragment.java

@@ -1,14 +1,21 @@
 package com.unis.sxzcl.ui.basic;
 
+import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 
 import com.chad.library.adapter.base.entity.node.BaseNode;
+import com.unis.model.DataCallBack;
+import com.unis.model.DepotModel;
+import com.unis.model.UserModel;
+import com.unis.model.bean.MultiDepotBean;
+import com.unis.model.bean.person.PersonTreeBean;
 import com.unis.sxzcl.R;
 import com.unis.sxzcl.base.BaseListFragment;
 import com.unis.sxzcl.databinding.FragmentBaseListBinding;
 import com.unis.sxzcl.widget.multi_list.BaseMultiBean;
 import com.unis.sxzcl.widget.multi_list.MultiListAdapter;
+import com.xyxsbj.mylibrary.tool.ToastTool;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -28,24 +35,6 @@ public class PersonFrameFragment extends BaseListFragment<FragmentBaseListBindin
 
     private MultiListAdapter mAdapter;
 
-    @Override
-    public void onRefreshData() {
-        List<BaseMultiBean> list = new ArrayList<>();
-        BaseMultiBean oneBean = new BaseMultiBean("仓储部");
-        oneBean.level = 1;
-        oneBean.addChildNode(new BaseMultiBean("王建国").setIcon("http://").setContent("仓储科科长").setLevel(2));
-        oneBean.addChildNode(new BaseMultiBean("王全得").setIcon("http://").setContent("保管员").setLevel(2));
-        list.add(oneBean);
-
-        BaseMultiBean oneBean2 = new BaseMultiBean("财务部");
-        oneBean2.level = 1;
-        oneBean2.addChildNode(new BaseMultiBean("王建国").setIcon("http://").setContent("仓储科科长").setLevel(2));
-        oneBean2.addChildNode(new BaseMultiBean("王全得").setIcon("http://").setContent("保管员").setLevel(2));
-        list.add(oneBean2);
-
-        mAdapter.setList(list);
-        loadComplete();
-    }
 
     @Override
     protected FragmentBaseListBinding getViewBinding(LayoutInflater inflater, ViewGroup container) {
@@ -67,11 +56,77 @@ public class PersonFrameFragment extends BaseListFragment<FragmentBaseListBindin
 
     @Override
     public void onItemClickListener(BaseNode data) {
-        if (!(data instanceof BaseMultiBean)) {
+        BaseMultiBean item = ((BaseMultiBean) data);
+        if (item.level == 2) {
+            PersonTreeBean personTreeBean = getGson().fromJson(item.extra, PersonTreeBean.class);
+            Bundle bundle = new Bundle();
+            bundle.putString("id", personTreeBean.personnelId);
+            navigation(R.id.personDetailFragment,bundle);
+        }
+    }
+
+
+    @Override
+    public void onRefreshData() {
+
+        getData();
+    }
+
+    public void getData() {
+        MultiDepotBean depot = DepotModel.get().getSelectDepot();
+        if (depot == null) {
+            ToastTool.showLong("请先选择库");
+            onBack();
             return;
         }
-        int level = ((BaseMultiBean) data).getLevel();
-        if (level == 2)
-            navigation(R.id.personDetailFragment);
+        showProgress("正在加载...", false);
+        UserModel.get().getPersonTree("1", new DataCallBack<List<PersonTreeBean>>() {
+            @Override
+            public void onSuccess(List<PersonTreeBean> data) {
+                if (!isActive()) return;
+                hideProgress();
+
+                List<BaseNode> list = new ArrayList<>();
+                int index = 0;
+                initListData(index, list, data);
+                mAdapter.setList(list);
+
+                loadComplete();
+            }
+
+            @Override
+            public void onError(String error) {
+                super.onError(error);
+                if (!isActive()) return;
+                hideProgress();
+                loadError();
+            }
+        });
     }
+
+    private void initListData(int level, List<BaseNode> list, List<PersonTreeBean> data) {
+        level++;
+        for (PersonTreeBean bean : data) {
+            BaseMultiBean item = new BaseMultiBean(bean.departmentStaffName);
+            item.level = level;
+            // 将数据源加入实体中
+            PersonTreeBean personTreeBean = new PersonTreeBean();
+            personTreeBean.departmentStaffId = bean.departmentStaffId;
+            personTreeBean.departmentStaffName = bean.departmentStaffName;
+            personTreeBean.isDepartmentStaff = bean.isDepartmentStaff;
+            personTreeBean.personnelId = bean.personnelId;
+            item.extra = getGson().toJson(personTreeBean);
+
+            //如果有子级 递归
+            if (bean.children != null) {
+                List<BaseNode> childList = new ArrayList<>();
+                initListData(level, childList, bean.children);
+                item.addChildNode(childList);
+            }
+
+            list.add(item);
+        }
+
+    }
+
 }

app/src/main/java/com/unis/sxzcl/ui/company/CompanyListFragment.java

@@ -56,10 +56,6 @@ public class CompanyListFragment extends BaseListFragment<FragmentBaseListTitleB
 
     @Override
     public void onRefreshData() {
-        if (mAdapter.getData() != null && mAdapter.getData().size() > 0) {
-            loadComplete();
-            return;
-        }
 
         DepotModel.get().getMultiList(new DataCallBack<List<MultiDepotBean>>() {
             @Override

app/src/main/java/com/unis/sxzcl/ui/home/MainActivity.java

@@ -7,6 +7,7 @@ import androidx.navigation.NavBackStackEntry;
 import androidx.navigation.NavController;
 import androidx.navigation.Navigation;
 
+import com.unis.model.UserModel;
 import com.unis.model.event.LoginOutEvent;
 import com.unis.model.event.TextSizeEvent;
 import com.unis.sxzcl.R;
@@ -85,6 +86,8 @@ public class MainActivity extends BaseActivity<ActivityMainBinding> {
      */
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onLoginOut(LoginOutEvent event) {
+        // 删除用户信息
+        UserModel.get().removeUser();
         // 重启当前页 弹出其他页面
         ActivityTool.startActivity(getContext(), this.getClass());
         // 跳转登录

app/src/main/java/com/unis/sxzcl/ui/person/PersonListAdapter.java

@@ -6,7 +6,7 @@ import com.bumptech.glide.Glide;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.module.LoadMoreModule;
 import com.chad.library.adapter.base.viewholder.BaseViewHolder;
-import com.unis.model.bean.PersonBean;
+import com.unis.model.bean.person.PersonBean;
 import com.unis.sxzcl.R;
 
 import org.jetbrains.annotations.NotNull;
@@ -38,7 +38,7 @@ public class PersonListAdapter extends BaseQuickAdapter<PersonBean, BaseViewHold
                 .error(R.drawable.no_banner)
                 .into(imageView);
 
-        holder.setText(R.id.tv_name, item.name)
-                .setText(R.id.tv_post, item.post);
+        holder.setText(R.id.tv_name, item.getUname())
+                .setText(R.id.tv_post, item.getPpost());
     }
 }

app/src/main/java/com/unis/sxzcl/ui/person/PersonListFragment.java

@@ -12,7 +12,7 @@ import androidx.annotation.NonNull;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.listener.OnItemClickListener;
-import com.unis.model.bean.PersonBean;
+import com.unis.model.bean.person.PersonBean;
 import com.unis.sxzcl.R;
 import com.unis.sxzcl.base.BaseListFragment;
 import com.unis.sxzcl.databinding.FragmentPersonListBinding;
@@ -134,11 +134,11 @@ public class PersonListFragment extends BaseListFragment<FragmentPersonListBindi
                 mAdapter.getData().clear();
                 mAdapter.notifyDataSetChanged();
             }
-            mAdapter.addData(new PersonBean("陈晓军", "", "主任"));
-            mAdapter.addData(new PersonBean("Cherry", "", "仓储科科长"));
-            mAdapter.addData(new PersonBean("常道", "", "保管员"));
-            mAdapter.addData(new PersonBean("大鹏", "", "保管员"));
-            mAdapter.addData(new PersonBean("大大熊", "", "保管员"));
+//            mAdapter.addData(new PersonBean("陈晓军", "", "主任"));
+//            mAdapter.addData(new PersonBean("Cherry", "", "仓储科科长"));
+//            mAdapter.addData(new PersonBean("常道", "", "保管员"));
+//            mAdapter.addData(new PersonBean("大鹏", "", "保管员"));
+//            mAdapter.addData(new PersonBean("大大熊", "", "保管员"));
             loadEnd();
         }, 500);
     }

app/src/main/java/com/unis/sxzcl/ui/person/person_work/PersonWorkListAdapter.java

@@ -3,7 +3,7 @@ package com.unis.sxzcl.ui.person.person_work;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.module.LoadMoreModule;
 import com.chad.library.adapter.base.viewholder.BaseViewHolder;
-import com.unis.model.bean.PersonWorkBean;
+import com.unis.model.bean.person.PersonWorkBean;
 import com.unis.sxzcl.R;
 
 import org.jetbrains.annotations.NotNull;

app/src/main/java/com/unis/sxzcl/ui/person/person_work/PersonWorkListFragment.java

@@ -5,7 +5,7 @@ import android.os.Handler;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 
-import com.unis.model.bean.PersonWorkBean;
+import com.unis.model.bean.person.PersonWorkBean;
 import com.unis.sxzcl.base.BaseListFragment;
 import com.unis.sxzcl.databinding.FragmentBaseListBinding;
 

app/src/main/java/com/unis/sxzcl/ui/work_module/WorkModuleAdapter.java

@@ -99,8 +99,8 @@ public class WorkModuleAdapter extends BaseQuickAdapter<WorkModule, BaseViewHold
                 break;
             case WorkbenchModel.TYPE_LQJC:
                 // 粮情检查
-                currentFragmentId = R.id.grainCheckHomeFragment;
-//                showHouseSelect(R.id.grainCheckHomeFragment);
+//                currentFragmentId = R.id.grainCheckHomeFragment;
+                showHouseSelect(R.id.grainCheckHomeFragment);
                 break;
             case WorkbenchModel.TYPE_JXTF:
                 // 机械通风

app/src/main/java/com/unis/sxzcl/widget/multi_list/MultiListAdapter.java

@@ -110,7 +110,7 @@ public class MultiListAdapter extends BaseNodeAdapter implements LoadMoreModule
 
             // 箭头标记
             holder.getView(R.id.iv_flag).setSelected(item.isExpanded());
-            if (item.getChildNode() == null) {
+            if (item.getChildNode() == null || item.getChildNode().size() == 0) {
                 holder.setGone(R.id.iv_flag, true);
             } else {
                 holder.setGone(R.id.iv_flag, false);
@@ -129,7 +129,7 @@ public class MultiListAdapter extends BaseNodeAdapter implements LoadMoreModule
             BaseMultiBean item = (BaseMultiBean) data;
             helper.getView(R.id.iv_flag).setSelected(!item.isExpanded());
             getAdapter().expandOrCollapse(position);
-            if (mCallback != null && item.getChildNode() == null)
+            if (mCallback != null && (item.getChildNode() == null || item.getChildNode().size() == 0))
                 mCallback.onItemClickListener(data);
         }
 

app/src/main/res/layout/fragment_person_detail.xml

@@ -45,7 +45,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
-                android:text="王全德"
+                android:text=""
                 android:textColor="@color/colorTextBlack"
                 android:textSize="?attr/textSizeXXX"
                 android:textStyle="bold" />
@@ -64,7 +64,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="16dp"
-                android:text="男"
+                android:text=""
                 android:textColor="@color/colorTheme"
                 android:textSize="?attr/textSizeXXX" />
 
@@ -82,7 +82,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="16dp"
-                android:text="中储粮XX直属库有限公司"
+                android:text=""
                 android:textColor="@color/colorTheme"
                 android:textSize="?attr/textSizeXXX" />
 
@@ -100,7 +100,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="16dp"
-                android:text="仓储科"
+                android:text=""
                 android:textColor="@color/colorTheme"
                 android:textSize="?attr/textSizeXXX" />
 
@@ -118,7 +118,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="16dp"
-                android:text="保管员"
+                android:text=""
                 android:textColor="@color/colorTheme"
                 android:textSize="?attr/textSizeXXX" />
 
@@ -142,7 +142,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:text="13000000000"
+                    android:text=""
                     android:textColor="@color/colorTheme"
                     android:textSize="?attr/textSizeXXX" />
 

model/src/main/java/com/unis/model/UrlPath.java

@@ -14,26 +14,32 @@ package com.unis.model;
 public class UrlPath {
 
     //服务器地址
-    public static final String host = "http://10.10.1.25:9066/";
+//    public static final String host = "http://10.10.1.25:9066/";
+    public static final String host = "http://101.36.160.140:21021/api"; // 02服务器
     // vpn
-//    public static final String host = "http://172.16.0.46:9603/";
+//    public static final String host = "http://172.16.0.46:9603";
     public static final String host1 = "http://10.100.1.63:9605";
 
     //图片地址
-    public static final String image_host = host + "csc-szls-system-manage/minio/preViewPicture/";
+    public static final String image_host = host + "/csc-szls-system-manage/minio/preViewPicture/";
 
     // 登录
-    public static final String login = host + "csc-szls-system-manage/public/login";
+    public static final String login = host + "/csc-szls-system-manage/public/login";
     // 注销登录
-    public static final String logout = host + "csc-szls-system-manage/public/logout";
+    public static final String logout = host + "/csc-szls-system-manage/public/logout";
 
 
     // 多级库列表
-    public static final String depot_multi_list = host + "csc-szls-system-manage/basicsDepot/authority/getAll";
+    public static final String depot_multi_list = host + "/csc-szls-system-manage/basicsDepot/authority/getAll";
 
     // 仓房列表
     public static final String house_list = host + "/csc-szls-system-manage/basicsWarehouse/authority/getDepotAll";
 
+    // 人员树
+    public static final String person_tree = host + "/csc-szls-system-manage/sysPersonnel/authority/getByDepotId";
+    // 人员详情
+    public static final String person_detail = host + "/csc-szls-system-manage/sysPersonnel/authority/getById";
+
 
     // 粮情检查记录
 //    public static final String grain_check_list = host + "/csc-szls-business/grainConditionRecord/authority/getPage";

model/src/main/java/com/unis/model/UserModel.java

@@ -3,10 +3,13 @@ package com.unis.model;
 import androidx.annotation.StringDef;
 
 import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
 import com.lzy.okgo.OkGo;
 import com.lzy.okgo.model.Response;
 import com.unis.model.bean.LoginBean;
 import com.unis.model.bean.UserBean;
+import com.unis.model.bean.person.PersonBean;
+import com.unis.model.bean.person.PersonTreeBean;
 import com.xyxsbj.mylibrary.tool.SPTool;
 
 import org.json.JSONException;
@@ -14,6 +17,7 @@ import org.json.JSONException;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -139,7 +143,6 @@ public class UserModel {
                 .execute(new MyStringCallback() {
                     @Override
                     protected void onSuccessResult(Response<String> response) throws JSONException {
-                        removeUser();
                         callBack.onSuccess(response.body());
                     }
 
@@ -161,5 +164,54 @@ public class UserModel {
         SPTool.remove(Constant.KEY_HEAD_TOKEN);
     }
 
+    /**
+     * 获取人员树
+     */
+    public void getPersonTree(String depotId, final DataCallBack<List<PersonTreeBean>> callBack) {
+        OkGo.<String>get(UrlPath.person_tree)
+                .params("depotId", depotId)
+                .execute(new MyStringCallback() {
+                    @Override
+                    protected void onSuccessResult(Response<String> response) throws JSONException {
+                        String json = getDataJson(response);
+                        List<PersonTreeBean> list =
+                                new Gson().fromJson(json, new TypeToken<List<PersonTreeBean>>() {
+                                }.getType());
+                        callBack.onSuccess(list);
+                    }
+
+                    @Override
+                    public void onError(Response<String> response) {
+                        super.onError(response);
+                        callBack.onError(getErrorMsg(response));
+                    }
+                });
+    }
+
+    /**
+     * 获取人员详情
+     *
+     * @param id
+     * @param callBack
+     */
+    public void getPersonDetail(String id, final DataCallBack<PersonBean> callBack) {
+        OkGo.<String>get(UrlPath.person_detail + "/" + id)
+                .execute(new MyStringCallback() {
+                    @Override
+                    protected void onSuccessResult(Response<String> response) throws JSONException {
+                        String json = getDataJson(response);
+                        PersonBean personBean = new Gson().fromJson(json, PersonBean.class);
+                        callBack.onSuccess(personBean);
+                    }
+
+                    @Override
+                    public void onError(Response<String> response) {
+                        super.onError(response);
+                        callBack.onError(getErrorMsg(response));
+                    }
+                });
+
+    }
+
 
 }

model/src/main/java/com/unis/model/bean/PersonBean.java

@@ -1,24 +0,0 @@
-package com.unis.model.bean;
-
-/**
- * 包名: com.unis.model.bean
- * 类名: PersonBean
- * 作用描述:
- * 创建人: mQ
- * 创建时间: 2020/11/30 19:58
- * 更新人:
- * 更新时间: 2020/11/30 19:58
- * 更新说明:
- * 版本号: 1.0
- */
-public class PersonBean {
-    public String name;
-    public String portrait;
-    public String post;
-
-    public PersonBean(String name, String portrait, String post) {
-        this.name = name;
-        this.portrait = portrait;
-        this.post = post;
-    }
-}

model/src/main/java/com/unis/model/bean/person/PersonBean.java

@@ -0,0 +1,419 @@
+package com.unis.model.bean.person;
+
+/**
+ * 包名: com.unis.model.bean
+ * 类名: PersonBean
+ * 作用描述:
+ * 创建人: mQ
+ * 创建时间: 2020/11/30 19:58
+ * 更新人:
+ * 更新时间: 2020/11/30 19:58
+ * 更新说明:
+ * 版本号: 1.0
+ */
+public class PersonBean {
+
+    /**
+     * uStatus : 1
+     * departmentId : 3
+     * departmentName : 人事部
+     * depotId : 1
+     * depotName : bbbb
+     * storehouseIds : null
+     * storehouseNames : null
+     * companyId : null
+     * companyName :
+     * createTime : 2020-12-01 14:33:08
+     * createPeople : 3
+     * alternateFieldsOne : 3
+     * alternateFieldsTwo : 3
+     * pid : 3
+     * uname : 刘邦
+     * pheadPortrait : 3
+     * usex : 3
+     * ubirthday : null
+     * umail : 3
+     * pworkYears : 3
+     * ppoliticalOutlook : 3
+     * ppartyTime : null
+     * pdepartment : 3
+     * pfirstDegree : 3
+     * puniversityGraduated : 3
+     * pmajor : 3
+     * pformEducation : 3
+     * pacademicDegree : 3
+     * phighestEducation : 3
+     * puniversityGraduatedTwo : 3
+     * uphone : 3
+     * ppost : 3
+     * pmajorTwo : 3
+     * pformEducationTwo : 3
+     * pacademicDegreeTwo : 3
+     * pmajorThree : 3
+     * pgrade : 3
+     * plicensingAgency : 3
+     * plicensingTime : null
+     * pcertificateAddress : 3
+     */
+
+    private String uStatus;
+    private String departmentId;
+    private String departmentName;
+    private String depotId;
+    private String depotName;
+    private String storehouseIds;
+    private String storehouseNames;
+    private String companyId;
+    private String companyName;
+    private String createTime;
+    private String createPeople;
+    private String alternateFieldsOne;
+    private String alternateFieldsTwo;
+    private String pid;
+    private String uname;
+    private String pheadPortrait;
+    private String usex;
+    private String ubirthday;
+    private String umail;
+    private String pworkYears;
+    private String ppoliticalOutlook;
+    private String ppartyTime;
+    private String pdepartment;
+    private String pfirstDegree;
+    private String puniversityGraduated;
+    private String pmajor;
+    private String pformEducation;
+    private String pacademicDegree;
+    private String phighestEducation;
+    private String puniversityGraduatedTwo;
+    private String uphone;
+    private String ppost;
+    private String pmajorTwo;
+    private String pformEducationTwo;
+    private String pacademicDegreeTwo;
+    private String pmajorThree;
+    private String pgrade;
+    private String plicensingAgency;
+    private String plicensingTime;
+    private String pcertificateAddress;
+
+    public String getuStatus() {
+        return uStatus;
+    }
+
+    public void setuStatus(String uStatus) {
+        this.uStatus = uStatus;
+    }
+
+    public String getDepartmentId() {
+        return departmentId;
+    }
+
+    public void setDepartmentId(String departmentId) {
+        this.departmentId = departmentId;
+    }
+
+    public String getDepartmentName() {
+        return departmentName;
+    }
+
+    public void setDepartmentName(String departmentName) {
+        this.departmentName = departmentName;
+    }
+
+    public String getDepotId() {
+        return depotId;
+    }
+
+    public void setDepotId(String depotId) {
+        this.depotId = depotId;
+    }
+
+    public String getDepotName() {
+        return depotName;
+    }
+
+    public void setDepotName(String depotName) {
+        this.depotName = depotName;
+    }
+
+    public String getStorehouseIds() {
+        return storehouseIds;
+    }
+
+    public void setStorehouseIds(String storehouseIds) {
+        this.storehouseIds = storehouseIds;
+    }
+
+    public String getStorehouseNames() {
+        return storehouseNames;
+    }
+
+    public void setStorehouseNames(String storehouseNames) {
+        this.storehouseNames = storehouseNames;
+    }
+
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getCreatePeople() {
+        return createPeople;
+    }
+
+    public void setCreatePeople(String createPeople) {
+        this.createPeople = createPeople;
+    }
+
+    public String getAlternateFieldsOne() {
+        return alternateFieldsOne;
+    }
+
+    public void setAlternateFieldsOne(String alternateFieldsOne) {
+        this.alternateFieldsOne = alternateFieldsOne;
+    }
+
+    public String getAlternateFieldsTwo() {
+        return alternateFieldsTwo;
+    }
+
+    public void setAlternateFieldsTwo(String alternateFieldsTwo) {
+        this.alternateFieldsTwo = alternateFieldsTwo;
+    }
+
+    public String getPid() {
+        return pid;
+    }
+
+    public void setPid(String pid) {
+        this.pid = pid;
+    }
+
+    public String getUname() {
+        return uname;
+    }
+
+    public void setUname(String uname) {
+        this.uname = uname;
+    }
+
+    public String getPheadPortrait() {
+        return pheadPortrait;
+    }
+
+    public void setPheadPortrait(String pheadPortrait) {
+        this.pheadPortrait = pheadPortrait;
+    }
+
+    public String getUsex() {
+        return usex;
+    }
+
+    public void setUsex(String usex) {
+        this.usex = usex;
+    }
+
+    public String getUbirthday() {
+        return ubirthday;
+    }
+
+    public void setUbirthday(String ubirthday) {
+        this.ubirthday = ubirthday;
+    }
+
+    public String getUmail() {
+        return umail;
+    }
+
+    public void setUmail(String umail) {
+        this.umail = umail;
+    }
+
+    public String getPworkYears() {
+        return pworkYears;
+    }
+
+    public void setPworkYears(String pworkYears) {
+        this.pworkYears = pworkYears;
+    }
+
+    public String getPpoliticalOutlook() {
+        return ppoliticalOutlook;
+    }
+
+    public void setPpoliticalOutlook(String ppoliticalOutlook) {
+        this.ppoliticalOutlook = ppoliticalOutlook;
+    }
+
+    public String getPpartyTime() {
+        return ppartyTime;
+    }
+
+    public void setPpartyTime(String ppartyTime) {
+        this.ppartyTime = ppartyTime;
+    }
+
+    public String getPdepartment() {
+        return pdepartment;
+    }
+
+    public void setPdepartment(String pdepartment) {
+        this.pdepartment = pdepartment;
+    }
+
+    public String getPfirstDegree() {
+        return pfirstDegree;
+    }
+
+    public void setPfirstDegree(String pfirstDegree) {
+        this.pfirstDegree = pfirstDegree;
+    }
+
+    public String getPuniversityGraduated() {
+        return puniversityGraduated;
+    }
+
+    public void setPuniversityGraduated(String puniversityGraduated) {
+        this.puniversityGraduated = puniversityGraduated;
+    }
+
+    public String getPmajor() {
+        return pmajor;
+    }
+
+    public void setPmajor(String pmajor) {
+        this.pmajor = pmajor;
+    }
+
+    public String getPformEducation() {
+        return pformEducation;
+    }
+
+    public void setPformEducation(String pformEducation) {
+        this.pformEducation = pformEducation;
+    }
+
+    public String getPacademicDegree() {
+        return pacademicDegree;
+    }
+
+    public void setPacademicDegree(String pacademicDegree) {
+        this.pacademicDegree = pacademicDegree;
+    }
+
+    public String getPhighestEducation() {
+        return phighestEducation;
+    }
+
+    public void setPhighestEducation(String phighestEducation) {
+        this.phighestEducation = phighestEducation;
+    }
+
+    public String getPuniversityGraduatedTwo() {
+        return puniversityGraduatedTwo;
+    }
+
+    public void setPuniversityGraduatedTwo(String puniversityGraduatedTwo) {
+        this.puniversityGraduatedTwo = puniversityGraduatedTwo;
+    }
+
+    public String getUphone() {
+        return uphone;
+    }
+
+    public void setUphone(String uphone) {
+        this.uphone = uphone;
+    }
+
+    public String getPpost() {
+        return ppost;
+    }
+
+    public void setPpost(String ppost) {
+        this.ppost = ppost;
+    }
+
+    public String getPmajorTwo() {
+        return pmajorTwo;
+    }
+
+    public void setPmajorTwo(String pmajorTwo) {
+        this.pmajorTwo = pmajorTwo;
+    }
+
+    public String getPformEducationTwo() {
+        return pformEducationTwo;
+    }
+
+    public void setPformEducationTwo(String pformEducationTwo) {
+        this.pformEducationTwo = pformEducationTwo;
+    }
+
+    public String getPacademicDegreeTwo() {
+        return pacademicDegreeTwo;
+    }
+
+    public void setPacademicDegreeTwo(String pacademicDegreeTwo) {
+        this.pacademicDegreeTwo = pacademicDegreeTwo;
+    }
+
+    public String getPmajorThree() {
+        return pmajorThree;
+    }
+
+    public void setPmajorThree(String pmajorThree) {
+        this.pmajorThree = pmajorThree;
+    }
+
+    public String getPgrade() {
+        return pgrade;
+    }
+
+    public void setPgrade(String pgrade) {
+        this.pgrade = pgrade;
+    }
+
+    public String getPlicensingAgency() {
+        return plicensingAgency;
+    }
+
+    public void setPlicensingAgency(String plicensingAgency) {
+        this.plicensingAgency = plicensingAgency;
+    }
+
+    public String getPlicensingTime() {
+        return plicensingTime;
+    }
+
+    public void setPlicensingTime(String plicensingTime) {
+        this.plicensingTime = plicensingTime;
+    }
+
+    public String getPcertificateAddress() {
+        return pcertificateAddress;
+    }
+
+    public void setPcertificateAddress(String pcertificateAddress) {
+        this.pcertificateAddress = pcertificateAddress;
+    }
+}

model/src/main/java/com/unis/model/bean/person/PersonTreeBean.java

@@ -0,0 +1,28 @@
+package com.unis.model.bean.person;
+
+import java.util.List;
+
+/**
+ * 包名: com.unis.model.bean.person
+ * 类名: PersonTreeBean
+ * 作用描述:
+ * 创建人: mQ
+ * 创建时间: 2020/12/15 15:06
+ * 更新人:
+ * 更新时间: 2020/12/15 15:06
+ * 更新说明:
+ * 版本号: 1.0
+ */
+public class PersonTreeBean {
+
+    // 部门id
+    public Integer departmentStaffId;
+    // 人员id
+    public String personnelId;
+    // 名称
+    public String departmentStaffName;
+    // 0部门 1人员
+    public Integer isDepartmentStaff;
+
+    public List<PersonTreeBean> children;
+}

model/src/main/java/com/unis/model/bean/PersonWorkBean.java

@@ -1,4 +1,4 @@
-package com.unis.model.bean;
+package com.unis.model.bean.person;
 
 /**
  * 包名: com.unis.model.bean