From 16acacd5bd4b15a15e96720a07f91ce8e4aa086c Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 11 四月 2017 11:31:37 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java | 45 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 36 insertions(+), 9 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 e9c6245..cd80498 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
@@ -9,6 +9,7 @@
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;
@@ -16,6 +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 {
@@ -26,28 +28,49 @@
}
public void add(RequestParams params) {
- params.setUri(AppApi.BASEURL+AppApi.CHECK_IN_ADD);
+ 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();
}
});
}
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.REGISTER_QUERY);
if (isVisitorList) {
- params.addBodyParameter(VisitorQueryCondition.FieldNames.notCompanyId, BaseApplication.getInstance().getPlace().getCompanyId());
+ params.addBodyParameter(VisitorQueryCondition.FieldNames.notCompanyId, BaseApplication.getInstance().getDevice().getCompanyId());
} else {
- params.addBodyParameter(VisitorQueryCondition.FieldNames.companyId, BaseApplication.getInstance().getPlace().getCompanyId());
+ params.addBodyParameter(VisitorQueryCondition.FieldNames.companyId, BaseApplication.getInstance().getDevice().getCompanyId());
}
params.addBodyParameter(VisitorQueryCondition.FieldNames.name, searchText);
x.http().post(params, new BaseCommonCallBack() {
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.getUsername()).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);
+ }
}
});
}
@@ -60,12 +83,16 @@
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 name1 = t1.getUsername()==null?"":t1.getUsername();
+ String name2 = t2.getUsername()==null?"":t2.getUsername();
+ 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