From 94e5b0bddf2b83e1591de425d3e30030fcbb1d23 Mon Sep 17 00:00:00 2001
From: CJJ <Administrator@USER-20180117QL>
Date: 星期二, 25 十二月 2018 11:50:53 +0800
Subject: [PATCH] 新建修改到APPLY
---
gx_tieta/src/com/fgkj/dao/impl/Battalarm_data_historyImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Battalarm_data_historyImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Battalarm_data_historyImpl.java
index 674ea82..fa5d6e9 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Battalarm_data_historyImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Battalarm_data_historyImpl.java
@@ -105,12 +105,12 @@
String numberSql="SELECT FOUND_ROWS() number";//瀛樻斁鎬绘暟
Connection conn=DBUtil.getConn();//sql鍜宯umberSql鍏辩敤涓�涓猚onnection
String baseSql = "select SQL_CALC_FOUND_ROWS distinct(db_alarm.tb_battalarm_data_history.BattGroupId),db_alarm.tb_battalarm_data_history.num,alm_signal_id,db_alarm.tb_battalarm_data_history.monnum,alm_value,alm_level,alm_is_confirmed,alm_confirmed_time,alm_start_time,alm_end_time, " +
- " stationname,battgroupname" +
+ " stationname,stationname5,battgroupname" +
" from db_alarm.tb_battalarm_data_history,db_battinf.tb_battinf " +
- " where alm_id in(?,?,?,?,?,?) and alm_signal_id%2 in(?,?) " +
+ " where alm_id in(?,?,?,?,?,?,?) and alm_signal_id%2 in(?,?) " +
" and alm_level in(?,?,?,?) " +
" and alm_start_time>=? and alm_start_time<=? " +
- " and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ? ";
+ " and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ? and db_battinf.tb_battinf.stationname2 like ? and db_battinf.tb_battinf.stationname5 like ? ";
/*//鐢ㄤ簬瀹炴椂鍛婅
String almSqlT="and alm_cleared_type=? ";
//鍘嗗彶鍛婅
@@ -149,6 +149,7 @@
//System.out.println(sql);
List<Batt_Maint_Dealarm> list= DAOHelper.executeQueryLimit(sql,conn,
new Object[] {
+ mainf.getUsr_id(),
mainf.getFault_type_id(),
mainf.getFault_level(),
mainf.getRecord_uid(),
@@ -169,6 +170,8 @@
adata_H.getAlm_start_time1(),
"%"+binf.getStationName1()+"%",
"%"+binf.getStationName()+"%",
+ "%"+binf.getStationName2()+"%",
+ "%"+binf.getStationName5()+"%",
//adata_H.getAlm_cleared_type(),
@@ -187,6 +190,7 @@
Batt_Maint_Dealarm bmd = new Batt_Maint_Dealarm();
BattInf binf = new BattInf();
binf.setStationName(rs.getString("stationName"));
+ binf.setStationName5(rs.getString("stationName5"));
binf.setBattGroupName(rs.getString("battGroupName"));
Battalarm_data_history adata_H = new Battalarm_data_history();
--
Gitblit v1.9.1