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/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$7.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$6.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$9.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$8.class | 0
gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java | 24 +++++++++++++++++++-----
6 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$6.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$6.class
index ce272a0..1d7af2b 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$6.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$6.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$7.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$7.class
index c77df98..72ea85f 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$7.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$7.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$8.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$8.class
index f15418a..a2e7da8 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$8.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$8.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$9.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$9.class
index 1424f00..deb5ea8 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$9.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$9.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl.class
index d2d27b9..3e6bb09 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl.class
Binary files differ
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java
index 97ecdc4..82f8c89 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java
@@ -554,8 +554,20 @@
",FBSDeviceName,GroupIndexInFBSDevice,battgroupId,BattGroupNum,BattGroupName,FloatVolLevel,OfflineVolLevel,BattFloatCurrent" +
",MonCount,MonCapStd,monVolStd,monResStd,MonSerStd,MonVolLowToAvg,BattProducer,BattModel,BattProductDate,BattInUseDate,Load_curr,install_user,DisCurrMax,station_phone " +
" from db_battinf.tb_battinf_apply " +
- " where apply_en=? and apply_uid=? order by apply_date desc " +
- " limit ?,? ";
+ " where apply_en=? and check_en=0 ";//(鏈鎵瑰拰宸插鎵圭殑鏁版嵁涓嶈兘琚獙鏀�)
+ //鐢ㄦ埛
+ String userSqlF=" and apply_uid=? " ;
+ String userSqlT=" and apply_uid!=? " ;
+ if(bapply.getApply_uid()==1002) {
+ bapply.setNum(0);
+ sql+=userSqlT;
+ }else {
+ sql+=userSqlF;
+ }
+
+ String endSql=" order by apply_date desc limit ?,?";
+ sql+=endSql;
+ //System.out.println(sql);
List<Battinf_apply> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{bapply.getApply_en(),bapply.getNum(),(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {
public List getResults(ResultSet rs) {
@@ -768,10 +780,10 @@
Battinf_applyImpl bimpl=new Battinf_applyImpl();
Battinf_apply bapply=new Battinf_apply();
bapply.setApply_date(ActionUtil.getSimpDate(date2));
- bapply.setApply_uid(1004);
+ bapply.setApply_uid(1002);
bapply.setApply_en(1);
bapply.setCheck_en(1);
-
+ bapply.setNum(1002);;
BattInf binf=new BattInf();
binf.setStationName("骞胯タ鐪�-鐧捐壊-GX鐧捐壊涔愪笟鍘跨珛鏂板皬鍖篧F-BTS璁惧");
binf.setStationName1("婀栧寳鐪�");
@@ -814,8 +826,10 @@
page.setPageSize(20);
binf.setPage(page);
bapply.setBinf(binf);
- List list=bimpl.serchByCondition(bapply);
+ List list=bimpl.serchByInfo(bapply);
System.out.println(list.size());
+ /*List list=bimpl.serchByCondition(bapply);
+ System.out.println(list.size());*/
/*List list=new ArrayList();
list.add(bapply);
boolean bl=bimpl.add(list);
--
Gitblit v1.9.1