From c1cc2f63c90baadbd55689693e76404a9e6ed12e Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期四, 20 十二月 2018 14:21:56 +0800
Subject: [PATCH] 修改
---
gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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 dd73afc..0eccc86 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java
@@ -11,6 +11,7 @@
import com.fgkj.actions.ActionUtil;
import com.fgkj.dao.BaseDAO;
+import com.fgkj.dao.BattTestData;
import com.fgkj.dao.BattinfGroupFactory;
import com.fgkj.dao.CallBack;
import com.fgkj.dao.DAOHelper;
@@ -93,7 +94,7 @@
bapply.setConfrim_uid(((User_inf)ActionUtil.getUser()).getUId());
BattInf binf=bapply.getBinf();
binf.setStation_install(1);
- String sql_update_apply=" update db_battinf.tb_battinf_apply set confrim_uid="+bapply.getConfrim_uid()+",apply_en=1 where battgrouoid="+binf.getBattGroupId();
+ String sql_update_apply=" update db_battinf.tb_battinf_apply set confrim_uid="+bapply.getConfrim_uid()+",apply_en=1 where battgroupid="+binf.getBattGroupId();
sql_str.add(sql_update_apply);
String sql_insert_binf="insert into db_battinf.tb_battinf(" +
"StationId,StationName,StationName1,StationName2,StationName3,StationName4,StationName5,StationIp,FBSDeviceId,FbsDeviceIp,FbsDeviceIp_YM,FbsDeviceIp_WG,"
@@ -120,6 +121,7 @@
return false;
}
(new User_logService()).addPro(listU);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
+ BattTestData.run_cmd();
return bl;
}
@@ -133,7 +135,7 @@
Battinf_apply bapply=list.get(i);
BattInf binf=bapply.getBinf();
bapply.setCheck_uid(((User_inf)ActionUtil.getUser()).getUId());
- String sql_update_apply=" update db_battinf.tb_battinf_apply set check_uid="+bapply.getCheck_uid()+",check_en=1 where battgrouoid="+binf.getBattGroupId();
+ String sql_update_apply=" update db_battinf.tb_battinf_apply set check_uid="+bapply.getCheck_uid()+",check_en=1 where battgroupid="+binf.getBattGroupId();
sql_str.add(sql_update_apply);
{
String msg="楠屾敹"+binf.getStationName()+"鏈烘埧";
@@ -240,7 +242,7 @@
apply.setApply_en(rs.getInt("apply_en"));
apply.setCheck_uid(rs.getInt("check_uid"));
apply.setCheck_en(rs.getInt("check_en"));
- apply.setCheck_uname((new User_infImpl()).changeUidToUname(apply.getCheck_en()));
+ apply.setCheck_uname((new User_infImpl()).changeUidToUname(apply.getCheck_uid()));
apply.setApply_date(rs.getTimestamp("apply_date"));
apply.setApply_note(rs.getString("apply_note"));
--
Gitblit v1.9.1