xuxiuxi

2017-04-26 ecbe68b56e1ed965395d6716818e2aef148bbb8e

 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java

@@ -52,14 +52,15 @@
            return;

        }

        RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.CHECK_IN_QUERY);

        String deviceCompanyId = BaseApplication.getInstance().getDevice().getDeviceCompanyId();

        if (isVisitorList) {

            params.addBodyParameter(CheckInQueryCondition.FieldNames.visitorCompanyId, BaseApplication.getInstance().getDevice().getDeviceCompanyId());

            params.addBodyParameter(CheckInQueryCondition.FieldNames.visitorCompanyId, deviceCompanyId);

        } else {

            params.addBodyParameter(CheckInQueryCondition.FieldNames.employeeCompanyId, BaseApplication.getInstance().getDevice().getDeviceCompanyId());

            params.addBodyParameter(CheckInQueryCondition.FieldNames.employeeCompanyId, deviceCompanyId);

        }

        params.addBodyParameter(CheckInQueryCondition.FieldNames.username, searchText);

        params.addBodyParameter(CommonVariables.Page.PAGE_NUM, pageNum+"");

        params.addBodyParameter(CommonVariables.Page.PAGE_SIZE, "5");

        params.addBodyParameter(CommonVariables.Page.PAGE_SIZE, "20");

        x.http().post(params, new BaseCommonCallBack() {

            public void success() {

                List<CheckInQueryItem> list = getList(CheckInQueryItem.class);

@@ -113,7 +114,7 @@
                    }

                }

                if (isVisitorList) {

                    CheckInFragment.getInstance().get_fragment_check_in_left_visitor().show(allItems, append);

                    CheckInFragment.getInstance().get_fragment_check_in_left_visitor().show(allItems);

                } else {

                    CheckInFragment.getInstance().get_fragment_check_in_left_interviewee().show(allItems, isSortByDept, append);

                }

@@ -127,10 +128,10 @@
        }

        Collections.sort(list, new Comparator<CheckInQueryItem>() {

            @Override

            public int compare(CheckInQueryItem t1, CheckInQueryItem t2) {

            public int compare(CheckInQueryItem item1, CheckInQueryItem item2) {

                if (sortedByDept) {

                    String dept1Name = t1.getDeptName()==null?"":t1.getDeptName();

                    String dept2Name = t2.getDeptName()==null?"":t2.getDeptName();

                    String dept1Name = item1.getDeptName()==null?"":item1.getDeptName();

                    String dept2Name = item2.getDeptName()==null?"":item2.getDeptName();

                    if(!dept1Name.equals(dept2Name)) {

                        String dept1Name_a = dept1Name.trim();

                        String dept1Name_b = dept2Name.trim();

@@ -141,13 +142,13 @@
                        return dept1Name_a.compareTo(dept1Name_b);

                    }

                }

                String name1 = t1.getUsername()==null?"":t1.getUsername();

                String name2 = t2.getUsername()==null?"":t2.getUsername();

                String dept1Name_a = name1.trim();

                String dept1Name_b = name2.trim();

                String username1 = item1.getUsername()==null?"":item1.getUsername();

                String username2 = item2.getUsername()==null?"":item2.getUsername();

                String dept1Name_a = username1.trim();

                String dept1Name_b = username2.trim();

                if (dept1Name_a.length() > 0 && dept1Name_b.length() > 0) {

                    dept1Name_a = CharacterParser.getInstance().getSelling(name1).toLowerCase();

                    dept1Name_b = CharacterParser.getInstance().getSelling(name2).toLowerCase();

                    dept1Name_a = CharacterParser.getInstance().getSelling(username1).toLowerCase();

                    dept1Name_b = CharacterParser.getInstance().getSelling(username2).toLowerCase();

                }

                return dept1Name_a.compareTo(dept1Name_b);

            }