From 35d8ce570740e18d29469caddf19ec6b85cedcfc Mon Sep 17 00:00:00 2001 From: hdw <496960745@qq.com> Date: 星期三, 31 十月 2018 17:06:14 +0800 Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw --- gx_tieta/src/com/fgkj/dao/impl/BattinfThirdImpl.java | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattinfThirdImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattinfThirdImpl.java index 2a164cd..d8119a3 100644 --- a/gx_tieta/src/com/fgkj/dao/impl/BattinfThirdImpl.java +++ b/gx_tieta/src/com/fgkj/dao/impl/BattinfThirdImpl.java @@ -234,6 +234,16 @@ sqlT+=station2SqlF; sqlE+=station2SqlF; } + //鐢ㄤ簬鍖哄幙 + String station5SqlT=" and stationname5!=? ";//鍏ㄩ儴 + String station5SqlF=" and stationname5=? "; + if(binf.getStationName5().equals("")){ + sqlT+=station5SqlT; + sqlE+=station5SqlT; + }else{ + sqlT+=station5SqlF; + sqlE+=station5SqlF; + } //鎸夌収battgroupid鎺掑簭 String tendSql=" order by db_batt_testdata.tb_batttestdatastop_"+binf.getBattGroupId()+".test_record_count asc,db_batt_testdata.tb_batttestdatastop_" +binf.getBattGroupId()+".mon_num asc "; String eendSql=" order by db_batt_testdata.tb_battresdata_"+binf.getBattGroupId()+".test_record_count asc,db_batt_testdata.tb_battresdata_" +binf.getBattGroupId()+".mon_num asc "; @@ -250,11 +260,11 @@ if(tdata.getTest_type()==BattTestData.BATT_DISCHARGE){ sql=sqlT; //System.out.println(sql); - list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getBattGroupId(),tdata.getTest_type(),binf.getMonNum(),binf.getStationName1(),binf.getStationName2(),binf.getStationName()},new BattinfThirdImpl()); + list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getBattGroupId(),tdata.getTest_type(),binf.getMonNum(),binf.getStationName1(),binf.getStationName2(),binf.getStationName5(),binf.getStationName()},new BattinfThirdImpl()); }else if(tdata.getTest_type()==BattTestData.BATT_RES){ sql=sqlE; //System.out.println(sql); - list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getBattGroupId(),tdata.getTest_type(),binf.getMonNum()*10+1,binf.getStationName1(),binf.getStationName2(),binf.getStationName()},new CallBack() { + list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getBattGroupId(),tdata.getTest_type(),binf.getMonNum()*10+1,binf.getStationName1(),binf.getStationName2(),binf.getStationName5(),binf.getStationName()},new CallBack() { public List getResults(ResultSet rs) { List list=new ArrayList(); -- Gitblit v1.9.1