From 48d61aafa2551ae2ee0a9484b590d64e10baeae3 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 07 四月 2017 16:04:43 +0800
Subject: [PATCH] 

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java |   94 +++++++++++++++-------------------------------
 1 files changed, 31 insertions(+), 63 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 6290497..bc40c69 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
@@ -4,12 +4,12 @@
 
 import cn.com.basic.face.base.BaseApplication;
 import cn.com.basic.face.fragment.CheckInFragment;
-import cn.com.basic.face.fragment.SupervisoryFragment;
 import cn.com.basic.face.util.AppApi;
 
 import org.xutils.http.RequestParams;
 import org.xutils.x;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
@@ -17,10 +17,7 @@
 import cn.com.basic.face.discern.common.BaseCommonCallBack;
 import cn.com.basic.face.discern.query.condition.VisitorQueryCondition;
 import cn.com.basic.face.discern.query.item.CheckInQueryItem;
-
-/**
- * 鏉ヨ鐧昏
- */
+import cn.com.basic.face.util.CharacterParser;
 
 public class CheckInMng {
 
@@ -30,67 +27,18 @@
         return instance;
     }
 
-    /**
-     * 鏌ヨ鏉ヨ浜哄憳鍒楄〃
-     */
-    public void findSupervisoryBottomList(String pageNum, String name, final boolean isClear) {
-        //id锛屽悕绉帮紝澶村儚璺緞锛岃仈绯荤數璇濓紝鍏徃鍚嶇О锛岃瘉浠剁紪鍙�
-        RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.CheckInQuery);
-        params.addBodyParameter(VisitorQueryCondition.FieldNames.notCompanyId, BaseApplication.getInstance().getPlace().getCompanyId());
-        params.addBodyParameter(VisitorQueryCondition.FieldNames.name, name);
-        x.http().post(params, new BaseCommonCallBack() {
-            public void success() {
-                //CheckInFragment.getInstance().listChanged(getList(CheckInQueryItem.class), isClear);
-            }
-        });
-    }
-
-    /**
-     * 鏌ヨ鏉ヨ浜哄憳鍒楄〃
-     */
-    public void findSupervisoryBottomList() {
-        //id锛屽悕绉帮紝澶村儚璺緞锛岃仈绯荤數璇濓紝鍏徃鍚嶇О锛岃瘉浠剁紪鍙�
-        RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.CheckInQuery);
-        params.addBodyParameter(VisitorQueryCondition.FieldNames.notCompanyId, BaseApplication.getInstance().getPlace().getCompanyId());
-        x.http().post(params, new BaseCommonCallBack() {
-            public void success() {
-                //SupervisoryFragment.getInstance().visitorListChanged(getList(CheckInQueryItem.class));
-            }
-        });
-    }
-
-    /**
-     * 鏌ヨ琚闂汉鍛樺垪琛�
-     */
-    public void findIntervieweeList(String pageNum, String name, final boolean isClear) {
-        RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.CheckInQuery);
-        params.addBodyParameter(VisitorQueryCondition.FieldNames.companyId, BaseApplication.getInstance().getPlace().getCompanyId());
-        params.addBodyParameter(VisitorQueryCondition.FieldNames.name, name);
-        x.http().post(params, new BaseCommonCallBack() {
-            public void success() {
-                //CheckInFragment.getInstance().listChanged(getList(CheckInQueryItem.class), isClear);
-            }
-        });
-    }
-
-    /**
-     * 娣诲姞璁垮璁板綍
-     * @param params
-     */
     public void add(RequestParams params) {
-
-        params.setUri(AppApi.BASEURL+AppApi.CHECK_IN_ADD);
+        params.setUri(AppApi.BASE_URL +AppApi.CHECK_IN_ADD);
         x.http().post(params, new BaseCommonCallBack() {
             @Override
             public void success() {
                 Toast.makeText(BaseApplication.getInstance(),"娣诲姞鎴愬姛", Toast.LENGTH_SHORT).show();
             }
         });
-
     }
 
     public void findCheckInLeftList(final boolean isVisitorList, final boolean isSortByDept, String searchText) {
-        RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.CheckInQuery);
+        RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.CHECK_IN_QUERY);
         if (isVisitorList) {
             params.addBodyParameter(VisitorQueryCondition.FieldNames.notCompanyId, BaseApplication.getInstance().getPlace().getCompanyId());
         } else {
@@ -101,7 +49,27 @@
             public void success() {
                 List<CheckInQueryItem> list = getList(CheckInQueryItem.class);
                 sort(list, isSortByDept);
-                CheckInFragment.getInstance().get_fragment_check_in_left_list_view().show(list, isVisitorList);
+                List allItems = new ArrayList();
+                String name = "";
+                String prev = "";
+                for (int i = 0; i < list.size(); i++) {
+                    CheckInQueryItem item = list.get(i);
+                    if (isSortByDept) {
+                        name = CharacterParser.getInstance().getSelling(item.getDeptName()).substring(0, 1);
+                    } else {
+                        name = CharacterParser.getInstance().getSelling(item.getName()).substring(0, 1);
+                    }
+                    if (!name.equals(prev)) {
+                        allItems.add(name);
+                    }
+                    allItems.add(item);
+                    prev = name;
+                }
+                if (isVisitorList) {
+                    CheckInFragment.getInstance().get_fragment_check_in_left_visitor().show(allItems);
+                } else {
+                    CheckInFragment.getInstance().get_fragment_check_in_left_interviewee().show(allItems);
+                }
             }
         });
     }
@@ -114,18 +82,18 @@
                     String dept1Name = t1.getDeptName()==null?"":t1.getDeptName();
                     String dept2Name = t2.getDeptName()==null?"":t2.getDeptName();
                     if(!dept1Name.equals(dept2Name)) {
-                        return dept1Name.compareTo(dept2Name);
+                        String dept1Name_a = CharacterParser.getInstance().getSelling(dept1Name).toLowerCase();
+                        String dept1Name_b = CharacterParser.getInstance().getSelling(dept2Name).toLowerCase();
+                        return dept1Name_a.compareTo(dept1Name_b);
                     }
                 }
                 String name1 = t1.getName()==null?"":t1.getName();
                 String name2 = t2.getName()==null?"":t2.getName();
-                return name1.compareTo(name2);
+                String dept1Name_a = CharacterParser.getInstance().getSelling(name1).toLowerCase();
+                String dept1Name_b = CharacterParser.getInstance().getSelling(name2).toLowerCase();
+                return dept1Name_a.compareTo(dept1Name_b);
             }
         });
     }
-
-    /**
-     * 鏌ヨ鎷滆浜嬬敱鍒楄〃
-     */
 
 }

--
Gitblit v1.8.0