From e09e9f8a34cbc99a33dfa9ef1792b0025575c3a8 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 01 八月 2017 11:41:19 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/CheckInDao.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
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 4d2e7a1..7b5c1b0 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
@@ -55,7 +55,8 @@
"d.company_id," +
"e.post_name," +
"a.mobile_phone," +
- "a.warning" +
+ "a.warning," +
+ "a.company" +
" FROM" +
" register a" +
" LEFT JOIN company d ON d.company_id = a.company_id" +
@@ -66,9 +67,9 @@
" 1 = 1";
String deviceCompanyId = BaseApplication.getInstance().getAndroidDevice().getCompanyId();
if(isVisitorList) {
- sql += " AND f.device_company_id = " + deviceCompanyId;
- }else{
sql += " AND ( f.device_company_id != " + deviceCompanyId+" OR f.device_company_id IS NULL"+")";
+ }else{
+ sql += " AND ( f.device_company_id = " + deviceCompanyId + " or a.visitor_or_attender='attender')";
}
if(searchText != null && !searchText.trim().isEmpty()) {
@@ -95,6 +96,10 @@
cqi.setCompanyId(c.getString(c.getColumnIndex("company_id")));
cqi.setPostName(c.getString(c.getColumnIndex("post_name")));
cqi.setMobilePhone(c.getString(c.getColumnIndex("mobile_phone")));
+ String company = c.getString(c.getColumnIndex("company"));
+ if (company != null && !"".equals(company)) {
+ cqi.setCompanyName(company);
+ }
cqi.setWarning(c.getString(c.getColumnIndex("warning")));
list.add(cqi);
}
@@ -239,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());
@@ -253,6 +259,7 @@
contentValues.put("is_synchron",item.getIsSynchron());
contentValues.put("device_company_id",item.getDeviceCompanyId());
contentValues.put("create_time",item.getCreateTime());
+ contentValues.put("device_id", item.getDeviceId());
long registerId = MainActivity.getInstance().db.insert("visit", "", contentValues);
return registerId;
--
Gitblit v1.8.0