xuxiuxi

2017-07-26 54b23ebcea16ba422afd595bcaf04d0b7cb6407c

git-svn-id: http://192.168.1.226/svn/proxy@914 454eff88-639b-444f-9e54-f578c98de674

 VisitFace/DemoForBsk/app/src/main/assets/db/aibatis_test_db

Binary files differ

 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Visit.java

@@ -112,6 +112,8 @@


    private String createTime;



    private String visitReason;



    public String getIsValid() {

        return isValid;

    }

@@ -341,6 +343,14 @@
        this.deviceCompanyId = deviceCompanyId;

    }



    public String getVisitReason() {

        return visitReason;

    }



    public void setVisitReason(String visitReason) {

        this.visitReason = visitReason;

    }



    public String toString() {

        return 

             ",访问事件主键 ="+ visitId    +  ",访问事由主键 ="+ visitReasonId +  ",访问备注 =" + remark     + 


 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/OfflineVisitItem.java

@@ -1,167 +1,7 @@
package cn.com.basic.face.discern.query.item;



public class OfflineVisitItem {

import cn.com.basic.face.discern.entity.Visit;



    private String visitId;

    private String visitReasonId;

    private String remark;

    private String enterTime;

    private String exitTime;

    private String visitorTypeId;

    private String visitorId;

    private String visitorCompanyId;

    private String visiteeId;

    private String visiteeCompanyId;

    private String currentStateId;

    private String warning;

    private String updateTime;

    private String isSynchron;

    private String deviceCompanyId;

    private String visitReason;

    private String createTime;

    private String deviceId;

public class OfflineVisitItem extends Visit {



    public String getVisitId() {

        return visitId;

    }



    public void setVisitId(String visitId) {

        this.visitId = visitId;

    }



    public String getVisitReasonId() {

        return visitReasonId;

    }



    public void setVisitReasonId(String visitReasonId) {

        this.visitReasonId = visitReasonId;

    }



    public String getRemark() {

        return remark;

    }



    public void setRemark(String remark) {

        this.remark = remark;

    }



    public String getEnterTime() {

        return enterTime;

    }



    public void setEnterTime(String enterTime) {

        this.enterTime = enterTime;

    }



    public String getExitTime() {

        return exitTime;

    }



    public void setExitTime(String exitTime) {

        this.exitTime = exitTime;

    }



    public String getVisitorTypeId() {

        return visitorTypeId;

    }



    public void setVisitorTypeId(String visitorTypeId) {

        this.visitorTypeId = visitorTypeId;

    }



    public String getVisitorId() {

        return visitorId;

    }



    public void setVisitorId(String visitorId) {

        this.visitorId = visitorId;

    }



    public String getVisitorCompanyId() {

        return visitorCompanyId;

    }



    public void setVisitorCompanyId(String visitorCompanyId) {

        this.visitorCompanyId = visitorCompanyId;

    }



    public String getVisiteeId() {

        return visiteeId;

    }



    public void setVisiteeId(String visiteeId) {

        this.visiteeId = visiteeId;

    }



    public String getVisiteeCompanyId() {

        return visiteeCompanyId;

    }



    public void setVisiteeCompanyId(String visiteeCompanyId) {

        this.visiteeCompanyId = visiteeCompanyId;

    }



    public String getCurrentStateId() {

        return currentStateId;

    }



    public void setCurrentStateId(String currentStateId) {

        this.currentStateId = currentStateId;

    }



    public String getWarning() {

        return warning;

    }



    public void setWarning(String warning) {

        this.warning = warning;

    }



    public String getUpdateTime() {

        return updateTime;

    }



    public void setUpdateTime(String updateTime) {

        this.updateTime = updateTime;

    }



    public String getIsSynchron() {

        return isSynchron;

    }



    public void setIsSynchron(String isSynchron) {

        this.isSynchron = isSynchron;

    }



    public String getDeviceCompanyId() {

        return deviceCompanyId;

    }



    public void setDeviceCompanyId(String deviceCompanyId) {

        this.deviceCompanyId = deviceCompanyId;

    }



    public String getVisitReason() {

        return visitReason;

    }



    public void setVisitReason(String visitReason) {

        this.visitReason = visitReason;

    }



    public String getCreateTime() {

        return createTime;

    }



    public void setCreateTime(String createTime) {

        this.createTime = createTime;

    }



    public String getDeviceId() {

        return deviceId;

    }



    public void setDeviceId(String deviceId) {

        this.deviceId = deviceId;

    }

}


 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttenderRegisterFragment.java

 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java

@@ -235,7 +235,7 @@
            offlineVisitItem.setCurrentStateId(""+CommonVariables.VisitType.VISITOR_ENTERED);

            offlineVisitItem.setWarning(visitor.getWarning());

            offlineVisitItem.setCreateTime(sdf.format(new Date()));

            offlineVisitItem.setDeviceId(BaseApplication.getInstance().getAndroidDevice().getDeviceId());

            //offlineVisitItem.setDeviceId(BaseApplication.getInstance().getAndroidDevice().getDeviceId());

            offlineVisitItem.setDeviceCompanyId(BaseApplication.getInstance().getAndroidDevice().getCompanyId());

            offlineVisitItem.setIsSynchron("N");

        }


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

@@ -244,6 +244,7 @@
        ContentValues contentValues = new ContentValues();

        contentValues.put("visit_id",item.getVisitId());

        contentValues.put("visit_reason_id",item.getVisitReasonId());

        contentValues.put("visit_reason",item.getVisitReason());

        contentValues.put("remark",item.getRemark());

        contentValues.put("enter_time",item.getEnterTime());

        contentValues.put("exit_time",item.getExitTime());


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

@@ -33,7 +33,7 @@
            sb.append("SELECT a.register_id,a.username,a.surveillance_photo,d.company_name,a.tel,a.identify_num,b.dept_name,")

                    .append("d.company_id,e.post_name,a.mobile_phone,0 as type,f.`name` gender,g.`name` identity_type,")

                    .append("a.birthday,h.`name` country_name,j.username visitee,k.`name` visit_reason,i.enter_time,i.exit_time,")

                    .append("l.`name` current_status,a.id_card_photo,a.company").append(" FROM ").append(" visit i ")

                    .append("l.`name` current_status,a.id_card_photo,a.company, i.visit_reason reason ").append(" FROM ").append(" visit i ")

                    .append(" LEFT JOIN register a on i.visitor_id=a.register_id ")

                    .append(" LEFT JOIN company d on d.company_id=a.company_id ")

                    .append(" LEFT JOIN post e on e.post_id=a.post_id ")

@@ -83,6 +83,10 @@
                if (company != null && !"".equals(company)) {

                    aqi.setCompanyName(company);

                }

                String reason = c.getString(c.getColumnIndex("reason"));

                if (reason != null && !"".equals(reason)){

                    aqi.setVisitReason(reason);

                }

                list.add(aqi);

            }

            Integer total = null;