From d56dfe791f22ddcccd7de6fb2c4be1255a80f9c5 Mon Sep 17 00:00:00 2001
From: sujinwen <sujinwen@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 27 七月 2017 20:39:23 +0800
Subject: [PATCH] Failed commit: Default
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/CheckInDao.java | 35 ++++++++++++++++++++++++++++++-----
1 files changed, 30 insertions(+), 5 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 1a34519..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
@@ -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);
}
@@ -181,7 +186,7 @@
return resultBean;
}
- public List<OfflineVisitItem> readOfflineVisitItemFromLocal(long registerId) {
+ public List<OfflineVisitItem> readOfflineVisitItemFromLocal() {
String sql = "SELECT\n" +
" a.visit_id,\n" +
" a.visit_reason_id,\n" +
@@ -204,7 +209,8 @@
"WHERE\n" +
" 1 = 1\n" +
"AND a.is_synchron = 'N'\n" +
- "AND visitor_id = '"+registerId+"'";
+ " limit 1";
+// "AND visitor_id = '"+registerId+"'";
List<OfflineVisitItem> items = new ArrayList<>();
Cursor c = MainActivity.getInstance().db.rawQuery(sql, new String[]{});
while (c.moveToNext()) {
@@ -238,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());
@@ -258,4 +265,22 @@
}
+ public void updateVisitorId(String sqliteVisitorId, String mysqlVisitorId) {
+ if (sqliteVisitorId == null || "".equals(sqliteVisitorId.trim())
+ || mysqlVisitorId == null || "".equals(mysqlVisitorId.trim())
+ ) {
+ return;
+ }
+ MainActivity.getInstance().db.execSQL("update visit set visitor_id='"+mysqlVisitorId+"' where 1=1 and visitor_id='"+sqliteVisitorId+"'");
+ }
+
+ public void updateVisiteeId(String sqliteVisiteeId, String mysqlVisiteeId) {
+ if (sqliteVisiteeId == null || "".equals(sqliteVisiteeId.trim())
+ || mysqlVisiteeId == null || "".equals(mysqlVisiteeId.trim())
+ ) {
+ return;
+ }
+ MainActivity.getInstance().db.execSQL("update visit set visitee_id='"+mysqlVisiteeId+"' where 1=1 and visitee_id='"+sqliteVisiteeId+"'");
+ }
+
}
--
Gitblit v1.8.0