From 7c4bfcaec18e0f40e03c9e90edf8a15f21cbc639 Mon Sep 17 00:00:00 2001
From: sujinwen <sujinwen@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 26 七月 2017 15:57:23 +0800
Subject: [PATCH] Failed commit: Default
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/VisitDao.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
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 ba58534..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,15 +33,15 @@
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").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 department b on a.department_id = b.dept_id ")
.append(" LEFT JOIN post e on e.post_id=a.post_id ")
.append(" LEFT JOIN dictionary f on f.dict_id=a.gender_id ")
.append(" LEFT JOIN dictionary g on g.dict_id=a.identity_type_id ")
.append(" LEFT JOIN dictionary h on h.dict_id=a.country_id ")
- .append(" LEFT JOIN register j on j.register_id=a.register_id ")
+ .append(" LEFT JOIN register j on j.register_id=i.visitee_id ")
+ .append(" LEFT JOIN department b on j.department_id = b.dept_id ")
.append(" LEFT JOIN dictionary k on k.dict_id=i.visit_reason_id ")
.append(" LEFT JOIN dictionary l on l.dict_id=i.current_state_id ")
.append(" WHERE ").append(" 1 = 1 AND a.register_id IS NOT NULL ");
@@ -79,6 +79,14 @@
aqi.setExitTime(c.getString(c.getColumnIndex("exit_time")));
aqi.setCurrentStatus(c.getString(c.getColumnIndex("current_status")));
aqi.setIdCardPhoto(c.getString(c.getColumnIndex("id_card_photo")));
+ String company = c.getString(c.getColumnIndex("company"));
+ 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