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 ++++++++++++--
gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java | 5 +++--
gx_tieta/src/com/fgkj/dao/impl/BadBatt_monImpl.java | 9 ++++++---
3 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BadBatt_monImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BadBatt_monImpl.java
index 5e32997..a146e85 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BadBatt_monImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BadBatt_monImpl.java
@@ -296,12 +296,12 @@
String numberSql=" SELECT FOUND_ROWS() number";
String sql="";
String baseSql=" SELECT SQL_CALC_FOUND_ROWS distinct web_site.tb_badbatt_mon.battgroupid,web_site.tb_badbatt_mon.mon_num,web_site.tb_badbatt_mon.real_cap,web_site.tb_badbatt_mon.stdcap,web_site.tb_badbatt_mon.note " +
- ",db_battinf.tb_battinf.stationname1,db_battinf.tb_battinf.stationname,db_battinf.tb_battinf.battproducer,db_battinf.tb_battinf.battinusedate" +
+ ",db_battinf.tb_battinf.stationname1,db_battinf.tb_battinf.stationname,db_battinf.tb_battinf.stationname2,db_battinf.tb_battinf.stationname5,db_battinf.tb_battinf.battproducer,db_battinf.tb_battinf.battinusedate" +
",db_battinf.tb_battinf.monvolstd,db_battinf.tb_battinf.battgroupname " +
"FROM web_site.tb_badbatt_mon,db_battinf.tb_battinf " +
"where web_site.tb_badbatt_mon.battgroupid=db_battinf.tb_battinf.BattGroupId " +
"and test_starttime>=? and test_starttime<=? " +
- "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.stationname1 like ? and db_battinf.tb_battinf.stationname like ? and db_battinf.tb_battinf.stationname2 like ? and db_battinf.tb_battinf.stationname5 like ? ";
//閫夊彇钃勭數姹犵粍鏉′欢
String idSqlT=" and db_battinf.tb_battinf.battgroupid!=? ";
@@ -325,7 +325,7 @@
sql=baseSql+endSql+limitSql;
//System.out.println(sql);
List<Batt_Maint_Dealarm> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{
- binf.getBattProductDate(),binf.getBattProductDate1(),"%"+binf.getStationName1()+"%","%"+binf.getStationName()+"%","%"+binf.getStationName2()+"%",
+ binf.getBattProductDate(),binf.getBattProductDate1(),"%"+binf.getStationName1()+"%","%"+binf.getStationName()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName5()+"%",
binf.getBattGroupId(),uinf.getUId(),
(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {
@@ -336,7 +336,10 @@
Batt_Maint_Dealarm bmd = new Batt_Maint_Dealarm();
BattInf binf=new BattInf();
binf.setStationName1(rs.getString("stationName1"));
+ binf.setStationName2(rs.getString("stationName2"));
+ binf.setStationName5(rs.getString("stationName5"));
binf.setStationName(rs.getString("stationName"));
+
binf.setBattProducer(rs.getString("battProducer"));
if(rs.getString("battInUseDate")!=null)
binf.setBattInUseDate(rs.getDate("battInUseDate"));
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();
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java
index 9f246b1..cb870ad 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java
@@ -111,7 +111,7 @@
BattInf binf=new BattInf();
binf.setNum(1002);
binf.setStationName("");
- binf.setStationName1("");
+ binf.setStationName1("婀栧寳鐪�");
binf.setStationName2("");
binf.setStationName3("");
binf.setStationName5("");
@@ -120,7 +120,8 @@
p.setPageCurr(1);
p.setPageSize(10);
binf.setPage(p);
- dimpl.serchByCondition(binf);
+ List list=dimpl.serchByCondition(binf);
+ System.out.println(list.size());
}
}
--
Gitblit v1.9.1