From 3ad6cbe55a4c63f4b64f6c999bf3db0a2b0187a4 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期日, 23 七月 2017 16:55:37 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/CheckInDao.java | 34 ++++++++++++----------------------
1 files changed, 12 insertions(+), 22 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 94e57ba..84311c6 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
@@ -160,40 +160,30 @@
return c.getInt(0) > 0 ? true : false;
}
- public ResultBean findCheckInLeftListById(long registerId) {
+ public ResultBean findCheckInLeftVisitorListByVisitorId(long registerId) {
SQLiteDatabase db = MainActivity.getInstance().db;
ResultBean resultBean = new ResultBean();
try {
String sql="SELECT" +
" a.register_id," +
- "a.username," +
- "a.surveillance_photo," +
- "d.company_name," +
- "a.tel," +
- "a.identify_num," +
- "b.dept_name," +
- "d.company_id," +
- "e.post_name," +
- "a.mobile_phone," +
- "a.warning" +
+ " a.username," +
+ " a.surveillance_photo," +
+ " d.company_name," +
+ " a.tel," +
+ " a.identify_num," +
+ " b.dept_name," +
+ " d.company_id," +
+ " e.post_name," +
+ " a.mobile_phone," +
+ " a.warning" +
" FROM" +
" register a" +
" LEFT JOIN company d ON d.company_id = a.company_id" +
" LEFT JOIN department b ON a.department_id = b.dept_id" +
" LEFT JOIN post e ON e.post_id = a.post_id" +
- " LEFT JOIN ( SELECT register_id, device_company_id from employee ) f ON f.register_id = a.register_id" +
" WHERE" +
" 1 = 1";
- String deviceCompanyId = BaseApplication.getInstance().getAndroidDevice().getCompanyId();
- if(true) {
- sql += " AND f.device_company_id = " + deviceCompanyId;
- }else{
- sql += " AND ( f.device_company_id != " + deviceCompanyId+" OR f.device_company_id IS NULL"+")";
- }
-
- if("" != null && !"".trim().isEmpty()) {
- sql += " AND a.register_id='"+ registerId + "'";
- }
+ sql += " AND a.register_id='"+ registerId + "'";
sql+=" order by a.name_en";
String count = "select count(*) as count from (" + sql + " ) _table";
--
Gitblit v1.8.0