From 7b8e271ed8344866c0dbe56942625ccedb5564c7 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期五, 02 十一月 2018 17:31:00 +0800
Subject: [PATCH] 问题反馈
---
gx_tieta/src/com/fgkj/dao/impl/StationtrafficImpl.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/StationtrafficImpl.java b/gx_tieta/src/com/fgkj/dao/impl/StationtrafficImpl.java
index c4fe854..4cbec20 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/StationtrafficImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/StationtrafficImpl.java
@@ -15,6 +15,7 @@
import com.fgkj.dao.DAOHelper;
import com.fgkj.db.DBUtil;
import com.fgkj.dto.Stationtraffic;
+import com.sun.org.apache.bcel.internal.generic.IINC;
public class StationtrafficImpl implements BaseDAO,CallBack{
@@ -46,13 +47,19 @@
public List serchByCondition(Object obj) {
final Stationtraffic straffic=(Stationtraffic) obj;
String sql=" select distinct tb_stationtraffic.num,dev_id,record_time,dayflow,nowflow" +
- " ,tb_battinf.stationName,tb_battinf.stationName1,tb_battinf.stationName2,tb_battinf.stationName3,tb_battinf.stationName5 " +
+ " ,tb_battinf.StationId,tb_battinf.stationName,tb_battinf.stationName1,tb_battinf.stationName2,tb_battinf.stationName3,tb_battinf.stationName5 " +
" from web_site.tb_stationtraffic,db_battinf.tb_battinf " +
" where web_site.tb_stationtraffic.dev_id=db_battinf.tb_battinf.fBSDeviceId " +
" and record_time>? and record_time<? " +
- " and dev_id=? " +
- " order by dev_id,record_time asc ";
- List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{straffic.getRecord_time(),straffic.getRecord_time1(),straffic.getDev_id()}, new CallBack() {
+ " and dev_id=? " ;
+ //鐢ㄦ埛绠＄悊
+ 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=? "+
+ " ) ";
+ sql+=userSql;
+ String orderSql=" order by dev_id,record_time asc ";
+ sql+=orderSql;
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{straffic.getRecord_time(),straffic.getRecord_time1(),straffic.getDev_id(),Integer.parseInt(straffic.getNote())}, new CallBack() {
public List getResults(ResultSet rs) {
List list=new ArrayList();
@@ -149,6 +156,7 @@
Stationtraffic st=new Stationtraffic();
st.setNum(3);
st.setDev_id(910000001);
+ st.setNote("1002");
st.setRecord_time(ActionUtil.getSimpDate(date1));
st.setRecord_time1(ActionUtil.getSimpDate(date2));
List<Stationtraffic> list=simpl.serchByCondition(st);
--
Gitblit v1.9.1