From 97db75238a96a75f41bafd469548c2a84ba37080 Mon Sep 17 00:00:00 2001 From: didiyu <1293722656@qq.com> Date: 星期五, 28 九月 2018 14:31:04 +0800 Subject: [PATCH] Merge branch 'dev_lxw' of https://didiyu@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw --- gx_tieta/src/com/fgkj/dao/impl/Battalarm_data_historyImpl.java | 3 ++- 1 files changed, 2 insertions(+), 1 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..f3d80d9 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 @@ -110,7 +110,7 @@ " 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 ? "; /*//鐢ㄤ簬瀹炴椂鍛婅 String almSqlT="and alm_cleared_type=? "; //鍘嗗彶鍛婅 @@ -169,6 +169,7 @@ adata_H.getAlm_start_time1(), "%"+binf.getStationName1()+"%", "%"+binf.getStationName()+"%", + "%"+binf.getStationName2()+"%", //adata_H.getAlm_cleared_type(), -- Gitblit v1.9.1