From b3460365bca5a645e3e37d69dd606ae8bea8cbb0 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期一, 07 一月 2019 16:11:00 +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/ram/Fbs9100_stateImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.java b/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.java
index b212df0..8554514 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.java
@@ -907,10 +907,10 @@
+ " and db_user.tb_user_battgroup_baojigroup_usr.uId=? "
+ " and db_battinf.tb_battinf.MonVolStd=? ";
//鏉′欢
- String sql0=" and stationid=? "; //鍏蜂綋鏈烘埧
- String sql1=" and stationname1=? ";//鐪�
- String sql2=" and stationname2=? ";//甯�
- String sql5=" and stationname5=? ";//鍖哄幙
+ String sql0=" and db_battinf.tb_battinf.stationid=? "; //鍏蜂綋鏈烘埧
+ String sql1=" and db_battinf.tb_battinf.stationname1=? ";//鐪�
+ String sql2=" and db_battinf.tb_battinf.stationname2=? ";//甯�
+ String sql5=" and db_battinf.tb_battinf.stationname5=? ";//鍖哄幙
switch (binf.getNum()) {
case 0:
sql+=sql0;
--
Gitblit v1.9.1