From 7f953d9aa0e7d4fcbe3c366c7f9f0b3f847f12bd Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.137.1>
Date: 星期六, 19 一月 2019 09:16:08 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java | 50 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 38 insertions(+), 12 deletions(-)
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 7fd0b46..82f8c89 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java
@@ -291,9 +291,20 @@
",MonCount,MonCapStd,monVolStd,monResStd,MonSerStd,MonVolLowToAvg,BattProducer,BattModel,BattProductDate,BattInUseDate,Load_curr,install_user,DisCurrMax,station_phone "
+ ",longitude,latitude,address " +
" from db_battinf.tb_battinf_apply " +
- " where apply_en=? order by apply_date desc" +
- " limit ?,? ";
- List<Battinf_apply> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{bapply.getApply_en(),(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {
+ " where ";
+ //鏈鎵�
+ if(bapply.getApply_en()==0) {
+ sql+=" apply_en=? and check_en!=? ";
+ }else {
+ if(bapply.getCheck_en()==1) {
+ sql+=" apply_en=? and check_en=? ";
+ }else {
+ sql+=" apply_en=? and check_en!=? and check_en!=1 ";
+ }
+
+ }
+ sql+=" order by apply_date desc limit ?,?";
+ List<Battinf_apply> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{bapply.getApply_en(),bapply.getCheck_en(),(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {
public List getResults(ResultSet rs) {
List list=new ArrayList();
@@ -543,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) {
@@ -757,9 +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("婀栧寳鐪�");
@@ -799,10 +823,12 @@
Page page=new Page();
page.setPageCurr(1);
- page.setPageSize(10);
+ page.setPageSize(20);
binf.setPage(page);
bapply.setBinf(binf);
- /*List list=bimpl.serchByCondition(page);
+ 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);
@@ -820,7 +846,7 @@
for (Fbs9100_state f : list) {
System.out.println(f.getDev_id()+" "+f.getDev_commcount());
}*/
- List list=bimpl.serchById(bapply);
- System.err.println(list.size());
+ /*List list=bimpl.serchById(bapply);
+ System.err.println(list.size());*/
}
}
--
Gitblit v1.9.1