From e22fd0bac62d20d94e58409ea15049c67f6ff1eb Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.26>
Date: 星期四, 13 十二月 2018 10:33:35 +0800
Subject: [PATCH] 修改

---
 gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java |   13 +++++++------
 1 files changed, 7 insertions(+), 6 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 5d6c545..761d603 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java
@@ -41,8 +41,8 @@
 		if(list!=null && list.size()>0){
 			for (int i = 0; i < list.size(); i++) {
 				Battinf_apply bapply=list.get(i);
-				/*int uid=((User_inf)ActionUtil.getUser()).getUId();
-			    bapply.setApply_uid(uid);*/
+				int uid=((User_inf)ActionUtil.getUser()).getUId();
+			    bapply.setApply_uid(uid);
 				BattInf binf=bapply.getBinf();
 				//楠岃瘉鏂版坊鍔犵殑鏈烘埧鏄惁瀛樺湪
 				List listS=(new BattInfImpl()).judgeBatt(binf);
@@ -67,11 +67,11 @@
 				}
 				maxb++;
 				sql_str.add(sql);
-				/*{
+				{
 					String msg=((User_inf)ActionUtil.getUser()).getUId()+"鐢宠娣诲姞"+binf.getStationName()+"鏈烘埧"+binf.getBattGroupId()+"鐢垫睜缁勭殑淇℃伅";
 					User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Increase, msg);
 					listU.add(ulog);
-				 }*/
+				 }
 			}
 		}
 		Boolean bl=false;
@@ -81,7 +81,7 @@
 		}else{
 			return false;
 		}
-		//(new User_logService()).addPro(listU);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
+		(new User_logService()).addPro(listU);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
 		
 		return bl;
 	}
@@ -136,13 +136,14 @@
 				Battinf_apply bapply=list.get(i);
 				bapply.setConfrim_uid(((User_inf)ActionUtil.getUser()).getUId());
 				BattInf binf=bapply.getBinf();
+				//System.out.println(binf);
 			    String sql_update_apply= "update db_battinf.tb_battinf_apply set StationName='"+binf.getStationName()+"',StationName1='"+binf.getStationName1()+"',StationName2='"+binf.getStationName2()+"',StationName3='"+binf.getStationName3()+"',StationName4='"+binf.getStationName4()+"',StationName5='"+binf.getStationName5()+"',StationIp='"+binf.getStationIp()+"',"
 						+ "FBSDeviceName='"+binf.getFBSDeviceName()+"',GroupIndexInFBSDevice="+binf.getGroupIndexInFBSDevice()+",BattGroupNum="+binf.getBattGroupNum()+",BattGroupName='"+binf.getBattGroupName()+"',FloatVolLevel="+binf.getFloatVolLevel()+",OfflineVolLevel="+binf.getOfflineVolLevel()+",BattFloatCurrent="+binf.getBattFloatCurrent()+"," +
 						  "MonCount="+binf.getMonCount()+",MonCapStd="+binf.getMonCapStd()+",monVolStd="+binf.getMonVolStd()+",monResStd="+binf.getMonResStd()+",MonSerStd="+binf.getMonSerStd()+",MonVolLowToAvg="+binf.getMonVolLowToAvg()+",BattProducer='"+binf.getBattProducer()+"',BattModel='"+binf.getBattModel()+"',BattProductDate='"+DAOHelper.sdf.format(binf.getBattProductDate())+"',BattInUseDate='"+DAOHelper.sdf.format(binf.getBattInUseDate())+"', "
 						 +" Load_curr="+binf.getLoad_curr()+",install_user='"+binf.getInstall_user()+"',DisCurrMax="+binf.getDisCurrMax()+",station_phone='"+binf.getStation_phone()+"'  where num="+bapply.getNum();
 			    sql_str.add(sql_update_apply);
 			    {
-					String msg="淇敼"+binf.getStationName()+"鏈烘埧"+binf.getBattGroupId()+"鐢垫睜缁勭殑淇℃伅";
+					String msg="淇敼鐢宠鐨�"+binf.getStationName()+"鏈烘埧"+binf.getBattGroupId()+"鐢垫睜缁勭殑淇℃伅";
 					User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
 					listU.add(ulog);
 				 }

--
Gitblit v1.9.1