From 9ba77f85d56a4a52d5a7b57c9747dd96ee6f1ba6 Mon Sep 17 00:00:00 2001
From: 军 <军@hp-pc>
Date: 星期六, 29 九月 2018 19:01:14 +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/BattDischarge_planImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattDischarge_planImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattDischarge_planImpl.java
index ada8223..74da16d 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattDischarge_planImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattDischarge_planImpl.java
@@ -304,7 +304,7 @@
" and db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id " +
" and db_user.tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid " +
" and db_user.tb_user_inf.uid=? " +
- " and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ?)";
+ " and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ? and db_battinf.tb_battinf.stationname2 like ?)";
baseSql+=userSql;
String endSql="order by tb_battdischarge_plan.discharge_starttime desc ";
@@ -320,6 +320,7 @@
uinf.getUId(),
"%"+binf.getStationName1()+"%",
"%"+binf.getStationName()+"%",
+ "%"+binf.getStationName2()+"%",
(bmd.getPage().getPageCurr() - 1)* bmd.getPage().getPageSize(),
bmd.getPage().getPageSize()
}, new CallBack() {
--
Gitblit v1.9.1