gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/Battinf_applyAction$2.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/Battinf_applyAction$3.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/Battinf_applyAction$4.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/Battinf_applyAction$5.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/Battinf_applyAction.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$1.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$2.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$3.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$4.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$5.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$6.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$7.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$8.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dto/Battinf_apply.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/Battinf_applyService.classBinary files differ
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() ); 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"));
@@ -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 + "]"; } } 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);
