Failed commit: Default

sujinwen

2017-07-25 2020f8a388a82b716f5956014c00b2d76a8a1a65

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

@@ -11,6 +11,7 @@
import cn.com.basic.face.discern.entity.VisitDetail;

import cn.com.basic.face.discern.query.condition.AttendanceQueryCondition;

import cn.com.basic.face.discern.query.condition.CheckInQueryCondition;

import cn.com.basic.face.discern.query.item.OfflineAttenderRegisterItem;

import cn.com.basic.face.discern.query.item.OfflineVisitItem;

import cn.com.basic.face.fragment.CheckInFragment;

import cn.com.basic.face.service.sqlite.CheckInDao;

@@ -60,10 +61,22 @@
                }

            });

        } else {

            CheckInDao.getInstance().add(offlineVisitItem);

            if (visitReasonId == null || "".equals(visitReasonId)) {

                DictionaryMng.getInstance().loadVisitReasonList();

            }

            final long result = CheckInDao.getInstance().addOfflineVisit(offlineVisitItem);



            MainActivity.getInstance().runOnUiThread(new Runnable() {

                @Override

                public void run() {

                    if (result > 0) {

                        Toast.makeText(BaseApplication.getInstance(), "添加成功", Toast.LENGTH_SHORT).show();

                        if (visitReasonId == null || "".equals(visitReasonId)) {

                            DictionaryMng.getInstance().loadVisitReasonList();

                        }

                        CheckInFragment.getInstance().resetForm();

                    } else {

                        Toast.makeText(BaseApplication.getInstance(), "添加失败", Toast.LENGTH_SHORT).show();

                    }

                }

            });

        }

    }



@@ -95,6 +108,9 @@


    public void findCheckInLeftListAfterReturn(ResultBean resultBean, final boolean isVisitorList, final boolean isSortByDept, final boolean append) {

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

        if (list == null) {

            list = new ArrayList<>();

        }



        List prevList = null;

        if (append) {

@@ -156,6 +172,9 @@
        if (!BaseApplication.deviceAvailable) {

            return;

        }

        if (list == null) {

            list = new ArrayList<>();

        }

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

            @Override

            public int compare(CheckInQueryItem item1, CheckInQueryItem item2) {

@@ -186,7 +205,7 @@
    }





    public void sendOfflineCheckInToServer() {

    public void sendOfflineCheckInToServer(Integer mysqlVisitorId, long sqliteVisitorId) {



    }