From 14b6f4ba5b54a0da64af36ce5653ee49e025bd23 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期三, 19 十二月 2018 16:27:24 +0800
Subject: [PATCH] 修改验收
---
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dto/Battinf_apply.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$4.class | 0
gx_tieta/src/com/fgkj/actions/Battinf_applyAction.java | 7 +++
gx_tieta/src/com/fgkj/dto/Battinf_apply.java | 31 +++++++++++++--
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/Battinf_applyAction.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$2.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$5.class | 0
gx_tieta/src/com/fgkj/services/Battinf_applyService.java | 12 ++++++
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/Battinf_applyAction$3.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/Battinf_applyAction$2.class | 0
gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java | 28 +++++++++++++
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$1.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/Battinf_applyAction$4.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$7.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/Battinf_applyAction$5.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$6.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$8.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$3.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/Battinf_applyService.class | 0
20 files changed, 72 insertions(+), 6 deletions(-)
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/Battinf_applyAction$2.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/Battinf_applyAction$2.class
index fed2f15..d06b9f2 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/Battinf_applyAction$2.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/Battinf_applyAction$2.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/Battinf_applyAction$3.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/Battinf_applyAction$3.class
index 2a03e76..79e7bce 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/Battinf_applyAction$3.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/Battinf_applyAction$3.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/Battinf_applyAction$4.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/Battinf_applyAction$4.class
index e67a2a4..43287ba 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/Battinf_applyAction$4.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/Battinf_applyAction$4.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/Battinf_applyAction$5.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/Battinf_applyAction$5.class
new file mode 100644
index 0000000..6a7e48c
--- /dev/null
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/Battinf_applyAction$5.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/Battinf_applyAction.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/Battinf_applyAction.class
index 1a37d68..fda0df1 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/Battinf_applyAction.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/Battinf_applyAction.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$1.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$1.class
index 007d2bf..7a7e6f7 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$1.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$1.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$2.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$2.class
index cd7d983..fde57e8 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$2.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$2.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$3.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$3.class
index 16d2e5f..a76815d 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$3.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$3.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$4.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$4.class
index d440b3d..c8b0765 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$4.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$4.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$5.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$5.class
index 5715d41..8b7a338 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$5.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$5.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$6.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$6.class
index 82fe5dd..7a9c1b5 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$6.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$6.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$7.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$7.class
index 1861044..746e378 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$7.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$7.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$8.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$8.class
index d0df70d..5c32d7c 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$8.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$8.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl.class
index cc925e3..c4d4530 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dto/Battinf_apply.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dto/Battinf_apply.class
index e9979e6..5265bb5 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dto/Battinf_apply.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dto/Battinf_apply.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/Battinf_applyService.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/Battinf_applyService.class
index 8b35a55..af435e2 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/Battinf_applyService.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/Battinf_applyService.class
Binary files differ
diff --git a/gx_tieta/src/com/fgkj/actions/Battinf_applyAction.java b/gx_tieta/src/com/fgkj/actions/Battinf_applyAction.java
index bbcb087..b24e635 100644
--- a/gx_tieta/src/com/fgkj/actions/Battinf_applyAction.java
+++ b/gx_tieta/src/com/fgkj/actions/Battinf_applyAction.java
@@ -24,6 +24,13 @@
result=tojson(model);
return SUCCESS;
}
+ //楠屾敹鐢宠(澶氭潯)
+ public String check(){
+ List<Battinf_apply> list=ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(json,new TypeToken<List<Battinf_apply>>(){}.getType() );
+ ServiceModel model=service.check(list);
+ result=tojson(model);
+ return SUCCESS;
+ }
//鐢宠浜哄啀鎴戠殑鐢宠椤甸潰鐨勪慨鏀规搷浣�
public String updatePro(){
List<Battinf_apply> list=ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(json,new TypeToken<List<Battinf_apply>>(){}.getType() );
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 367fe80..10aee51 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java
@@ -123,6 +123,29 @@
return bl;
}
+ //楠屾敹鐢宠(澶氭潯)
+ public boolean check(Object obj) {
+ List<Battinf_apply> list=(List<Battinf_apply>) obj;
+ List<User_log> listU=new ArrayList<User_log>();//瀛樻斁user_log
+ ArrayList<String> sql_str=new ArrayList();
+ if(list!=null&&list.size()>0){
+ for (int i = 0; i < list.size(); i++) {
+ 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();
+ sql_str.add(sql_update_apply);
+ {
+ String msg="楠屾敹"+binf.getStationName()+"鏈烘埧";
+ User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
+ listU.add(ulog);
+ }
+ }
+ }
+ Boolean bl=DAOHelper.makeManualCommit(DBUtil.getConn(), sql_str);
+ (new User_logService()).addPro(listU);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
+ return bl;
+ }
//鐢宠浜哄啀鎴戠殑鐢宠椤甸潰鐨勪慨鏀规搷浣�
public boolean updatePro(Object obj){
List<Battinf_apply> list=(List<Battinf_apply>) obj;
@@ -194,7 +217,7 @@
Page page=(Page) obj;
Connection conn=DBUtil.getConn();
String numberSql=" SELECT FOUND_ROWS() number";
- String sql=" select SQL_CALC_FOUND_ROWS distinct num,apply_uid,confrim_uid,apply_date,apply_en,apply_note,StationId,StationName,StationName1,StationName2,StationName3,StationName4,StationName5,StationIp,FbsDeviceId,FbsDeviceIp_YM,FbsDeviceIp_WG,FbsDeviceIp"+
+ String sql=" select SQL_CALC_FOUND_ROWS distinct num,apply_uid,confrim_uid,check_uid,check_en,apply_date,apply_en,apply_note,StationId,StationName,StationName1,StationName2,StationName3,StationName4,StationName5,StationIp,FbsDeviceId,FbsDeviceIp_YM,FbsDeviceIp_WG,FbsDeviceIp"+
",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 " +
@@ -213,6 +236,9 @@
apply.setConfrim_uid(rs.getInt("confrim_uid"));
apply.setConfirm_name((new User_infImpl()).changeUidToUname(apply.getConfrim_uid()));
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.setApply_date(rs.getTimestamp("apply_date"));
apply.setApply_note(rs.getString("apply_note"));
diff --git a/gx_tieta/src/com/fgkj/dto/Battinf_apply.java b/gx_tieta/src/com/fgkj/dto/Battinf_apply.java
index 25bf2dc..67d25fe 100644
--- a/gx_tieta/src/com/fgkj/dto/Battinf_apply.java
+++ b/gx_tieta/src/com/fgkj/dto/Battinf_apply.java
@@ -12,6 +12,9 @@
private Date apply_date;
private int apply_en;
private String apply_note;
+ private int check_en;
+ private int check_uid;
+ private String check_uname;
private BattInf binf;
public int getNum() {
return num;
@@ -68,14 +71,32 @@
public void setConfirm_name(String confirm_name) {
this.confirm_name = confirm_name;
}
+ public int getCheck_en() {
+ return check_en;
+ }
+ public void setCheck_en(int check_en) {
+ this.check_en = check_en;
+ }
+ public int getCheck_uid() {
+ return check_uid;
+ }
+ public void setCheck_uid(int check_uid) {
+ this.check_uid = check_uid;
+ }
+ public String getCheck_uname() {
+ return check_uname;
+ }
+ public void setCheck_uname(String check_uname) {
+ this.check_uname = check_uname;
+ }
@Override
public String toString() {
- return "Battinf_apply [num=" + num + ", apply_uid=" + apply_uid
- + ", apply_name=" + apply_name + ", confrim_uid=" + confrim_uid
- + ", confirm_name=" + confirm_name + ", apply_date="
- + apply_date + ", apply_en=" + apply_en + ", apply_note="
- + apply_note + ", binf=" + binf + "]";
+ return "Battinf_apply [num=" + num + ", apply_uid=" + apply_uid + ", apply_name=" + apply_name
+ + ", confrim_uid=" + confrim_uid + ", confirm_name=" + confirm_name + ", apply_date=" + apply_date
+ + ", apply_en=" + apply_en + ", apply_note=" + apply_note + ", check_en=" + check_en + ", check_uid="
+ + check_uid + ", check_uname=" + check_uname + ", binf=" + binf + "]";
}
+
}
diff --git a/gx_tieta/src/com/fgkj/services/Battinf_applyService.java b/gx_tieta/src/com/fgkj/services/Battinf_applyService.java
index d769ff5..9f85034 100644
--- a/gx_tieta/src/com/fgkj/services/Battinf_applyService.java
+++ b/gx_tieta/src/com/fgkj/services/Battinf_applyService.java
@@ -52,6 +52,18 @@
}
return model;
}
+ //楠屾敹鐢宠(澶氭潯)
+ public ServiceModel check(Object obj){
+ boolean bl=((Battinf_applyImpl)dao).check(obj);
+ if(bl){
+ model.setCode(1);
+ model.setMsg("楠屾敹鎴愬姛!");
+ }else{
+ model.setCode(0);
+ model.setMsg("楠屾敹澶辫触!");
+ }
+ return model;
+ }
//娣诲姞鐢宠
public ServiceModel add(Object obj){
boolean bl=dao.add(obj);
--
Gitblit v1.9.1