From 574e32b8d8ad4242290505433f59626777c28336 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期五, 21 十二月 2018 14:50:26 +0800
Subject: [PATCH] 申请验收
---
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$4.class | 0
gx_tieta/src/com/fgkj/actions/Battinf_applyAction.java | 9 ++++++++-
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 | 14 +++++++++++++-
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/Battinf_applyAction$3.class | 0
gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java | 24 +++++++++++++++++++++++-
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
17 files changed, 44 insertions(+), 3 deletions(-)
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 79e7bce..7793989 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 43287ba..27e515c 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
index 6a7e48c..d4f1b68 100644
--- 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
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 540a4f3..16b2e45 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 02f583f..c6514c1 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 7a48da8..6dcf895 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 30f21f8..a5f2e19 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 381fc65..3ad88ef 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 99cb85f..29e0764 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 6644bb2..cee2dab 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 b59788f..6409d49 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 03fad08..ade149d 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 c836138..f585b65 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/services/Battinf_applyService.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/Battinf_applyService.class
index f85dc95..8ef8922 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 82b803b..c8b1848 100644
--- a/gx_tieta/src/com/fgkj/actions/Battinf_applyAction.java
+++ b/gx_tieta/src/com/fgkj/actions/Battinf_applyAction.java
@@ -24,13 +24,20 @@
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 checkPro(){
+ List<Battinf_apply> list=ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(json,new TypeToken<List<Battinf_apply>>(){}.getType() );
+ ServiceModel model=service.checkPro(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 c55a44a..46de4fa 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java
@@ -160,7 +160,7 @@
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
@@ -183,6 +183,28 @@
(new User_logService()).addPro(listU);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
return bl;
}
+ //鐢宠楠屾敹(澶氭潯)
+ public boolean checkPro(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();
+ String sql_update_apply=" update db_battinf.tb_battinf_apply set check_en=2 where battgroupid="+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;
diff --git a/gx_tieta/src/com/fgkj/services/Battinf_applyService.java b/gx_tieta/src/com/fgkj/services/Battinf_applyService.java
index 47723fe..82d2899 100644
--- a/gx_tieta/src/com/fgkj/services/Battinf_applyService.java
+++ b/gx_tieta/src/com/fgkj/services/Battinf_applyService.java
@@ -52,7 +52,7 @@
}
return model;
}
- //楠屾敹鐢宠(澶氭潯)
+ //楠屾敹(澶氭潯)
public ServiceModel check(Object obj){
boolean bl=((Battinf_applyImpl)dao).check(obj);
if(bl){
@@ -64,6 +64,18 @@
}
return model;
}
+ //鐢宠楠屾敹(澶氭潯)
+ public ServiceModel checkPro(Object obj){
+ boolean bl=((Battinf_applyImpl)dao).checkPro(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