From 91e09c1174d85bb727d691317846a5d841d76e63 Mon Sep 17 00:00:00 2001
From: didiyu <1293722656@qq.com>
Date: 星期四, 27 九月 2018 14:47:19 +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/Batt_electricityImpl.java | 4 ++--
gx_tieta/src/com/fgkj/dao/impl/Batt_DevdischargeImpl.java | 4 ++--
gx_tieta/src/com/fgkj/dao/impl/Batttestdata_infDAOImpl.java | 8 ++++----
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Batt_DevdischargeImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Batt_DevdischargeImpl.java
index 1c9fb93..342a6f0 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Batt_DevdischargeImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Batt_DevdischargeImpl.java
@@ -95,7 +95,7 @@
tb_batt_devdischarge_CU+".num,"+tb_batt_devdischarge_CU+".dev_id,"+tb_batt_devdischarge_CU+".dev_name,"+tb_batt_devdischarge_CU+".dev_recordtime,"+tb_batt_devdischarge_CU+".dev_vol,"+tb_batt_devdischarge_CU+".dev_curr,"+tb_batt_devdischarge_CU+".dev_power,"+tb_batt_devdischarge_CU+".note, " +
"DISTINCTbattinf.FBSDeviceName ";
//杩炶〃鏉′欢
- String conditionSql=" from "+ tb_batt_devdischarge_CM +",(select DISTINCT(FBSdeviceid),FBSDeviceName from db_battinf.tb_battinf where stationid like ? ) as DISTINCTbattinf,"+tb_batt_devdischarge_CT+","+tb_batt_devdischarge_CU;
+ String conditionSql=" from "+ tb_batt_devdischarge_CM +",(select DISTINCT(FBSdeviceid),FBSDeviceName from db_battinf.tb_battinf where stationid like ? and stationname1 like ? and stationname2 like ? ) as DISTINCTbattinf,"+tb_batt_devdischarge_CT+","+tb_batt_devdischarge_CU;
String whereSql=" where DISTINCTbattinf.FBSdeviceid=tb_batt_devdischarge_CM.dev_id and " +
"tb_batt_devdischarge_CT.dev_id=tb_batt_devdischarge_CM.dev_id and " +
@@ -122,7 +122,7 @@
String endSql=" ORDER BY "+tb_batt_devdischarge_CM+".dev_id ,"+tb_batt_devdischarge_CM+".dev_recordtime ";
sql=basesql+conditionSql+whereSql+numSql+endSql;
//System.out.println(sql);
- List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{"%"+binf.getStationId()+"%",binf.getBattProductDate(),binf.getBattProductDate1()
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{"%"+binf.getStationId()+"%","%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%",binf.getBattProductDate(),binf.getBattProductDate1()
,binf.getMonNum(),binf.getMonCount() }, new CallBack() {
public List getResults(ResultSet rs) {
List list=new ArrayList();
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Batt_electricityImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Batt_electricityImpl.java
index 12ab954..156ca12 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Batt_electricityImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Batt_electricityImpl.java
@@ -144,14 +144,14 @@
String sql="";
String basesql="select num,dev_id,dev_name,dev_recordtime,dev_electricity_CM,dev_electricity_CT,dev_electricity_CU,note ";
String conditionSql=" from web_site.tb_batt_electricity " +
- ",(select DISTINCT(FBSdeviceid) from db_battinf.tb_battinf where stationid=? ) as DISTINCTbattinf " +
+ ",(select DISTINCT(FBSdeviceid) from db_battinf.tb_battinf where stationid=? and stationname1 like ? and stationname2 like ? ) as DISTINCTbattinf " +
"where DISTINCTbattinf.FBSdeviceid=tb_batt_electricity.dev_id " +
"and to_days(tb_batt_electricity.dev_recordtime)>=to_days(?) and to_days(tb_batt_electricity.dev_recordtime)<=to_days(?) ";
basesql+=conditionSql;//鍚堣繛琛ㄦ潯浠�
String endSql=" ORDER BY dev_id ,dev_recordtime ";
sql=basesql+endSql;//鍚堟垚鏈�鍚庣殑sql
//System.out.println(sql);
- List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getStationId(),binf.getBattProductDate(),binf.getBattProductDate1()}, new CallBack() {
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getStationId(),"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%",binf.getBattProductDate(),binf.getBattProductDate1()}, new CallBack() {
public List getResults(ResultSet rs) {
List list=new ArrayList();
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Batttestdata_infDAOImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Batttestdata_infDAOImpl.java
index a16dee8..c854400 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Batttestdata_infDAOImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Batttestdata_infDAOImpl.java
@@ -449,7 +449,7 @@
" WHERE tb_batttestdata_inf.test_starttime>=? and tb_batttestdata_inf.test_starttime<=? " +
" and db_batt_testdata.tb_batttestdata_inf.data_available=1 ";
//鏈烘埧缁存姢鍖洪�夋嫨
- String stationSql=" AND db_battinf.tb_battinf.stationname like ? and db_battinf.tb_battinf.stationname1 like ? ";
+ String stationSql=" AND db_battinf.tb_battinf.stationname like ? and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname2 like ? ";
baseSql+=stationSql;
String endSql=" ORDER BY db_battinf.tb_battinf.stationid asc,tb_batttestdata_inf.BattGroupId asc,db_batt_testdata.tb_batttestdata_inf.test_starttime desc ";
sql=baseSql+endSql;
@@ -458,7 +458,7 @@
List list=DAOHelper.executeQuery(sql, DBUtil.getConn(),
new Object[]{
binf.getBattProductDate(),binf.getBattProductDate1(),
- "%"+binf.getStationName()+"%","%"+binf.getStationName1()+"%"
+ "%"+binf.getStationName()+"%","%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%"
}, new CallBack() {
public List getResults(ResultSet rs) {
@@ -520,7 +520,7 @@
"LEFT OUTER JOIN db_ram_db.cmcc_power_data ON db_battinf.tb_battinf.fbsdeviceid=cmcc_power_data.dev_id " +
"where ";
//鏈烘埧缁存姢鍖洪�夋嫨
- String stationSql=" db_battinf.tb_battinf.stationname like ? AND db_battinf.tb_battinf.stationname1 like ? ";
+ String stationSql=" db_battinf.tb_battinf.stationname like ? AND db_battinf.tb_battinf.stationname1 like ? AND db_battinf.tb_battinf.stationname2 like ? ";
baseSql+=stationSql;
//鐢垫睜鐘舵��
String stateSqlT=" AND batt_state=? ";
@@ -536,7 +536,7 @@
String orderSql=" order by db_battinf.tb_battinf.stationid asc";
sql=baseSql+endSql+orderSql;
//System.out.println(sql);
- List<Batt_State> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{"%"+binf.getStationName()+"%","%"+binf.getStationName1()+"%"
+ List<Batt_State> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{"%"+binf.getStationName()+"%","%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%"
,binf.getNum()}, new CallBack() {
public List getResults(ResultSet rs) {
--
Gitblit v1.9.1