From 2ae0446917184b36996823e9dbf452dba82e8994 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 21 四月 2017 12:31:44 +0800
Subject: [PATCH] 

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java |   51 ++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
index a792a4a..aabc67f 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
@@ -3,6 +3,8 @@
 import android.widget.Toast;
 
 import cn.com.basic.face.base.BaseApplication;
+import cn.com.basic.face.discern.common.CommonVariables;
+import cn.com.basic.face.discern.query.condition.CheckInQueryCondition;
 import cn.com.basic.face.discern.query.item.PhoneCallQueryItem;
 import cn.com.basic.face.fragment.CheckInFragment;
 import cn.com.basic.face.util.AppApi;
@@ -28,25 +30,36 @@
         return instance;
     }
 
-    public void add(RequestParams params) {
+    public void add(RequestParams params, final String visitReasonId) {
+        if (!BaseApplication.deviceAvailable) {
+            return;
+        }
         params.setUri(AppApi.BASE_URL +AppApi.VISIT_ADD);
         x.http().post(params, new BaseCommonCallBack() {
             @Override
             public void success() {
                 Toast.makeText(BaseApplication.getInstance(),"娣诲姞鎴愬姛", Toast.LENGTH_SHORT).show();
                 CheckInFragment.getInstance().resetForm();
+                if (visitReasonId == null || "".equals(visitReasonId)) {
+                    DictionaryMng.getInstance().loadVisitReasonList();
+                }
             }
         });
     }
 
-    public void findCheckInLeftList(final boolean isVisitorList, final boolean isSortByDept, String searchText) {
-        RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.REGISTER_QUERY);
-        if (isVisitorList) {
-            params.addBodyParameter(VisitorQueryCondition.FieldNames.notCompanyId, BaseApplication.getInstance().getDevice().getCompanyId());
-        } else {
-            params.addBodyParameter(VisitorQueryCondition.FieldNames.companyId, BaseApplication.getInstance().getDevice().getCompanyId());
+    public void findCheckInLeftList(final boolean isVisitorList, final boolean isSortByDept, String searchText, final int pageNum, final boolean append) {
+        if (!BaseApplication.deviceAvailable) {
+            return;
         }
-        params.addBodyParameter(VisitorQueryCondition.FieldNames.name, searchText);
+        RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.CHECK_IN_QUERY);
+        if (isVisitorList) {
+            params.addBodyParameter(CheckInQueryCondition.FieldNames.visitorCompanyId, BaseApplication.getInstance().getDevice().getDeviceCompanyId());
+        } else {
+            params.addBodyParameter(CheckInQueryCondition.FieldNames.employeeCompanyId, BaseApplication.getInstance().getDevice().getDeviceCompanyId());
+        }
+        params.addBodyParameter(CheckInQueryCondition.FieldNames.username, searchText);
+        params.addBodyParameter(CommonVariables.Page.PAGE_NUM, pageNum+"");
+        params.addBodyParameter(CommonVariables.Page.PAGE_SIZE, "5");
         x.http().post(params, new BaseCommonCallBack() {
             public void success() {
                 List<CheckInQueryItem> list = getList(CheckInQueryItem.class);
@@ -70,16 +83,32 @@
                     allItems.add(item);
                     prev = name;
                 }
-                if (isVisitorList) {
-                    CheckInFragment.getInstance().get_fragment_check_in_left_visitor().show(allItems);
+                if (hasMorePages()) {
+                    allItems.add(CommonVariables.Page.hasMorePages);
                 } else {
-                    CheckInFragment.getInstance().get_fragment_check_in_left_interviewee().show(allItems);
+                    if (getPageNum() > 1) {
+                        allItems.add(CommonVariables.Page.reachBottom);
+                    } else {
+                        if (allItems.size() > 0) {
+                            allItems.add(CommonVariables.Page.reachBottom);
+                        } else {
+                            allItems.add(CommonVariables.Page.noMorePage);
+                        }
+                    }
+                }
+                if (isVisitorList) {
+                    CheckInFragment.getInstance().get_fragment_check_in_left_visitor().show(allItems, append);
+                } else {
+                    CheckInFragment.getInstance().get_fragment_check_in_left_interviewee().show(allItems, isSortByDept, append);
                 }
             }
         });
     }
 
     private void sort(List<CheckInQueryItem> list, final boolean sortedByDept) {
+        if (!BaseApplication.deviceAvailable) {
+            return;
+        }
         Collections.sort(list, new Comparator<CheckInQueryItem>() {
             @Override
             public int compare(CheckInQueryItem t1, CheckInQueryItem t2) {

--
Gitblit v1.8.0