From 54b23ebcea16ba422afd595bcaf04d0b7cb6407c Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 26 七月 2017 14:39:00 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/VisitDao.java | 6 +
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/OfflineVisitItem.java | 164 ----------------------------------------
VisitFace/DemoForBsk/app/src/main/assets/db/aibatis_test_db | 0
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Visit.java | 10 ++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttenderRegisterFragment.java | 2
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/CheckInDao.java | 1
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java | 2
7 files changed, 20 insertions(+), 165 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/assets/db/aibatis_test_db b/VisitFace/DemoForBsk/app/src/main/assets/db/aibatis_test_db
index 88683d6..5b6b1f7 100644
--- a/VisitFace/DemoForBsk/app/src/main/assets/db/aibatis_test_db
+++ b/VisitFace/DemoForBsk/app/src/main/assets/db/aibatis_test_db
Binary files differ
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Visit.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Visit.java
index 70d3f9c..cb86130 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Visit.java
+++ b/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 +
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/OfflineVisitItem.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/OfflineVisitItem.java
index f66fc2c..312f896 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/OfflineVisitItem.java
+++ b/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;
- }
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttenderRegisterFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttenderRegisterFragment.java
index 12ecf0e..50f41d3 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttenderRegisterFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttenderRegisterFragment.java
@@ -161,7 +161,7 @@
fragment_attender_register_gender.callOnClick();
return;
}
-
+
String post = fragment_attender_register_post.getValue();
if (post.trim().length() <= 0) {
Toast.makeText(MainActivity.getInstance(), "鑱屽姟绫诲瀷涓嶈兘涓虹┖", Toast.LENGTH_SHORT).show();
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java
index 77206e6..89a24c0 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java
+++ b/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");
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/CheckInDao.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/CheckInDao.java
index 989b679..d1531ed 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/CheckInDao.java
+++ b/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());
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/VisitDao.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/VisitDao.java
index 115f686..2c6166b 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/VisitDao.java
+++ b/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;
--
Gitblit v1.8.0