From e05dce3c6df04e37866bd7b5f5d2e6a93e1a4999 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 06 十二月 2018 14:27:25 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
index eee0176..df1f70b 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -35,6 +35,7 @@
import com.fgkj.dto.Batttestdata;
import com.fgkj.dto.Batttestdata_inf;
import com.fgkj.dto.Batttestdatastop;
+import com.fgkj.dto.Database_backup;
import com.fgkj.dto.Limit;
import com.fgkj.dto.Page;
import com.fgkj.dto.RoleLimit;
@@ -151,6 +152,19 @@
}
//鍒犻櫎鐢垫睜缁�(澶氫釜)
public boolean del(Object obj) {
+ {
+ Database_backup baseup=new Database_backup();
+ baseup.setBackup_en(1);
+ baseup.setDatabase_name("db_battinf");
+ baseup.setTable_name("tb_battinf");
+ (new Database_backupImpl()).update(baseup);
+ try {
+ Thread.sleep(1000*3);
+ } catch (InterruptedException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ };//鍑虹幇鍒犻櫎鎿嶄綔鏃讹紝鍏堝浠芥暟鎹簱琛�
List<BattInf> list=(List<BattInf>) obj;
ArrayList sql_str=new ArrayList();
List<User_log> listU=new ArrayList<User_log>();//瀛樻斁user_log
--
Gitblit v1.9.1