From d2f697fa887e28b86d38332e2fbde930c54fb43f Mon Sep 17 00:00:00 2001 From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674> Date: 星期四, 20 四月 2017 10:16:49 +0800 Subject: [PATCH] --- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java | 97 +++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 83 insertions(+), 14 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..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,12 +3,16 @@ 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; 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 +20,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 { @@ -25,34 +30,85 @@ return instance; } - public void add(RequestParams params) { - params.setUri(AppApi.BASEURL+AppApi.CHECK_IN_ADD); + 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.BASEURL+AppApi.CheckInQuery); - if (isVisitorList) { - params.addBodyParameter(VisitorQueryCondition.FieldNames.notCompanyId, BaseApplication.getInstance().getPlace().getCompanyId()); - } else { - params.addBodyParameter(VisitorQueryCondition.FieldNames.companyId, BaseApplication.getInstance().getPlace().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); 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) { + 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)) { + allItems.add(name); + } + allItems.add(item); + prev = name; + } + if (hasMorePages()) { + allItems.add(CommonVariables.Page.hasMorePages); + } else { + 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) { @@ -60,14 +116,27 @@ 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 = 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.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 = 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