From 1391e967303665d1629b84f7369d46f031997092 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期六, 05 一月 2019 10:56:34 +0800
Subject: [PATCH] 修改
---
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.class | 0
gx_tieta/src/com/fgkj/services/ram/Fbs9100_battparamService.java | 6 +++++-
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/ram/Fbs9100_battparamService.class | 0
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.java | 8 ++++----
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.class
index 4367a00..897822b 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/ram/Fbs9100_battparamService.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/ram/Fbs9100_battparamService.class
index 9cb81cd..8260987 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/ram/Fbs9100_battparamService.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/ram/Fbs9100_battparamService.class
Binary files differ
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;
diff --git a/gx_tieta/src/com/fgkj/services/ram/Fbs9100_battparamService.java b/gx_tieta/src/com/fgkj/services/ram/Fbs9100_battparamService.java
index 1eb80ac..e7c14a5 100644
--- a/gx_tieta/src/com/fgkj/services/ram/Fbs9100_battparamService.java
+++ b/gx_tieta/src/com/fgkj/services/ram/Fbs9100_battparamService.java
@@ -99,7 +99,11 @@
//鎵归噺璁剧疆鐢垫睜鍙傛暟鏃讹紝鏍规嵁鐪佸競鍖猴紝鐢垫睜鍗曚綋鍨嬪彿锛堜紡鏁帮級锛岀粍鏁扮瓫閫夊嚭鐢垫睜缁勫苟璇诲彇瀹冪殑瀹為檯鐢垫睜鍙傛暟
public ServiceModel serchBattinfAndParam(Object obj) {
List list=(new BattInfImpl()).serchByDischarge(obj);
-
+ if(list!=null&&list.size()>0) {
+ for (int i = 0; i < list.size(); i++) {
+
+ }
+ }
return model;
}
--
Gitblit v1.9.1