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/AttendanceDao.java | 35 ++++++++++++-----------------------
1 files changed, 12 insertions(+), 23 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/AttendanceDao.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/AttendanceDao.java
index 0042c7e..53b4900 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/AttendanceDao.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/AttendanceDao.java
@@ -7,7 +7,7 @@
import java.util.List;
import cn.com.basic.face.base.BaseApplication;
-import cn.com.basic.face.base.Config;
+import cn.com.basic.face.base.MainActivity;
import cn.com.basic.face.discern.common.CommonVariables;
import cn.com.basic.face.discern.common.ResultBean;
import cn.com.basic.face.discern.query.item.AttendanceDetailQueryItem;
@@ -40,26 +40,27 @@
*/
public ResultBean reloadLeftList(String searchText, final int pageNum, final boolean append) {
ResultBean resultBean = new ResultBean();
- SQLiteDatabase db = Config.sqlMap.getDb();
- db.beginTransaction();
+ SQLiteDatabase db = MainActivity.getInstance().db;
try {
+ String deviceCompanyId = BaseApplication.getInstance().getAndroidDevice().getCompanyId();
StringBuilder sb = new StringBuilder(40);
sb.append("SELECT b.register_id,").append(" b.username,").append(" b.surveillance_photo,")
- .append(" b.identify_num,").append(" e.post_name,").append(" d.`name` gender,")
+ .append(" b.identify_num,").append(" e.post_name,").append(" d.name gender,")
.append(" f.dept_name").append(" FROM ").append(" employee a ")
.append(" LEFT JOIN register b ON a.register_id = b.register_id ")
.append(" LEFT JOIN dictionary d ON d.dict_id = b.gender_id ")
.append(" LEFT JOIN post e ON e.post_id = b.post_id ")
.append(" LEFT JOIN department f ON f.dept_id = b.department_id ")
- .append(" WHERE ").append(" 1 = 1 ").append(" GROUP BY b.register_id ")
- .append(" ORDER BY b.username ");
- String deviceCompanyId = BaseApplication.getInstance().getAndroidDevice().getCompanyId();
+ .append(" WHERE ").append(" 1 = 1 ");
if(deviceCompanyId != null && !deviceCompanyId.trim().isEmpty()) {
sb.append(" AND a.device_company_id = ").append(deviceCompanyId);
}
if(searchText != null && !searchText.trim().isEmpty()) {
sb.append(" AND b.username LIKE '%").append(searchText).append("%'");
}
+ sb.append(" GROUP BY b.register_id ")
+ .append(" ORDER BY b.username ");
+
StringBuilder count = new StringBuilder(sb.length());
count.append("select count(*) as count from (").append(sb).append(" ) _table");
sb.append(" LIMIT ").append(getStartIndex(pageNum)).append(",").append(CommonVariables.Page.DEFAULT_PAGE_SIZE);
@@ -80,18 +81,13 @@
}
Integer total = null;
while (c_count.moveToNext()) {
- total = c.getInt(c.getColumnIndex("register_id"));
+ total = c_count.getInt(0);
}
resultBean.setTotalPages(getTotalPageSize(total));
resultBean.setPageNum(pageNum);
resultBean.setData(list);
- c.close();
- c_count.close();
- db.setTransactionSuccessful();
} catch (Exception e) {
e.printStackTrace();
- } finally {
- db.endTransaction();
}
return resultBean;
}
@@ -101,8 +97,7 @@
*/
public List<AttendanceDetailQueryItem> reloadAttendanceDetail(AttendanceQueryItem item) {
List<AttendanceDetailQueryItem> list = new ArrayList();
- SQLiteDatabase db = Config.sqlMap.getDb();
- db.beginTransaction();
+ SQLiteDatabase db = MainActivity.getInstance().db;
try {
StringBuilder sb = new StringBuilder(40);
sb.append("SELECT a.time,").append(" b.device_name,").append(" case when a.attendance_type_id=305 then '绛惧埌'")
@@ -122,7 +117,7 @@
if(deviceCompanyId != null && !deviceCompanyId.trim().isEmpty()) {
sb.append(" AND a.device_company_id = ").append(deviceCompanyId);
}
- sb.append("ORDER BY a.time DESC");
+ sb.append(" ORDER BY a.time DESC");
StringBuilder count = new StringBuilder(sb.length());
count.append("select count(*) as count from (").append(sb).append(" ) _table");
sb.append(" LIMIT ").append("0").append(",").append(100);
@@ -138,18 +133,12 @@
}
Integer total = null;
while (c_count.moveToNext()) {
- total = c.getInt(c.getColumnIndex("register_id"));
+ total = c_count.getInt(0);
}
- c.close();
- c_count.close();
- db.setTransactionSuccessful();
} catch (Exception e) {
e.printStackTrace();
- } finally {
- db.endTransaction();
}
return list;
}
-
}
--
Gitblit v1.8.0