From 08b1e453b47d63b68234bcdbad491a7b5ac3dc42 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期一, 07 一月 2019 16:10:45 +0800
Subject: [PATCH] 权限管理页面中添加基站审批权限以及添加国际化文本
---
gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 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..97ecdc4 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();
@@ -758,7 +769,8 @@
Battinf_apply bapply=new Battinf_apply();
bapply.setApply_date(ActionUtil.getSimpDate(date2));
bapply.setApply_uid(1004);
-
+ bapply.setApply_en(1);
+ bapply.setCheck_en(1);
BattInf binf=new BattInf();
binf.setStationName("骞胯タ鐪�-鐧捐壊-GX鐧捐壊涔愪笟鍘跨珛鏂板皬鍖篧F-BTS璁惧");
@@ -799,11 +811,11 @@
Page page=new Page();
page.setPageCurr(1);
- page.setPageSize(10);
+ page.setPageSize(20);
binf.setPage(page);
bapply.setBinf(binf);
- /*List list=bimpl.serchByCondition(page);
- 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);
@@ -820,7 +832,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