Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git ...

Administrator

2018-12-12 35fd1cfc84fd97990ba86d4cbb0a6ff0c45c2d78

Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

 gx_tieta/src/com/fgkj/actions/Battinf_applyAction.java

@@ -61,7 +61,15 @@
        result=tojson(model);

        return SUCCESS;

    }

	
    //申请人修改待审核的申请时的查询

    public String serchbystationId(){

        Battinf_apply bapply=ActionUtil.getGson().fromJson(json, Battinf_apply.class);

        User_inf uinf=(User_inf) getUser();

        bapply.setNum(uinf.getUId());

        ServiceModel model=service.serchbystationId(bapply);

        result=tojson(model);

        return SUCCESS;

    }

    

    public String getResult() {

        return result;


 gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java

@@ -445,7 +445,81 @@
        }

        return list;

    }

   
    //申请人修改待审核的申请时的查询

    public List serchbystationId(Object obj){

        Battinf_apply bapply=(Battinf_apply) obj;

        BattInf b=bapply.getBinf();

        String sql=" select  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"+

                 ",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 " +

                " where apply_en=0  and apply_uid=? and stationid=? order by apply_date desc " ;

        List<Battinf_apply> list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{bapply.getNum(),b.getStationId()}, new CallBack() {

			
            public List getResults(ResultSet rs) {

                List list=new ArrayList();

                try {

                    while(rs.next()){

                        Battinf_apply apply=new Battinf_apply();

                        apply.setNum(rs.getInt("num"));

                        apply.setApply_uid(rs.getInt("apply_uid"));

                        apply.setApply_name((new User_infImpl()).changeUidToUname(apply.getApply_uid()));

                        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.setApply_date(rs.getTimestamp("apply_date"));

                        apply.setApply_note(rs.getString("apply_note"));

						
                        BattInf binf=new BattInf();

                        binf.setStationId(rs.getString("stationId"));

                        binf.setStationName(rs.getString("stationName"));

                        binf.setStationName1(rs.getString("stationName1"));

                        binf.setStationName2(rs.getString("stationName2"));

                        binf.setStationName3(rs.getString("stationName3"));

                        binf.setStationName4(rs.getString("stationName4"));

                        binf.setStationName5(rs.getString("stationName5"));

                        binf.setStationIp(rs.getString("stationIp"));

                        binf.setFBSDeviceId(rs.getInt("fBSDeviceId"));

						
                        binf.setFbsDeviceIp(rs.getString("fbsDeviceIp"));

                        binf.setFbsDeviceIp_YM(rs.getString("fbsDeviceIp_YM"));

                        binf.setFbsDeviceIp_WG(rs.getString("fbsDeviceIp_WG"));

                        binf.setFBSDeviceName(rs.getString("fBSDeviceName"));

                        binf.setGroupIndexInFBSDevice(rs.getInt("groupIndexInFBSDevice"));

                        binf.setBattGroupId(rs.getInt("battGroupId"));

                        binf.setBattGroupNum(rs.getInt("battGroupNum"));

                        binf.setBattGroupName(rs.getString("battGroupName"));

                        binf.setFloatVolLevel(rs.getFloat("floatVolLevel"));

                        binf.setOfflineVolLevel(rs.getFloat("offlineVolLevel"));

                        binf.setBattFloatCurrent(rs.getFloat("battFloatCurrent"));

                        binf.setMonCount(rs.getInt("monCount"));

                        binf.setMonCapStd(rs.getFloat("monCapStd"));

                        binf.setMonVolStd(rs.getFloat("monVolStd"));

                        binf.setMonResStd(rs.getFloat("monResStd"));

                        binf.setMonSerStd(rs.getFloat("monSerStd"));

                        binf.setMonVolLowToAvg(rs.getFloat("monVolLowToAvg"));

                        binf.setBattProducer(rs.getString("battProducer"));

                        binf.setBattModel(rs.getString("battModel"));

                        binf.setBattProductDate(rs.getDate("battProductDate"));

                        binf.setBattInUseDate(rs.getDate("battInUseDate"));

                        binf.setLoad_curr(rs.getFloat("load_curr"));

                        binf.setInstall_user(rs.getString("install_user"));

                        binf.setDisCurrMax(rs.getFloat("disCurrMax"));

                        binf.setStation_phone(rs.getString("station_phone"));

                        
                        apply.setBinf(binf);

                        list.add(apply);

						
                    }

                } catch (SQLException e) {

                    // TODO Auto-generated catch block

                    e.printStackTrace();

                }

                return list;

            }

        });

        return list;

    }

    public static void main(String[] args) throws ParseException {

        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

        Date date1 = sdf.parse("2000-01-01 00:00:00");


 gx_tieta/src/com/fgkj/services/Battinf_applyService.java

@@ -90,4 +90,17 @@
        }

        return model;

    }

    //申请人修改待审核的申请时的查询

    public ServiceModel serchbystationId(Object obj){

        List list=((Battinf_applyImpl)dao).serchbystationId(obj);

        if(list!=null&&list.size()>0){

            model.setCode(1);

            model.setData(list);

            model.setMsg("查询成功!");

        }else{

            model.setCode(0);

            model.setMsg("查询失败!");

        }

        return model;

    }

}