From e051f5c497e691bcd97c81dffa97f7946fd197b1 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期二, 06 十一月 2018 16:32:24 +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/Deverror_recordImpl.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
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 e9bc11c..27ebc9d 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java
@@ -62,6 +62,7 @@
//鐢ㄦ埛澶勭悊鐨勭粨鏋�
public boolean update(Object obj) {
Deverror_record dev_record=(Deverror_record) obj;
+ System.out.println(dev_record);
String sql=" update db_battinf.tb_deverror_record set error_dispose=?,error_en=? where num=? ";
boolean bl=DAOHelper.executeUpdate(DBUtil.getConn(), sql, new Object[]{dev_record.getError_dispose(),dev_record.getError_en(),dev_record.getNum()});
return bl;
@@ -86,8 +87,7 @@
" ,db_battinf.tb_battinf.stationname,stationname1,stationname2,stationname3,stationname5 " +
" from db_battinf.tb_deverror_record,db_battinf.tb_battinf " +
" where tb_deverror_record.stationid=tb_battinf.stationid " +
- " and tb_deverror_record.stationid like ? and stationname1 like ? and stationname2 like ? and stationname5 like ? " +
- " and tb_deverror_record.uid=? and error_en=0 " ;
+ " and tb_deverror_record.stationid like ? and stationname1 like ? and stationname2 like ? and stationname5 like ? " ;
//鐢ㄦ埛绠＄悊
String userSql=" and db_battinf.tb_battinf.StationId in(" +
" select distinct db_user.tb_user_battgroup_baojigroup_battgroup.StationId from db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr where db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id=db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id and db_user.tb_user_battgroup_baojigroup_usr.uId=? "+
@@ -98,7 +98,7 @@
sql+=orderSql;
String limitSql=" limit ?,? ";
sql+=limitSql;
- List<Deverror_record> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{"%"+binf.getStationId()+"%","%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName5()+"%",binf.getNum()
+ List<Deverror_record> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{"%"+binf.getStationId()+"%","%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName5()+"%"
,binf.getNum(),(p.getPageCurr()-1)*p.getPageSize(),p.getPageSize()}, new CallBack() {
public List getResults(ResultSet rs) {
@@ -132,7 +132,7 @@
//鍘绘帀limit鏉′欢鍚庣殑鎬绘暟
int number=LimitNumberFactory.GetLimtitNumber(conn, numberSql);
if(list!=null&&list.size()>0){
- list.get(list.size()-1).getPage().setPageSize(number);
+ list.get(list.size()-1).getPage().setPageAll(number);
}
return list;
}
@@ -175,6 +175,9 @@
p.setPageSize(10);
binf.setPage(p);
List list=dimpl.serchByCondition(binf);
+ for (Object object : list) {
+ System.out.println(object);
+ }
System.out.println(list.size());
}
--
Gitblit v1.9.1