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

hdw

2018-09-26 3e4465519fc0bebf411f1accb97a2d053273beac

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

 gx_tieta/WebRoot/batt-life-manage.jsp

@@ -80,16 +80,18 @@
                                </select>

                            </td>

                            <td>

                                <select id="life_type">

                                    <option value="0">实时续航</option>

                                    <option value="1">潜在续航</option>

                                <select id="endurance_state">

                                    <option value=0>全部</option>

                                    <option value=1>实时续航</option>

                                    <option value=2>潜在续航</option>

                                </select>

                            </td>

                             <td>

                                <select id="warn_type">

                                    <option value="0">续航时间小于1小时</option>

                                    <option value="1">续航时间小于2小时</option>

                                    <option value="2">续航时间小于3小时</option>

                                <select id="endurance_timelong">

                                    <option value =0>全部</option>

                                    <option value=60>续航时间小于1小时</option>

                                    <option value=120>续航时间小于2小时</option>

                                    <option value=180>续航时间小于3小时</option>

                                </select>

                            </td>

                          <!--   <td style="width: 15%">

@@ -333,10 +335,6 @@
                    $select.text('');

                    for(var i=0;i<data.data.length;i++){

                        var $option=$("<option></option>");

                        /* if(i==0){

                            $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>)");	
                            $option.attr("value", "");			
                        }else */

                        {

                            $option.text(data.data[i]);

                            $option.attr("value",data.data[i]);    

@@ -349,76 +347,16 @@
                ///findserchByBattGroupNamebystationname();

            });

        }

        
       /*  //页面加载时查询维护区中的枢纽类型

        $.post("BattInfAction_serchByStation",null,function(data){

            data=data.result;

            data=eval("("+data+")");

            //console.info(data);

            if(data.code==1 && data.data.length>0){

                var $select=$("#station_name1");

                $select.text("");

                for(var i=0;i<=data.data.length;i++){

                    $option=$("<option></option>");

                    if(i==0){

                        $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>)");	
                        $option.attr("value", "");			
                    }else{

                        $option.text(data.data[i-1].StationName1);

                        $option.attr("value",data.data[i-1].StationName1);	
                    }					
                    $select.append($option);

                }				
            }

            findStationNamebyStationname1();		
        });

		
        //当维护区的值变换时更新机房站点

        $('#station_name1').change(function(){

            findStationNamebyStationname1();

        });

		
        //根据维护区查询站点

        function findStationNamebyStationname1(){

            //var stationid = getQueryString("stationId");

            var selectvalue=$("#station_name1 option:selected").val();

            //alert(selectvalue);

            $.post("BattInfAction_serchByStationName","bif.StationName1="+selectvalue,function(data){

                //console.info(data);

                data=data.result;

                data=eval("("+data+")");

                if(data.code==1 && data.data.length>0){

                    var $select = $("#station_name");

                    $select.text("");

                    for(var i=0;i<=data.data.length;i++){

                        var $option=$("<option></option>");

                        if(i==0){

                            $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>)");	
                            $option.attr("value", "");			
                        }else{

                            $option.text(data.data[i-1].StationName);

                            $option.attr("value",data.data[i-1].StationName);	
							
                        }					
                        $select.append($option);

                    }

                }

            });

        } */

		
        

        //构造查询条件

        function createSearchParam(){

            //alert($('#endu_type').val());

            var temp = {            

                num:3,                                                    //电池状态

                BattGroupId:$("#endu_type").val(),                        //查询数据 				
                StationName:$('#station_name').val(),                    //机房名

                StationName1:$('#station_name1').val(),                    //维护区

                /* BattProductDate:$('#starttime').val()+" 00:00:00",

                BattProductDate1:$('#endtime').val()+" 23:59:59",     */    //生产日期段

                note:$('#station_name').val(),                        //查询数据 				
                endurance_state:$('#endurance_state').val(),                    //机房名

                endurance_timelong:$('#endurance_timelong').val(),                    //维护区

            };

            //console.info(temp);

            console.info(temp);

            return temp;

        }

        

@@ -437,10 +375,10 @@
            arrTd  = new Array();    

            $.ajax({     

                   type: "post",                 

                url: "Batttestdata_infAction!serchBattLife",				
                url: "Batt_enduranceAction!serchByCondition",				
                async:true,                

                dataType:'text',

                data:"result="+JSON.stringify(temp),		
                data:"json="+JSON.stringify(temp),		
                success: function(data){ 

                    data = eval("("+data+")");

                    var model = eval("("+data.result+")");

@@ -454,14 +392,11 @@
                    }else{

                        Page.pageAll = 0;

                        noContent.showNoContent("暂无查询结果!");

                        loading.hideLoading();

                    }

                    var pageNum = Math.ceil(Page.pageAll/Page.pageSize);

                    $('#page_num').val(Page.pageCurr);

                    $('#current').text(Page.pageCurr+"/"+pageNum);					
                    $('#total').text(Page.pageAll);

		        	
                    createAllTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);	        	
                    loading.hideLoading();

	
                    //createAllTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);	        	
                //    loading.hideLoading();

                },                

                error:function(){

                    loading.hideLoading();


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

@@ -46,7 +46,7 @@
                " from web_site.tb_batt_endurance,db_battinf.tb_battinf " +

                " where tb_batt_endurance.stationid=db_battinf.tb_battinf.stationid " ;

        //机房筛选

        String stationSql=" and tb_batt_endurance.stationid like ?";

        String stationSql=" and db_battinf.tb_battinf.StationName like ?";

        sql+=stationSql;

        //续航状态

        String enduranceSqlT=" and endurance_state=? ";

@@ -67,7 +67,7 @@
        //排序时间

        String orderSql=" order by endurance_timelong asc";

        //System.out.println(sql);

        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{"%"+bendurance.getStationid()+"%",bendurance.getEndurance_state(),bendurance.getEndurance_timelong()}, new CallBack() {

        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{"%"+bendurance.getNote()+"%",bendurance.getEndurance_state(),bendurance.getEndurance_timelong()}, new CallBack() {

            

            public List getResults(ResultSet rs) {

                List list=new ArrayList();

@@ -102,7 +102,7 @@
    public static void main(String[] args) {

        Batt_enduranceImpl bimpl=new Batt_enduranceImpl();

        Batt_endurance ben=new Batt_endurance();

        ben.setStationid("");

        ben.setNote("");

        ben.setEndurance_state(0);

        ben.setEndurance_timelong(0);

        List list=bimpl.serchByCondition(ben);