From e24744ff8b8aaa16ec75f33dd67a31e8fb94979d Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.28>
Date: 星期一, 19 十一月 2018 14:48:22 +0800
Subject: [PATCH] 修改
---
gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
index af7ad73..6cbe6d7 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -309,7 +309,7 @@
Page page=bmd.getPage();
Connection conn= DBUtil.getConn();
String numberSql=" SELECT FOUND_ROWS() number";
- String sql="select SQL_CALC_FOUND_ROWS distinct(StationId),StationId_ex,StationName1,StationName2,StationName3,StationName,FBSDeviceId " +
+ String sql="select SQL_CALC_FOUND_ROWS distinct(StationId),StationId_ex,StationName1,StationName2,StationName3,StationName5,StationName,FBSDeviceId " +
" From db_battinf.tb_battinf " +
" limit ?,?";
List<BattInf> list=DAOHelper.executeQueryLimit(sql,conn, new Object[]{(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()},new CallBack() {
@@ -325,6 +325,7 @@
binf.setStationName1(rs.getString("stationName1"));
binf.setStationName2(rs.getString("stationName2"));
binf.setStationName3(rs.getString("stationName3"));
+ binf.setStationName5(rs.getString("stationName5"));
binf.setFBSDeviceId(rs.getInt("fBSDeviceId"));
binf.setStationName(rs.getString("stationName"));
binf.setStationId_ex(rs.getString("stationId_ex"));
@@ -3979,9 +3980,9 @@
//棣栭〉涓婃牴鎹畇tationid鏌ヨ鐢垫睜缁勭殑鏈哄巻鍗�
public List serchBattAllInfoByStationId(Object obj){
BattInf binf=(BattInf) obj;
- String sql="select * from db_battinf.tb_battinf,db_battinf.tb_battinf_ex " +
- " where db_battinf.tb_battinf.stationId=db_battinf.tb_battinf_ex.stationid " +
- " and db_battinf.tb_battinf.stationId=? " +
+ String sql="select * from db_battinf.tb_battinf " +
+ " left outer join db_battinf.tb_battinf_ex on db_battinf.tb_battinf.stationId=db_battinf.tb_battinf_ex.stationid " +
+ " where db_battinf.tb_battinf.stationId=? " +
" order by db_battinf.tb_battinf.battgroupid";
List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getStationId()}, new CallBack() {
@@ -4165,7 +4166,7 @@
binf.setStationName3("");
binf.setBattGroupName("");
binf.setBattProducer("1");
- binf.setStationId("42000002");
+ binf.setStationId("42000575");
User_inf uinf=new User_inf();
uinf.setUId(1002);
@@ -4194,8 +4195,8 @@
//List<BattInf> list=biml.serchGroupByInfor(binf);
//List<BattInf> list=biml.searchInform1(bmd);
//<BattInf> list=biml.serchStationName5(binf);
- //List<BattInf> list=biml.serchBattAllInfoByStationId(binf);
- List<BattInf> list=biml.searchInform_ky();
+ List<BattInf> list=biml.serchBattAllInfoByStationId(binf);
+ //List<BattInf> list=biml.searchInform_ky();
for (BattInf b : list) {
System.out.println(b);
}
--
Gitblit v1.9.1