From 8a15db8b08c70dfd54cc27d78065e08de22d5952 Mon Sep 17 00:00:00 2001
From: whychdw <49690745@qq.com>
Date: 星期二, 03 十二月 2019 15:13:08 +0800
Subject: [PATCH] Merge branch 'FBS9600' of http://whychdw@118.89.139.230:10101/r/FBS9600App.git into FBS9600
---
platforms/android/app/src/main/java/com/fgkj/impl/Battalram_dataImpl.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/platforms/android/app/src/main/java/com/fgkj/impl/Battalram_dataImpl.java b/platforms/android/app/src/main/java/com/fgkj/impl/Battalram_dataImpl.java
index c62e088..0c121f1 100644
--- a/platforms/android/app/src/main/java/com/fgkj/impl/Battalram_dataImpl.java
+++ b/platforms/android/app/src/main/java/com/fgkj/impl/Battalram_dataImpl.java
@@ -36,11 +36,13 @@
@Override
public List serchByCondition(SQLiteDatabase db, Object obj) {
Battalram_data adata=(Battalram_data)obj;
- String numsql = "select count(*) from tb_battalarm_data where ";
- String sql=" select * from tb_battalarm_data where ";
+ String numsql = "select count(*) from tb_battalarm_data,tb_battinf where tb_battinf.BattGroupId=tb_battalarm_data.BattGroupId ";
+ String sql=" select distinct tb_battalarm_data.num,tb_battalarm_data.BattGroupId,tb_battalarm_data.MonNum,alm_id,alm_signal_id,alm_start_time,alm_end_time,alm_value,alm_is_confirmed,alm_confirmed_time,alm_cleared_type" +
+ ",tb_battinf.BattGroupName " +
+ " from tb_battalarm_data,tb_battinf where tb_battinf.BattGroupId=tb_battalarm_data.BattGroupId ";
//鍛婅绫诲瀷
- String typeSqlT=" alm_cleared_type!=? ";
- String typeSqlF=" alm_cleared_type=? ";
+ String typeSqlT=" and alm_cleared_type!=? ";
+ String typeSqlF=" and alm_cleared_type=? ";
if(adata.getAlm_cleared_type()==100){
sql+=typeSqlT;
numsql+=typeSqlT;
@@ -76,6 +78,7 @@
a.setAlm_is_confirmed(rs.getInt(rs.getColumnIndex("alm_is_confirmed")));
a.setAlm_confirmed_time(ActionUtil.sdf.parse(rs.getString(rs.getColumnIndex("alm_confirmed_time"))));
a.setAlm_cleared_type(rs.getInt(rs.getColumnIndex("alm_cleared_type")));
+ a.setNote(rs.getString(rs.getColumnIndex("BattGroupName")));
Page page=new Page();
page.setPageAll(count);
a.setPage(page);
--
Gitblit v1.9.1