From 3dd540cf10d030f13ab3403d33a1e4ead2fc33a2 Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.18>
Date: 星期六, 03 十一月 2018 14:00:17 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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 ca27a60..9ec9fba 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java
@@ -88,7 +88,7 @@
" 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.uid=? " ;
//鐢ㄦ埛绠＄悊
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=? "+
@@ -115,9 +115,9 @@
dev_record.setStationName3(rs.getString("stationName3"));
dev_record.setStationName5(rs.getString("stationName5"));
dev_record.setRecord_time(rs.getTimestamp("record_time"));
- dev_record.setError_descript(rs.getNString("error_descript"));
+ dev_record.setError_descript(rs.getString("error_descript"));
dev_record.setError_en(rs.getInt("error_en"));
- dev_record.setError_dispose(rs.getNString("error_dispose"));
+ dev_record.setError_dispose(rs.getString("error_dispose"));
dev_record.setPicture_num(rs.getInt("picture_num"));
Page page=new Page();
dev_record.setPage(page);
@@ -176,6 +176,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