From 81b5612ff5fa95f7af8fcb9c10d92495de79150e Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 13 四月 2017 10:08:52 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java | 35 +++++++++++++++++++++++++----------
1 files changed, 25 insertions(+), 10 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 83b64d3..ce70b07 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.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;
@@ -33,18 +35,19 @@
@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.BASE_URL +AppApi.Query.REGISTER_QUERY);
+ RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.CHECK_IN_QUERY);
if (isVisitorList) {
- params.addBodyParameter(VisitorQueryCondition.FieldNames.notCompanyId, BaseApplication.getInstance().getDevice().getCompanyId());
+ params.addBodyParameter(CheckInQueryCondition.FieldNames.visitorCompanyId, BaseApplication.getInstance().getDevice().getCompanyId());
} else {
- params.addBodyParameter(VisitorQueryCondition.FieldNames.companyId, BaseApplication.getInstance().getDevice().getCompanyId());
+ params.addBodyParameter(CheckInQueryCondition.FieldNames.employeeCompanyId, BaseApplication.getInstance().getDevice().getCompanyId());
}
- params.addBodyParameter(VisitorQueryCondition.FieldNames.name, searchText);
+ params.addBodyParameter(CheckInQueryCondition.FieldNames.username, searchText);
x.http().post(params, new BaseCommonCallBack() {
public void success() {
List<CheckInQueryItem> list = getList(CheckInQueryItem.class);
@@ -55,8 +58,11 @@
for (int i = 0; i < list.size(); i++) {
CheckInQueryItem item = list.get(i);
if (isSortByDept) {
- name = CharacterParser.getInstance().getSelling(item.getDeptName()).substring(0, 1);
+ if (item.getDeptName() != null && item.getDeptName().length() > 0) {
+ name = CharacterParser.getInstance().getSelling(item.getDeptName()).substring(0, 1);
+ }
} else {
+ if (item.getUsername() != null && item.getUsername().length() > 0)
name = CharacterParser.getInstance().getSelling(item.getUsername()).substring(0, 1);
}
if (!name.equals(prev)) {
@@ -68,7 +74,7 @@
if (isVisitorList) {
CheckInFragment.getInstance().get_fragment_check_in_left_visitor().show(allItems);
} else {
- CheckInFragment.getInstance().get_fragment_check_in_left_interviewee().show(allItems);
+ CheckInFragment.getInstance().get_fragment_check_in_left_interviewee().show(allItems, isSortByDept);
}
}
});
@@ -82,18 +88,27 @@
String dept1Name = t1.getDeptName()==null?"":t1.getDeptName();
String dept2Name = t2.getDeptName()==null?"":t2.getDeptName();
if(!dept1Name.equals(dept2Name)) {
- String dept1Name_a = CharacterParser.getInstance().getSelling(dept1Name).toLowerCase();
- String dept1Name_b = CharacterParser.getInstance().getSelling(dept2Name).toLowerCase();
+ String dept1Name_a = dept1Name.trim();
+ String dept1Name_b = dept2Name.trim();
+ if (dept1Name_a.length() > 0 && dept1Name_b.length() > 0) {
+ dept1Name_a = CharacterParser.getInstance().getSelling(dept1Name).toLowerCase();
+ dept1Name_b = CharacterParser.getInstance().getSelling(dept2Name).toLowerCase();
+ }
return dept1Name_a.compareTo(dept1Name_b);
}
}
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();
+ String dept1Name_a = name1.trim();
+ String dept1Name_b = name2.trim();
+ if (dept1Name_a.length() > 0 && dept1Name_b.length() > 0) {
+ dept1Name_a = CharacterParser.getInstance().getSelling(name1).toLowerCase();
+ dept1Name_b = CharacterParser.getInstance().getSelling(name2).toLowerCase();
+ }
return dept1Name_a.compareTo(dept1Name_b);
}
});
}
+
}
--
Gitblit v1.8.0