From 0ee2a92da94c0b97f7c9c48b4a30a80a810304cd Mon Sep 17 00:00:00 2001
From: 星伟 <星伟@192.168.10.25>
Date: 星期四, 27 九月 2018 13:20:20 +0800
Subject: [PATCH] 落后单体查询。ld9查询, 电池实时状态查询添加市级筛选

---
 gx_tieta/src/com/fgkj/dao/impl/BattinfThirdImpl.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattinfThirdImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattinfThirdImpl.java
index 75cc4c9..2a164cd 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattinfThirdImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattinfThirdImpl.java
@@ -10,6 +10,7 @@
 
 import com.fgkj.actions.ActionUtil;
 import com.fgkj.dao.BaseDAO;
+import com.fgkj.dao.BattTestData;
 import com.fgkj.dao.CallBack;
 import com.fgkj.dao.DAOHelper;
 import com.fgkj.db.DBUtil;
@@ -131,11 +132,11 @@
 	    String endSql=" order by db_battinf.tb_battinf.battgroupid ";
 		sqlT+=endSql;
 		sqlE+=endSql;
-		if(tdata.getTest_type()==3){
+		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.getStationName1(),binf.getStationName()},new BattinfThirdImpl());
-		}else if(tdata.getTest_type()==5){
+		}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.getStationName1(),binf.getStationName()},new CallBack() {
@@ -246,11 +247,11 @@
 			sqlT+=stationSqlF+tendSql;
 			sqlE+=stationSqlF+eendSql;
 		}
-		if(tdata.getTest_type()==3){
+		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());
-		}else if(tdata.getTest_type()==5){
+		}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() {

--
Gitblit v1.9.1