From 592720573d6b194bbac25b25b6c619376cb9c0a4 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 13 十二月 2018 13:38:34 +0800
Subject: [PATCH] 修改电池查询面板中正则的验证
---
gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java | 37 +++++++++++--------------------------
1 files changed, 11 insertions(+), 26 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 3fc0538..1ece33f 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,21 +67,16 @@
}
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;
- boolean en=BattinfGroupFactory.backup_battinf();
- if(en){
- bl=DAOHelper.makeManualCommit(DBUtil.getConn(), sql_str);
- }else{
- return false;
- }
- //(new User_logService()).addPro(listU);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
+ Boolean bl=DAOHelper.makeManualCommit(DBUtil.getConn(), sql_str);
+
+ (new User_logService()).addPro(listU);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
return bl;
}
@@ -149,13 +144,8 @@
}
}
}
- Boolean bl=false;
- boolean en=BattinfGroupFactory.backup_battinf();
- if(en){
- bl=DAOHelper.makeManualCommit(DBUtil.getConn(), sql_str);
- }else{
- return false;
- }
+ Boolean bl=DAOHelper.makeManualCommit(DBUtil.getConn(), sql_str);
+
(new User_logService()).addPro(listU);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
return bl;
}
@@ -177,13 +167,8 @@
}
}
}
- Boolean bl=false;
- boolean en=BattinfGroupFactory.backup_battinf();
- if(en){
- bl=DAOHelper.makeManualCommit(DBUtil.getConn(), sql_str);
- }else{
- return false;
- }
+ Boolean bl=DAOHelper.makeManualCommit(DBUtil.getConn(), sql_str);
+
(new User_logService()).addPro(listU);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
return bl;
}
--
Gitblit v1.9.1