From 9e5babf9db52e64bdae60137be7696e56241fca6 Mon Sep 17 00:00:00 2001
From: xingzilong <xingzilong@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 18 八月 2017 18:12:17 +0800
Subject: [PATCH] H264 NALU解析  并在RTSPServer判断

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/AttendanceDao.java |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 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 cc68be6..d72400f 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
@@ -3,7 +3,9 @@
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import cn.com.basic.face.base.BaseApplication;
@@ -42,23 +44,25 @@
         ResultBean resultBean = new ResultBean();
         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);
@@ -111,14 +115,15 @@
             if(deviceId != null && !deviceId.trim().isEmpty()) {
                 sb.append(" AND b.device_id=").append(deviceId);
             }
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            sb.append(" AND a.time like '"+sdf.format(new Date())+"%' ");
             String deviceCompanyId = BaseApplication.getInstance().getAndroidDevice().getCompanyId();
             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);
             AttendanceDetailQueryItem aqi = null;
             Cursor c = db.rawQuery(sb.toString(),new String[]{});
             Cursor c_count = db.rawQuery(count.toString(),new String[]{});
@@ -138,6 +143,5 @@
         }
         return list;
     }
-
 
 }

--
Gitblit v1.8.0