From 10544dfdf4955a680994903edcd4204005fc2849 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.16>
Date: 星期三, 12 十二月 2018 08:55:52 +0800
Subject: [PATCH] 修改
---
gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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 163d7b9..1725859 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java
@@ -109,7 +109,7 @@
",'"+binf.getBattProducer()+"','"+binf.getBattModel()+"','"+DAOHelper.sdf.format(binf.getBattProductDate())+"','"+DAOHelper.sdf.format(binf.getBattInUseDate())+"',"+binf.getLoad_curr()+",'"+binf.getInstall_user()+"',"+binf.getDisCurrMax()+",'"+binf.getStation_phone()+"',"+binf.getStation_install()+")";
sql_str.add(sql_insert_binf);
{
- String msg=((User_inf)ActionUtil.getUser()).getUId()+"纭娣诲姞"+binf.getStationName()+"鏈烘埧"+binf.getBattGroupId()+"鐢垫睜缁勭殑淇℃伅";
+ String msg="纭娣诲姞"+binf.getStationName()+"鏈烘埧"+binf.getBattGroupId()+"鐢垫睜缁勭殑淇℃伅";
User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
listU.add(ulog);
}
@@ -145,7 +145,7 @@
",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=0 " +
+ " where apply_en=0 order by apply_date desc" +
" limit ?,? ";
List<Battinf_apply> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {
@@ -213,7 +213,7 @@
int number=LimitNumberFactory.GetLimtitNumber(conn, numberSql);
//System.out.println("number: "+number);
if(list!=null&&list.size()>0){
- list.get(list.size()-1).setNum(number);
+ list.get(list.size()-1).setApply_note(String.valueOf(number));
}
return list;
}
@@ -436,12 +436,12 @@
page.setPageSize(10);
binf.setPage(page);
bapply.setBinf(binf);
- /*List list=bimpl.serchByCondition(bapply);
- System.out.println(list.size());*/
- List list=new ArrayList();
+ List list=bimpl.serchByCondition(page);
+ System.out.println(list.size());
+ /*List list=new ArrayList();
list.add(bapply);
boolean bl=bimpl.add(list);
- System.err.println(bl);
+ System.err.println(bl);*/
/*int dev_id=BattinfGroupFactory.searchmaxdev_id();
System.out.println(dev_id);
int station_id=BattinfGroupFactory.searchStationId();
--
Gitblit v1.9.1