Bladeren bron

20220808新的分支上传

杨秀河 3 jaren geleden
bovenliggende
commit
396acfa768

+ 930 - 894
WebRoot/jsp/rzx/dataQuery/FillingdataQuery.jsp

@@ -1,894 +1,930 @@
-<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%>
-
-<%@ page import="com.runzhixing.bean.CityPlace" %>
-<%@ page import="com.runzhixing.bean.CountryPlace" %>
-<%@ page import="com.runzhixing.bean.Station" %>
-<%@ page import="com.runzhixing.bean.AuthorityRegionPlace" %>
-<%@ page import="com.runzhixing.bean.User" %>
-<%@ page import="com.runzhixing.tool.Util" %>
-<%@ page import="com.runzhixing.constant.Constant" %>
-<%
-String path = request.getContextPath();
-String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
-String username = (String) session.getAttribute("username");
-
-User user = (User)session.getAttribute(Constant.userMark); 
-List<AuthorityRegionPlace> arplist = user.getPrivilegePlaces1();
-
-List<CityPlace> cplist = new ArrayList<CityPlace>();
-List<CountryPlace> cyplist = new ArrayList<CountryPlace>();
-List<Station> slist = new ArrayList<Station>();
-String ssid = (String) session.getAttribute(Constant.Privilege);
-%>
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-  <head>
-    <base href="<%=basePath%>">
-    
-    <title>充装数据查询</title>
-    
-	<meta http-equiv="pragma" content="no-cache">
-	<meta http-equiv="cache-control" content="no-cache">
-	<meta http-equiv="expires" content="0">    
-	<meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
-	<meta http-equiv="description" content="This is my page">
-	<meta http-equiv="X-UA-Compatible" content="IE=9"/>
-	<meta http-equiv="X-UA-Compatible" content="IE=10"/>
-	<link rel="stylesheet" type="text/css" href="css/easyui/themes/default/easyui.css">
-	<link rel="stylesheet" type="text/css" href="css/easyui/themes/icon.css">
-	<link rel="stylesheet" type="text/css" href="css/easyui/demo/demo.css">
-	<script type="text/javascript" src="css/easyui/jquery.min.js"></script>
-	<script type="text/javascript" src="css/easyui/jquery.easyui.min.js"  charset="utf-8"></script>
-	<script type="text/javascript" src="css/easyui/locale/easyui-lang-zh_CN.js"  charset="utf-8"></script>
-	<link rel="stylesheet" type="text/css" href="css/common/hzbstyle.css">
-	<script type="text/javascript" src="js/easyui/export.js"></script>
-	<script type="text/javascript" src="js/common/area.js"></script>
-	<style type="text/css">
-    	.datagrid-header-row td{font-weight: bold;}
-		 #fm
-        {
-            margin: 0;
-            padding: 10px 30px;
-        }
-        .ftitle
-        {
-            font-size: 14px;
-            font-weight: bold;
-            padding: 5px 0;
-            margin-bottom: 10px;
-            border-bottom: 1px solid #ccc;
-        }
-        .fitem
-        {
-            margin-bottom: 5px;
-        }
-        .fitem label
-        {
-            display: inline-block;
-            width: 100px;
-        } 
-        
-	</style>
-	<style type="text/css">
-		 a:HOVER{
-			color: red;
-			text-decoration: none;
-		}
-		 a{
-			color: #f08300;
-			text-decoration: none;
-		}
-	</style>
-	
-	<script type="text/javascript">
-	var ssid = '<%=ssid %>';
-		var grid="";
-		var exportString="";
-		var i = 1;//第几页
-		var sum;//总条数
-		
-		var pageSize =10;
-		var totalpage;//总页数
-		$(document).ready(function(){
-			pageSize = $('#pageSize').val();
-			
-			selectCountry();
-			selectstation();
-			fLoadTable();
-			
-			
-			$('#btnadd').linkbutton('disable');
-			$('#btnadd1').linkbutton('disable');
-			//selectjqjandop();
-			//fLoadData(i,pageSize);
-			
-		});
-		
-function show(message) {  
-	            $.messager.show({  
-	                title: '提示信息',  
-	                msg: message,  
-	                timeout: 2000,  
-	                showType: 'slide'  
-	            });  
-	        }
-		function fLoadTable(){
-				grid=$('#tt').datagrid({
-				  fit: true,//自动大小   
-					title: '',
-					width: '100%',
-					height: 580,
-					toolbar: '#toolbar',
-					fitColumns: true,
-					singleSelect:false,
-					loadMsg:'正在加载, 请稍等 …',
-	            	nowrap : true,//设置为true,当数据长度超出列宽时将会自动截取
-	            	striped : true,//设置为true将交替显示行背景
-					collapsible : false,//显示可折叠按钮
-					singleSelect:false,
-	            	fitColumns:true,//允许表格自动缩放,以适应父容器
-	            	rownumbers:true,
-	            	pagination:true,//分页控件
-	            	
-					columns:[[
-						{field:'stationName',align:'left',title:'充装站',width:'160px',rowspan:'2'},
-						{field:'machineName',align:'left',title:'加气机',width:'120px',rowspan:'2'},
-						{field:'gunNo',align:'left',title:'加气枪',width:'120px',rowspan:'2'},
-						{field:'mediaType',align:'left',title:'充装介质',width:'140px',rowspan:'2'},
-						{field:'operatorName',align:'left',title:'操作员',width:'120px',rowspan:'2',formatter: function(value, row, index){
- 							if(value=="未知工作人员"){
- 								return "";
-							}
-							
-							return value;
-						}},
-						{field:'operatorNameType',align:'left',title:'充装人员种类',width:'120px',rowspan:'2'},
- 						{field:'fillState',align:'left',title:'充装状态',width:'120px',rowspan:'2',formatter: function(value, row, index){
-							if(value=="超期未检"){
-						        return '<div  style="background-color: #f08300;">'+value+'</div>';
-						        }
-	    					return value;	
-						}},
- 						{field:'fillTime1',align:'left',title:'充装时间',width:160,rowspan:'2'},
- 						
- 						{field:'FILLCHECKNName1',align:'left',title:'充前气瓶检查人员',width:140,rowspan:'2',formatter: function(value, row, index){
- 							//FILLCHECKNO1如果为空时,用充装人员填充前操作员名字,否则用FILLCHECKNName1
- 							if(isEmpty(row.FILLCHECKNNo1)){
- 								if(isEmpty(row.operatorName)){
- 									return '';
- 								}else{
- 									if(row.operatorName=="未知工作人员"){
- 										return '';
- 									}else{
- 										return row.operatorName;
- 									}
- 								}
- 							}else{
- 								if(isEmpty(row.FILLCHECKNName1)){
- 									return '';
- 								}else{
- 									if(row.FILLCHECKNName1=="未知工作人员"){
- 										return '';
- 									}else{
- 										return row.FILLCHECKNName1;
- 									}
- 								}
- 							}
-						}},
-						{field:'FILLCHECKNName2',align:'left',title:'充后气瓶检查人员',width:140,rowspan:'2',formatter: function(value, row, index){
-							//当充装状态为充前检验失败时,充后检查必须为空
-							if(row.fillStateNum==21){
-								return '';
-							}
-							//当充装状态为充装成功且充后人员FILLCHECKNO2为空时,充装时间等于充后时间,充后检查没上来,充后必须填空
-							else if(row.fillState=="成功充装"&&isEmpty(row.FILLCHECKNNo2)&&!isEmpty(row.fillTime1)&&!isEmpty(row.endTime1)&&row.fillTime1==row.endTime1){
-								return '';
-							}
-							//FILLCHECKNO2为空时,充装时间不等于充后时间,充后已经上来,用当前充装人员CngOperatorName填充
-							else if(isEmpty(row.FILLCHECKNNo2)&&!isEmpty(row.fillTime1)&&!isEmpty(row.endTime1)&&compareDate(row.endTime1, row.fillTime1)){
-								if(isEmpty(row.operatorName)){
-									return '';
-								}else{
-									if(row.operatorName=="未知工作人员"){
-										return '';
-									}else{
-										return row.operatorName;
-									}
-								}
-							}
-							//FILLCHECKNO2不为空,FILLCHECKNName2表示充后人员
-							else if(!isEmpty(row.FILLCHECKNNo2)){
-								if(row.FILLCHECKNName2=="未知工作人员"){
-									return '';
-								}else{
-									return row.FILLCHECKNName2;
-								}
-							}else{
-								return '';
-							}
-						}},
-						
-						
-						
-						{field:'carNo',align:'left',title:'车牌号',width:'120px',rowspan:'2',formatter: function(value, row, index){
-							if(value){
-								var v=0;
-								if(row.appType.indexOf("其他")!=-1) {v=0;}else
-								if(row.appType.indexOf("出租")!=-1) {v=1;}else
-								if(row.appType.indexOf("公交")!=-1) {v=2;}else
-								if(row.appType.indexOf("私用")!=-1){v=3;}else
-								if(row.appType.indexOf("货运")!=-1){v=4;}else
-								if(row.appType.indexOf("客运")!=-1) {v=5;}else
-								if(row.appType.indexOf("外地车")!=-1) {
-									v=9;
-								
-									return '<a href="carpublic?carNo='+value+'&appType='+v+'&operState=-1'+'&plateType='+row.plateType+'&fixCarNo='+row.fixCarNo+'&fillTimes='+row.fillTime1+'" target="_blank">'+value+'</a>';
-								}else
-								if(row.appType.indexOf("营转非")!=-1) {v=6;}
-								return '<a href="machineDetailfill?carNo='+value+'&appType='+v+'&operState=-1'+'&plateType='+row.plateType+'&fixCarNo='+row.fixCarNo+'&fillTimes='+row.fillTime1+'" target="_blank">'+value+'</a>';
-							}
-							return value;
-							
-						}},
-						{field:'plateTypeName',align:'left',title:'车牌类型',width:'120px',rowspan:'2'},
-						{field:'appType',align:'left',title:'应用类型',width:'120px',rowspan:'2'},
-						
-						{field:'cylinderNum',align:'left',title:'气瓶数量',width:'120px',rowspan:'2'},
-						{field:'regNo',align:'left',title:'使用登记证',width:'120px',rowspan:'2'},
-						{field:'nowNumber',align:'left',title:'已充装次数',width:'120px',rowspan:'2'},
-						
-						/* {field:'fillcheckstr',align:'left',title:'已充装次数',width:'120px',rowspan:'2',hidden:true}, */
-						
-						{field:'endTime1',align:'left',title:'结束时间',width:160,rowspan:'2'},
-						{field:'lowPress',align:'left',title:'充装前压',width:'120px',rowspan:'2'},
-						{field:'highPress',align:'left',title:'充装后压',width:'120px',rowspan:'2'},
-						{field:'flux',align:'left',title:'流量',width:'120px',rowspan:'2'},
-						{field:'money',align:'left',title:'金额(元)',width:'120px',rowspan:'2'},
-						
-						{"title":"充装前检查",align:'left',"colspan":6},
-						{"title":"充装后检查",align:'left',"colspan":3},
-						
-						
-					],
-					[
-						{"field":"taskNo1",align:'left',"title":'附件齐全'+"<br/>"+'符合安全'+"<br/>"+'要求',"rowspan":1,"colspan":1},
-						{"field":"taskNo2",align:'left',"title":'瓶内有余'+"<br/>"+'压(首次充'+"<br/>"+'装已置换)',"rowspan":1,"colspan":1},
-						{"field":"taskNo3",align:'left',"title":'外观完好、无缺陷('+"<br/>"+'裂纹、腐蚀、'+"<br/>"+'变形等)、安装稳定',"rowspan":1,"colspan":1},
-						{"field":"taskNo4",align:'left',"title":'无私改'+"<br/>"+'符合规定',"rowspan":1,"colspan":1},
-						{"field":"taskNo5",align:'left',"title":'无漏气、'+"<br/>"+'漏电、'+"<br/>"+'漏油现象',"rowspan":1,"colspan":1},
-						{"field":"taskNo6",align:'left',"title":'电子标签与车辆'+"<br/>"+'信息相符并贴于瓶'+"<br/>"+'体上(判定标签除外)',"rowspan":1,"colspan":1},
-						
-						
-						{"field":"taskNo7",align:'left',"title":'瓶内压力'+"<br/>"+'在规定范'+"<br/>"+'围内',"rowspan":1,"colspan":1},
-						{"field":"taskNo8",align:'left',"title":'附件连接'+"<br/>"+'可靠、密封'+"<br/>"+'完好',"rowspan":1,"colspan":1},
-						{"field":"taskNo9",align:'left',"title":'无鼓包、变'+"<br/>"+'形、泄露等'+"<br/>"+'异常现象',"rowspan":1,"colspan":1},
-					 ]
-					
-					
-					]
-				});	
-				if(ssid.substring(0, 2)!="51"){
-					$('#tt').datagrid('hideColumn','lowPress');
-					$('#tt').datagrid('hideColumn','highPress');
-					$('#tt').datagrid('hideColumn','flux');
-					$('#tt').datagrid('hideColumn','money');
-				}
-				
-			
-				
-				
-		}
-		function fLoadData(page,rows){
-		if(!$('#station option:selected').text()){
-			return false;
-		}
-			    $.messager.progress({ 
-			        title: '请等待', 
-			        msg: '正在加载数据...', 
-			        text: '查询中.......' 
-			    }); 
-				$.ajax({
-					type:"POST",
-					contentType: "application/x-www-form-urlencoded; charset=UTF-8",
-					data:$('#fillingform').serialize(),
-					url:"ajax/fillingDataQuery?page="+page+"&psize="+rows,
-					success:function (data){
-							$.messager.progress('close'); 
-							var vData = $.parseJSON(data);
-							sum = vData.total;
-							
-						if(sum==0){
-								show("没有查询到相关信息!!!");
-							}
-							totalpage = Math.ceil(sum/rows);
-							
-							$('#tt').datagrid('loadData', vData); //将数据绑定到datagrid   
-							
-							var p = $('#tt').datagrid('getPager'); 
-							$(p).pagination({ 
-						        pageList: [10,20,30,100,200,400],//可以设置每页记录条数的列表 
-						        beforePageText: '第',//页数文本框前显示的汉字 
-						        afterPageText: '页    共 {pages} 页', 
-						        displayMsg: '当前显示 {from} - {to} 条记录   共 {total} 条记录', 
-								onSelectPage: function (pageNumber, pageSize) { 
-					                fLoadData(pageNumber, pageSize); 
-           						 } 
-							
-							});
- 
-											}
-				});
-	
-			
-		}
-		
-		function selectCountry(){
-			var id=document.getElementById("city").value;
-			var select = document.getElementById("country");
-			for(var i=select.options.length-1;i>=0;i--) {
-				select.options.remove(i);
-			}
-			$.ajax({
-					type:"POST",
-					contentType: "application/x-www-form-urlencoded; charset=UTF-8",
-					url:"ajax/hiddenCity?cityId="+id,
-					success:function (data){
-						var obj=eval("(" + data + ")");
-						if(obj.rows.length==1){
-						select.options.add(new Option("请选择县", ""));
-						}
-						$.each(obj.rows, function(i,item){      
-							select.options.add(new Option(item.name, item.id));
-  						});
-						      
-							
-					}
-			});
-		}
-		
-		function selectCountry1(){
-				selectCountry();
-				selectstation();
-		}
-		
-	function changeSize(){
-		fLoadData(1,10);
-	}
-	
-	function selectstation(){
-	var ii=1;
-			var id=document.getElementById("country").value;
-			var select = document.getElementById("station");
-			for(var i=select.options.length-1;i>=0;i--) {
-				select.options.remove(i);
-			}
-			$.ajax({
-					type:"POST",
-					contentType: "application/x-www-form-urlencoded; charset=UTF-8",
-					data:$('#fillingform').serialize(),
-					//url:"ajax/hiddenCNGStation?cityId="+id,
-					url:"ajax/hiddenspeStation?type=2",
-					success:function (data){
-						var obj=eval("(" + data + ")");
-						select.options.add(new Option("全部", ""));
-						$.each(obj.rows, function(i,item){  
-						     
-							select.options.add(new Option(item.name, item.id));
-  						});
-						      
-							
-					}
-			});
-	}
-	function selectstation1(){
-	selectstation();
-	//changeSize();
-	}
-	
-	function selectjqjandop(){
-		selectjqj();
-		selectoperatorNo();
-	}
-	function selectjqj(){
-		var ii=1;
-		var id=document.getElementById("station").value;
-		
-		 var options = $("#station option:selected");
-		 var stationName = options.text();
-		var select = document.getElementById("jqj");
-		
-		var select0817 = document.getElementById("jqj_0817");
-		var select08171 = document.getElementById("jqj_08171");
-		for(var i=select.options.length-1;i>=0;i--) {
-			select.options.remove(i);
-		}
-		for(var i=select0817.options.length-1;i>=0;i--) {
-			select0817.options.remove(i);
-		}
-		for(var i=select08171.options.length-1;i>=0;i--) {
-			select08171.options.remove(i);
-		}
-		$.ajax({
-				type:"POST",
-				contentType: "application/x-www-form-urlencoded; charset=UTF-8",
-				url:"ajax/hiddenjqj?stationId="+id,
-				success:function (data){
-					var obj=eval("(" + data + ")");
-					select.options.add(new Option("全部", ""));
-					$.each(obj.rows, function(i,item){   
-						select.options.add(new Option(item.manu+item.type, item.machineNo));
-						select0817.options.add(new Option(item.manu+item.type, item.machineNo));
-						select08171.options.add(new Option(item.manu+item.type, item.machineNo));
-						});
-					      
-					$('#btnadd').linkbutton('enable');
-					
-					document.getElementById("stationId0817").value=id;
-					document.getElementById("stationName0817").innerText=stationName;
-					document.getElementById("stationName08171").innerText=stationName;
-				}
-		});
-	}
-	var oper="";
-	var username = '<%=username %>';
-	var opers=[];
-	function selectoperatorNo(){
-		var ii=1;
-		var id=document.getElementById("station").value;
-		var select = document.getElementById("operatorNo");
-		var fillCheckNo1 = document.getElementById("fillCheckNo1");
-		var fillCheckNo2 = document.getElementById("fillCheckNo2");
-		for(var i=select.options.length-1;i>=0;i--) {
-			select.options.remove(i);
-		}
-		for(var i=fillCheckNo1.options.length-1;i>=0;i--) {
-			fillCheckNo1.options.remove(i);
-		}
-		for(var i=fillCheckNo2.options.length-1;i>=0;i--) {
-			fillCheckNo2.options.remove(i);
-		}
-		$.ajax({
-				type:"POST",
-				contentType: "application/x-www-form-urlencoded; charset=UTF-8",
-				url:"ajax/hiddenoperatorNo?stationId="+id,
-				success:function (data){
-					var obj=eval("(" + data + ")");
-					select.options.add(new Option("全部", ""));
-					fillCheckNo1.options.add(new Option("无", ""));
-					fillCheckNo2.options.add(new Option("无", ""));
-					$.each(obj.rows, function(i,item){   
-						select.options.add(new Option(item.name, item.operatorNo));
-						fillCheckNo1.options.add(new Option(item.name, item.operatorNo));
-						fillCheckNo2.options.add(new Option(item.name, item.operatorNo));
-						if(item.name!=username){
-							oper = item.name;
-							opers.push(item.name);
-							
-						}
-						
-						});
-					$('#btnadd1').linkbutton('enable');     
-					document.getElementById("stationId08171").value=id;
-						
-				}
-		});
-	}
-	function expt1(){
-		expt(grid);
-	}
-	function exptSingle(){
-		if(!grid){
-			alert("数据为空");
-			return false;
-		}else{
-			expt(grid);
-		}
-		
-	}
-	function exptAll(){
-		fLoadDataAll(1,5000);
-	}
-	
-	function fLoadDataAll(page,rows){
-				var startTime1 = $('#startTime').datebox('getValue');
-				var endTime1 = $('#endTime').datebox('getValue');
-			
-			
-				document.getElementById("pageNumber").innerText = i;
-				document.getElementById("from").innerText = (page-1)*rows;
-				document.getElementById("to").innerText = page*rows;
-			    $.messager.progress({ 
-			        title: '请等待', 
-			        msg: '正在加载数据...', 
-			        text: '查询中.......' 
-			    }); 
-				$.ajax({
-					type:"POST",
-					contentType: "application/x-www-form-urlencoded; charset=UTF-8",
-					data:$('#fillingform').serialize(),
-					url:"ajax/fillingDataQuery?page="+page+"&psize="+rows,
-					success:function (data){
-							$.messager.progress('close'); 
-							var vData = $.parseJSON(data);
-							sum = vData.total;
-							
-if(sum==0){
-								show("没有查询到相关信息!!!");
-							}
-							totalpage = Math.ceil(sum/rows);
-							document.getElementById("total").innerText = sum;
-							document.getElementById("totalpage").innerText = totalpage;
-							var vData = $.parseJSON(data);
-							$('#tt').datagrid('loadData', vData); //将数据绑定到datagrid   
-							var p = $('#tt').datagrid('getPager'); 
-							$(p).pagination({ 
-						        pageList: [10,20,30,100,200,400],//可以设置每页记录条数的列表 
-						        beforePageText: '第',//页数文本框前显示的汉字 
-						        afterPageText: '页    共 {pages} 页', 
-						        displayMsg: '当前显示 {from} - {to} 条记录   共 {total} 条记录', 
-								onSelectPage: function (pageNumber, pageSize) { 
-					                fLoadData(pageNumber, pageSize); 
-           						 } 
-							
-							});
-							
-							if(!grid){
-			alert("数据为空");
-			return false;
-		}else{
-			expt(grid);
-		}
-											}
-				});
-	
-			
-		}
-		
-				function selectpage(){
-	var selectpage = $('#selectpage').val();
-	if(selectpage>=1&&selectpage<=totalpage){
-		i = selectpage;
-		$("#selectpage").val("");
-		pageSize = $('#pageSize').val();
-		fLoadData(i,pageSize);
-	}else{
-		$("#selectpage").val("");
-		return false;
-	}
-}
-function selectjqjandop22(){
-	selectjqjandop();
-	//changeSize();
-}
-function selectoperatorNo22(){
-	//selectoperatorNo();
-	//changeSize();
-}
-function add(){
-	$("#add").dialog("open").dialog('setTitle', '设置加气机状态');
-	$("#add").panel("move",{top:$(document).scrollTop() + ($(window).height()-150) * 0.5}); 
-}
-function add1(){
-	$("#add1").dialog("open").dialog('setTitle', '设置检查人员');
-	$("#add1").panel("move",{top:$(document).scrollTop() + ($(window).height()-150) * 0.5}); 
-}
-
-function save(){
-	$.messager.progress({ 
-        title: '请等待', 
-        msg: '正在提交数据...', 
-        text: '提交中.......' 
-    }); 
-	$("#addfm").form("submit", {
-            url: "ajax/updateMachine",
-            onsubmit: function () {
-                return $(this).form("validate");
-            },
-            success:function (data){
-						$.messager.progress('close');
-						var vData = $.parseJSON(data);
-						var result = vData.result;
-						if(result==0){
-							show("设置失败!");
-						}else{
-							show("设置成功!");
-							$('#add').dialog('close');
-						}
-                        
-		},
-		error:function(XMLHttpRequest,textStatus, errorThrown) {
-				$.messager.progress('close');
-		 				
-		}
-    });
-    
-}
-
-function save1(){
-	$.messager.progress({ 
-        title: '请等待', 
-        msg: '正在提交数据...', 
-        text: '提交中.......' 
-    }); 
-	$("#add1fm").form("submit", {
-            url: "ajax/updateFillCheckOper",
-            onsubmit: function () {
-                return $(this).form("validate");
-            },
-            success:function (data){
-						$.messager.progress('close');
-						var vData = $.parseJSON(data);
-						var result = vData.result;
-						if(result==0){
-							show("设置失败!");
-						}else{
-							show("设置成功!");
-							$('#add1').dialog('close');
-						}
-                        
-		},
-		error:function(XMLHttpRequest,textStatus, errorThrown) {
-				$.messager.progress('close');
-		 				
-		}
-    });
-    
-}
-
-//判断字符是否为空的方法
-function isEmpty(obj){
-    if(typeof obj == "undefined" || obj == null || obj == ""){
-        return true;
-    }else{
-        return false;
-    }
-}
-
-function compareDate(date1,date2){
-    var oDate1 = new Date(date1);
-    var oDate2 = new Date(date2);
-    if(oDate1.getTime() > oDate2.getTime()){
-        return true; //第一个大
-    } else {
-        return false; //第二个大
-    }
-}
-	</script>
-	
-  </head>
-  
-  <body>
-    <!-- 查询结果:数据表格 -->
-  	<table id="tt"  cellspacing="0" cellpadding="0" >
-	</table>
-	<div id="toolbar" style="padding-top: 0px;height: auto;">
-	
-  		 <form id="fillingform" action="ajax/filling" method="post">
-			<input type="text" name="fillCheck2" id="fillCheck2"   style="width: 150px;height: 34px;display: none;"  class="hzbspan" value="-1">
-			<table>
-			<tr>
-				<td>
-					<span class="hzbspan">省:</span>
-				</td>
-				<td>
-					<select  name="province" style="width: 150px;height: 34px;min-width: 100px;" class="hzbspan select">
-						<%for(AuthorityRegionPlace arp:arplist){
-							cplist = arp.getCityPlace();
-						 %>
-							<option value="<%=arp.getId() %>">
-								<%=arp.getName() %>
-							</option>
-						<%} %>
-					</select>
-				</td>
-				<td>
-					<span class="hzbspan">市:</span>
-				</td>
-				<td>
-					<select  name="city" id="city" style="width: 150px;height: 34px;min-width: 100px;" class="hzbspan select" onchange="selectCountry1()">
-				
-						<%
-							
-							for(CityPlace cp:cplist){
-							cyplist = cp.getSubPlaceList();
-						%>		
-							
-							<option value="<%=cp.getId() %>">
-								<%=cp.getName() %>
-							</option>
-							
-						 
-						<%} %>
-					</select>
-				</td>
-				<td>
-					<span class="hzbspan">县:</span>
-				</td>
-				<td>
-					<select  name="country" id = "country" style="width: 150px;height: 34px;min-width: 100px;" class="hzbspan select"  onchange="selectstation1();" >
-						<option value="">全部</option>
-					</select>
-				</td>
-			</tr>
-			<tr>
-				<td>
-					<span class="hzbspan">充装站点:</span>
-				</td>
-				<td>
-					<select  name="station" id ="station" style="width: 150px;height: 34px;min-width: 100px;" class="hzbspan select"  onchange="selectjqjandop22();" >
-						<option value="">全部</option>
-					</select>
-				</td>
-				<td>
-					<span class="hzbspan">加气机:</span>
-				</td>
-				<td>
-					<select  name="jqj" id ="jqj" style="width: 150px;height: 34px;min-width: 100px;" class="hzbspan select"  onchange="selectoperatorNo22();" >
-						<option value="">全部</option>
-					</select>
-				</td>
-			
-			</tr>
-			<tr>
-			<td>
-			<span  style="cursor: default"><span class="hzbspan">应用类型:</span></span></td>
-			<td><select  name="appType" id="appType" style="width: 150px;height: 34px;" class="hzbspan select" >
-						<option value="-1" selected="selected">全部</option>
-					<option value="0">其他</option>
-					<option value="1">出租</option>
-					<option value="2">公交</option>
-					<option value="3">私用</option>
-					<option value="4">货运</option>
-					<option value="5">客运</option>
-					<option value="6">营转非</option>
-					<option value="9">外地车</option>
-				</select>
-				</td>
-			<td>
-			<span  style="cursor: default"><span class="hzbspan">开始时间:</span></span></td>
-			<td><input type="text" name="startTime" id="startTime" class="easyui-datebox"  style="width: 150px;height: 34px;"  class="hzbspan" data-options="prompt:'-   -   -   -   -   -   -'">
-			
-			</td>
-			<td>
-			<span  style="cursor: default"><span class="hzbspan">气枪编号:</span></span></td>
-			<td><input type="text" name="gunNo" id="gunNo"   style="width: 150px;height: 34px;"  class="hzbspan" placeholder="-   -   -   -   -   -   -">
-			</td>
-			<td><span  style="cursor: default"><span class="hzbspan">操作员:</span></span></td>
-			<td><select  name="operatorNo" id ="operatorNo" style="width: 150px;height: 34px;min-width: 100px;" class="hzbspan select" >
-				<option value="">全部</option>
-			</select>
-			</td>
-			</tr>
-			
-			<tr><td>
-			<span  style="cursor: default"><span class="hzbspan">充装状态:</span></span></td>
-			<td><select  name="fillState" id="fillState" style="width: 150px;height: 34px;" class="hzbspan select" >
-					<option value="-1" selected="selected">全部</option>
-					<option value="0">成功充装</option>
-					<option value="1">灰名单允许</option>
-					<option value="2">灰名单不允许</option>
-					<option value="3">黑名单不充装</option>
-					<option value="4">检验未通过</option>
-					<option value="5">超期未检</option>
-					<option value="6">使用年限超出</option>
-					<option value="7">次数不足</option>
-					<option value="8">当天次数不足</option>
-					<option value="9">站点不匹配</option>
-					<option value="10">加气机不匹配</option>
-					<option value="11">加气枪不匹配</option>
-					<option value="21">充前异常</option>
-					<option value="31">充后异常</option>
-					<!-- 
-					<option value="21">充前异常 检查内容-附件齐全符合安全要求</option>
-					
-					<option value="22">充前异常 检查内容-瓶内有余压(首次充装已置换)</option>
-					<option value="23">充前异常 检查内容-外观完好、无缺陷(裂纹、腐蚀、变形等)、安装稳定</option>
-					<option value="24">充前异常 检查内容-无私改符合规定</option>
-					<option value="25">充前异常 检查内容-无漏气、漏电、漏油现象</option>
-					<option value="26">充前异常 检查内容-电子标签与车辆信息相符并粘贴于瓶体上(判定标签除外)</option>
-					<option value="31">充后异常 检查内容-瓶内压力在规定范围内</option>
-					<option value="32">充后异常 检查内容-附件连接可靠、密封完好</option>
-					<option value="33">充后异常 检查内容-无鼓包、变形、泄漏等异常现象</option>
-					 -->
-					
-				</select></td>
-			<td>
-			<span  style="cursor: default"><span class="hzbspan">结束时间:</span></span></td>
-			<td><input type="text" name="endTime" id="endTime" class="easyui-datebox" style="width: 150px;height: 34px;"  class="hzbspan" data-options="prompt:'-   -   -   -   -   -   -'">
-			</td>
-			<td><span  style="cursor: default"><span class="hzbspan">车牌号:</span></span></td>
-			<td><input type="text" name="carNo" id="carNo"  style="width: 150px;height: 34px;"  class="hzbspan" placeholder="-   -   -   -   -   -   -">
-			
-			</td>
-			
-			<td>
-				
-				
-				<span class="hzbspan">充装介质:</span></td>
-				<td>
-				<select  name="cylinderType" id="cylinderType" style="width: 150px;height: 34px;" class="hzbspan select"  >
-					<option value="-1">全部</option>
-  						<option value="0">CNG-高压气体</option>
-  						<option value="1">LNG-低温液化天然气</option>
-				</select>
-			
-			
-			</td>
-			
-		</tr>
-		<tr>
-		<td colspan="5">
-			<a id="btninfosearch" onclick="changeSize();" class="easyui-linkbutton" icon="icon-search" href="javascript:void(0)" style="margin-bottom:  5px;" ><span class="hzbspan" style="color: #f08300;font-size: 16px;">查询</span></a> 
-			
-			<a id="btninfosearch" onclick="exptSingle();" class="easyui-linkbutton" icon="icon-export" href="javascript:void(0)" style="margin-bottom:  5px;" ><span class="hzbspan" style="color: #f08300;font-size: 16px;">导出</span></a> 
-			<div style="display: none;">
-			<a id="btnadd" onclick="add();" class="easyui-linkbutton" icon="icon-config" href="javascript:void(0)" style="margin-bottom:  5px;" ><span class="hzbspan" style="color: #f08300;font-size: 16px;">设置加气机状态</span></a> 
-			<a id="btnadd1" onclick="add1();" class="easyui-linkbutton" icon="icon-config" href="javascript:void(0)" style="margin-bottom:  5px;" ><span class="hzbspan" style="color: #f08300;font-size: 16px;">设置检查人员</span></a> 
-			</div>
-		</td>
-		</tr>
-		</table>
-		</form>	
-	</div>
-	<div id="dialog2"></div> 
-	
-	<div id="add" class="easyui-dialog" style="width: 440px; height: 280px; padding: 10px 40px;"  shadow="false"  closed="true" modal="true" buttons="#dlg-buttons">
-       <form id="addfm" method="post">
-       		<input name="stationNo" id="stationId0817" type="text"  style="display: none;"/>
-       		<div class="fitem">
-	       		<label> 站点:</label>
-	           <span id="stationName0817"></span>	 
-			</div>
-	       	<div class="fitem">
-	       		<label> 加气机:</label>
-	           <select  name="machineNo" id="jqj_0817" style="width: 200px;height: 34px;" class="hzbspan"  >
-				</select>  	 
-			</div>	 
-			<div class="fitem">
-	           <label>加气机状态:</label>
-	           <select  name="machineState" id="jqjState" style="width: 200px;height: 34px;" class="hzbspan"  >
-					<option value="0">在用</option>
-					<option value="1">可用</option>
-					<option value="2">检修</option>
-				</select>
-	       	</div>
-       </form>
- 	<div id="dlg-buttons">
-        <a href="javascript:void(0)" class="easyui-linkbutton" onclick="save()" iconcls="icon-add">保存</a>
-        <a href="javascript:void(0)" class="easyui-linkbutton" onclick="javascript:$('#add').dialog('close')"
-            iconcls="icon-cancel">关闭</a>
-    </div> 
-    </div>
-    
-    <div id="add1" class="easyui-dialog" style="width: 440px; height: 280px; padding: 10px 40px;"  shadow="false"  closed="true" modal="true" buttons="#dlg1-buttons">
-       <form id="add1fm" method="post">
-       		<input name="stationNo" id="stationId08171" type="text" style="display: none;" />
-       		<div class="fitem">
-	       		<label> 站点:</label>
-	           <span id="stationName08171"></span>	 
-			</div>
-	       	<div class="fitem">
-	       		<label> 加气机:</label>
-	           <select  name="machineNo" id="jqj_08171" style="width: 200px;height: 34px;" class="hzbspan"  >
-				</select>  	 
-			</div>	 
-			<div class="fitem">
-	           <label>充前检查人员:</label>
-	           <select  name="fillCheckNo1" id="fillCheckNo1" style="width: 200px;height: 34px;" class="hzbspan"  >
-				</select>
-	       	</div>
-	       	<div class="fitem">
-	           <label>充后检查人员:</label>
-	           <select  name="fillCheckNo2" id="fillCheckNo2" style="width: 200px;height: 34px;" class="hzbspan"  >
-				</select>
-	       	</div>
-       </form>
- 	<div id="dlg1-buttons">
-        <a href="javascript:void(0)" class="easyui-linkbutton" onclick="save1()" iconcls="icon-add">保存</a>
-        <a href="javascript:void(0)" class="easyui-linkbutton" onclick="javascript:$('#add1').dialog('close')"
-            iconcls="icon-cancel">关闭</a>
-    </div> 
-    </div>
-  </body>
-</html>
+<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%>
+
+<%@ page import="com.runzhixing.bean.CityPlace" %>
+<%@ page import="com.runzhixing.bean.CountryPlace" %>
+<%@ page import="com.runzhixing.bean.Station" %>
+<%@ page import="com.runzhixing.bean.AuthorityRegionPlace" %>
+<%@ page import="com.runzhixing.bean.User" %>
+<%@ page import="com.runzhixing.tool.Util" %>
+<%@ page import="com.runzhixing.constant.Constant" %>
+<%
+String path = request.getContextPath();
+String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
+String username = (String) session.getAttribute("username");
+
+User user = (User)session.getAttribute(Constant.userMark); 
+List<AuthorityRegionPlace> arplist = user.getPrivilegePlaces1();
+
+List<CityPlace> cplist = new ArrayList<CityPlace>();
+List<CountryPlace> cyplist = new ArrayList<CountryPlace>();
+List<Station> slist = new ArrayList<Station>();
+String ssid = (String) session.getAttribute(Constant.Privilege);
+%>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+  <head>
+    <base href="<%=basePath%>">
+    
+    <title>充装数据查询</title>
+    
+	<meta http-equiv="pragma" content="no-cache">
+	<meta http-equiv="cache-control" content="no-cache">
+	<meta http-equiv="expires" content="0">    
+	<meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
+	<meta http-equiv="description" content="This is my page">
+	<meta http-equiv="X-UA-Compatible" content="IE=9"/>
+	<meta http-equiv="X-UA-Compatible" content="IE=10"/>
+	<link rel="stylesheet" type="text/css" href="css/easyui/themes/default/easyui.css">
+	<link rel="stylesheet" type="text/css" href="css/easyui/themes/icon.css">
+	<link rel="stylesheet" type="text/css" href="css/easyui/demo/demo.css">
+	<script type="text/javascript" src="css/easyui/jquery.min.js"></script>
+	<script type="text/javascript" src="css/easyui/jquery.easyui.min.js"  charset="utf-8"></script>
+	<script type="text/javascript" src="css/easyui/locale/easyui-lang-zh_CN.js"  charset="utf-8"></script>
+	<link rel="stylesheet" type="text/css" href="css/common/hzbstyle.css">
+	<script type="text/javascript" src="js/easyui/export.js"></script>
+	<script type="text/javascript" src="js/common/area.js"></script>
+	<style type="text/css">
+    	.datagrid-header-row td{font-weight: bold;}
+		 #fm
+        {
+            margin: 0;
+            padding: 10px 30px;
+        }
+        .ftitle
+        {
+            font-size: 14px;
+            font-weight: bold;
+            padding: 5px 0;
+            margin-bottom: 10px;
+            border-bottom: 1px solid #ccc;
+        }
+        .fitem
+        {
+            margin-bottom: 5px;
+        }
+        .fitem label
+        {
+            display: inline-block;
+            width: 100px;
+        } 
+        
+	</style>
+	<style type="text/css">
+		 a:HOVER{
+			color: red;
+			text-decoration: none;
+		}
+		 a{
+			color: #f08300;
+			text-decoration: none;
+		}
+	</style>
+	
+	<script type="text/javascript">
+	var ssid = '<%=ssid %>';
+		var grid="";
+		var exportString="";
+		var i = 1;//第几页
+		var sum;//总条数
+		
+		var pageSize =10;
+		var totalpage;//总页数
+		$(document).ready(function(){
+			pageSize = $('#pageSize').val();
+			
+			selectCountry();
+			selectstation();
+			fLoadTable();
+			
+			
+			$('#btnadd').linkbutton('disable');
+			$('#btnadd1').linkbutton('disable');
+			//selectjqjandop();
+			//fLoadData(i,pageSize);
+			
+		});
+		
+function show(message) {  
+	            $.messager.show({  
+	                title: '提示信息',  
+	                msg: message,  
+	                timeout: 2000,  
+	                showType: 'slide'  
+	            });  
+	        }
+		function fLoadTable(){
+				grid=$('#tt').datagrid({
+				  fit: true,//自动大小   
+					title: '',
+					width: '100%',
+					height: 580,
+					toolbar: '#toolbar',
+					fitColumns: true,
+					singleSelect:false,
+					loadMsg:'正在加载, 请稍等 …',
+	            	nowrap : true,//设置为true,当数据长度超出列宽时将会自动截取
+	            	striped : true,//设置为true将交替显示行背景
+					collapsible : false,//显示可折叠按钮
+					singleSelect:false,
+	            	fitColumns:true,//允许表格自动缩放,以适应父容器
+	            	rownumbers:true,
+	            	pagination:true,//分页控件
+	            	
+					columns:[[
+						{field:'stationName',align:'left',title:'充装站',width:'160px',rowspan:'2'},
+						{field:'machineName',align:'left',title:'加气机',width:'120px',rowspan:'2'},
+						{field:'gunNo',align:'left',title:'加气枪',width:'120px',rowspan:'2'},
+						{field:'mediaType',align:'left',title:'充装介质',width:'140px',rowspan:'2'},
+						{field:'operatorName',align:'left',title:'操作员',width:'120px',rowspan:'2',formatter: function(value, row, index){
+ 							if(value=="未知工作人员"){
+ 								return "";
+							}
+							
+							return value;
+						}},
+						{field:'operatorNameType',align:'left',title:'充装人员种类',width:'120px',rowspan:'2'},
+ 						{field:'fillState',align:'left',title:'充装状态',width:'120px',rowspan:'2',formatter: function(value, row, index){
+							if(value=="超期未检"){
+						        return '<div  style="background-color: #f08300;">'+value+'</div>';
+						        }
+	    					return value;	
+						}},
+ 						{field:'fillTime1',align:'left',title:'充装时间',width:160,rowspan:'2'},
+ 						
+ 						{field:'FILLCHECKNName1',align:'left',title:'充前气瓶检查人员',width:140,rowspan:'2',formatter: function(value, row, index){
+ 							//FILLCHECKNO1如果为空时,用充装人员填充前操作员名字,否则用FILLCHECKNName1
+ 							/*
+ 							if(isEmpty(row.FILLCHECKNNo1)){
+ 								if(isEmpty(row.operatorName)){
+ 									return '';
+ 								}else{
+ 									if(row.operatorName=="未知工作人员"){
+ 										return '';
+ 									}else{
+ 										return row.operatorName;
+ 									}
+ 								}
+ 							}else{
+ 								if(isEmpty(row.FILLCHECKNName1)){
+ 									return '';
+ 								}else{
+ 									if(row.FILLCHECKNName1=="未知工作人员"){
+ 										return '';
+ 									}else{
+ 										return row.FILLCHECKNName1;
+ 									}
+ 								}
+ 							}
+ 							*/
+ 							return value;
+						}},
+						{field:'FILLCHECKNName2',align:'left',title:'充后气瓶检查人员',width:140,rowspan:'2',formatter: function(value, row, index){
+							/*
+							//当充装状态为充前检验失败时,充后检查必须为空
+							if(row.fillStateNum==21){
+								return '';
+							}
+							//当充装状态为充装成功且充后人员FILLCHECKNO2为空时,充装时间等于充后时间,充后检查没上来,充后必须填空
+							else if(row.fillState=="成功充装"&&isEmpty(row.FILLCHECKNNo2)&&!isEmpty(row.fillTime1)&&!isEmpty(row.endTime1)&&row.fillTime1==row.endTime1){
+								return '';
+							}
+							//FILLCHECKNO2为空时,充装时间不等于充后时间,充后已经上来,用当前充装人员CngOperatorName填充
+							else if(isEmpty(row.FILLCHECKNNo2)&&!isEmpty(row.fillTime1)&&!isEmpty(row.endTime1)&&compareDate(row.endTime1, row.fillTime1)){
+								if(isEmpty(row.operatorName)){
+									return '';
+								}else{
+									if(row.operatorName=="未知工作人员"){
+										return '';
+									}else{
+										return row.operatorName;
+									}
+								}
+							}
+							//FILLCHECKNO2不为空,FILLCHECKNName2表示充后人员
+							else if(!isEmpty(row.FILLCHECKNNo2)){
+								if(row.FILLCHECKNName2=="未知工作人员"){
+									return '';
+								}else{
+									return row.FILLCHECKNName2;
+								}
+							}else{
+								return '';
+							}
+							*/
+							return value;
+						}},
+						{field:'fillMonitorName',align:'left',title:'充装监督人员',width:140,rowspan:'2',formatter: function(value, row, index){
+							/*
+							if(isEmpty(row.fillMonitorNo)){//监督人员不存在
+								if (!isEmpty(row.FILLCHECKNNo2) && !(row.FILLCHECKNName2=="未知工作人员")) {//充后检查人员存在
+									return row.FILLCHECKNName2;
+								}
+								if(!isEmpty(row.FILLCHECKNNo1) && !(row.FILLCHECKNName1=="未知工作人员")){//充前检查人员存在
+									return row.FILLCHECKNName1;
+								}
+								if(!isEmpty(row.operatorName) && !(row.operatorName=="未知工作人员")){//充装人员
+									return row.operatorName;
+								}
+							}else{//监督人员存在
+								if(!(row.fillMonitorName=="未知工作人员")){
+									return row.fillMonitorName;
+								}
+							}
+							return "";
+							*/
+							return value;
+						}},
+						
+						{field:'carNo',align:'left',title:'车牌号',width:'120px',rowspan:'2',formatter: function(value, row, index){
+							if(value){
+								var v=0;
+								if(row.appType.indexOf("其他")!=-1) {v=0;}else
+								if(row.appType.indexOf("出租")!=-1) {v=1;}else
+								if(row.appType.indexOf("公交")!=-1) {v=2;}else
+								if(row.appType.indexOf("私用")!=-1){v=3;}else
+								if(row.appType.indexOf("货运")!=-1){v=4;}else
+								if(row.appType.indexOf("客运")!=-1) {v=5;}else
+								if(row.appType.indexOf("外地车")!=-1) {
+									v=9;
+								
+									return '<a href="carpublic?carNo='+value+'&appType='+v+'&operState=-1'+'&plateType='+row.plateType+'&fixCarNo='+row.fixCarNo+'&fillTimes='+row.fillTime1+'" target="_blank">'+value+'</a>';
+								}else
+								if(row.appType.indexOf("营转非")!=-1) {v=6;}
+								return '<a href="machineDetailfill?carNo='+value+'&appType='+v+'&operState=-1'+'&plateType='+row.plateType+'&fixCarNo='+row.fixCarNo+'&fillTimes='+row.fillTime1+'" target="_blank">'+value+'</a>';
+							}
+							return value;
+							
+						}},
+						{field:'plateTypeName',align:'left',title:'车牌类型',width:'120px',rowspan:'2'},
+						{field:'appType',align:'left',title:'应用类型',width:'120px',rowspan:'2'},
+						
+						{field:'cylinderNum',align:'left',title:'气瓶数量',width:'120px',rowspan:'2'},
+						{field:'regNo',align:'left',title:'使用登记证',width:'120px',rowspan:'2'},
+						{field:'nowNumber',align:'left',title:'已充装次数',width:'120px',rowspan:'2'},
+						
+						/* {field:'fillcheckstr',align:'left',title:'已充装次数',width:'120px',rowspan:'2',hidden:true}, */
+						
+						{field:'endTime1',align:'left',title:'结束时间',width:160,rowspan:'2'},
+						{field:'lowPress',align:'left',title:'充装前压',width:'120px',rowspan:'2',formatter: function(value, row, index){
+							return parseFloat(value).toFixed(2);	
+						}},
+						{field:'highPress',align:'left',title:'充装后压',width:'120px',rowspan:'2',formatter: function(value, row, index){
+							return parseFloat(value).toFixed(2);	
+						}},
+						{field:'flux',align:'left',title:'流量',width:'120px',rowspan:'2',formatter: function(value, row, index){
+							return parseFloat(value).toFixed(2);	
+						}},
+						{field:'money',align:'left',title:'金额(元)',width:'120px',rowspan:'2',formatter: function(value, row, index){
+							return parseFloat(value).toFixed(2);	
+						}},
+						
+						{"title":"充装前检查",align:'left',"colspan":6},
+						{"title":"充装中检查",align:'left',"colspan":3},
+						{"title":"充装后检查",align:'left',"colspan":3},
+						
+					],
+					[
+						{"field":"taskNo1",align:'left',"title":'附件齐全'+"<br/>"+'符合安全'+"<br/>"+'要求',"rowspan":1,"colspan":1},
+						{"field":"taskNo2",align:'left',"title":'瓶内有余'+"<br/>"+'压(首次充'+"<br/>"+'装已置换)',"rowspan":1,"colspan":1},
+						{"field":"taskNo3",align:'left',"title":'外观完好、无缺陷('+"<br/>"+'裂纹、腐蚀、'+"<br/>"+'变形等)、安装稳定',"rowspan":1,"colspan":1},
+						{"field":"taskNo4",align:'left',"title":'无私改'+"<br/>"+'符合规定',"rowspan":1,"colspan":1},
+						{"field":"taskNo5",align:'left',"title":'无漏气、'+"<br/>"+'漏电、'+"<br/>"+'漏油现象',"rowspan":1,"colspan":1},
+						{"field":"taskNo6",align:'left',"title":'电子标签与车辆'+"<br/>"+'信息相符并贴于瓶'+"<br/>"+'体上(判定标签除外)',"rowspan":1,"colspan":1},
+						
+						{"field":"taskNo10",align:'left',"title":'压力',"rowspan":1,"colspan":1},
+						{"field":"taskNo11",align:'left',"title":'温度',"rowspan":1,"colspan":1},
+						{"field":"taskNo12",align:'left',"title":'外观完整性',"rowspan":1,"colspan":1},
+						
+						{"field":"taskNo7",align:'left',"title":'瓶内压力'+"<br/>"+'在规定范'+"<br/>"+'围内',"rowspan":1,"colspan":1},
+						{"field":"taskNo8",align:'left',"title":'附件连接'+"<br/>"+'可靠、密封'+"<br/>"+'完好',"rowspan":1,"colspan":1},
+						{"field":"taskNo9",align:'left',"title":'无鼓包、变'+"<br/>"+'形、泄露等'+"<br/>"+'异常现象',"rowspan":1,"colspan":1},
+					 ]
+					
+					
+					]
+				});	
+				if(ssid.substring(0, 2)!="51"){
+					$('#tt').datagrid('hideColumn','lowPress');
+					$('#tt').datagrid('hideColumn','highPress');
+					$('#tt').datagrid('hideColumn','flux');
+					$('#tt').datagrid('hideColumn','money');
+				}
+				
+			
+				
+				
+		}
+		function fLoadData(page,rows){
+		if(!$('#station option:selected').text()){
+			return false;
+		}
+			    $.messager.progress({ 
+			        title: '请等待', 
+			        msg: '正在加载数据...', 
+			        text: '查询中.......' 
+			    }); 
+				$.ajax({
+					type:"POST",
+					contentType: "application/x-www-form-urlencoded; charset=UTF-8",
+					data:$('#fillingform').serialize(),
+					url:"ajax/fillingDataQuery?page="+page+"&psize="+rows,
+					success:function (data){
+							$.messager.progress('close'); 
+							var vData = $.parseJSON(data);
+							sum = vData.total;
+							
+						if(sum==0){
+								show("没有查询到相关信息!!!");
+							}
+							totalpage = Math.ceil(sum/rows);
+							
+							$('#tt').datagrid('loadData', vData); //将数据绑定到datagrid   
+							
+							var p = $('#tt').datagrid('getPager'); 
+							$(p).pagination({ 
+						        pageList: [10,20,30,100,200,400],//可以设置每页记录条数的列表 
+						        beforePageText: '第',//页数文本框前显示的汉字 
+						        afterPageText: '页    共 {pages} 页', 
+						        displayMsg: '当前显示 {from} - {to} 条记录   共 {total} 条记录', 
+								onSelectPage: function (pageNumber, pageSize) { 
+					                fLoadData(pageNumber, pageSize); 
+           						 } 
+							
+							});
+ 
+											}
+				});
+	
+			
+		}
+		
+		function selectCountry(){
+			var id=document.getElementById("city").value;
+			var select = document.getElementById("country");
+			for(var i=select.options.length-1;i>=0;i--) {
+				select.options.remove(i);
+			}
+			$.ajax({
+					type:"POST",
+					contentType: "application/x-www-form-urlencoded; charset=UTF-8",
+					url:"ajax/hiddenCity?cityId="+id,
+					success:function (data){
+						var obj=eval("(" + data + ")");
+						if(obj.rows.length==1){
+						select.options.add(new Option("请选择县", ""));
+						}
+						$.each(obj.rows, function(i,item){      
+							select.options.add(new Option(item.name, item.id));
+  						});
+						      
+							
+					}
+			});
+		}
+		
+		function selectCountry1(){
+				selectCountry();
+				selectstation();
+		}
+		
+	function changeSize(){
+		fLoadData(1,10);
+	}
+	
+	function selectstation(){
+	var ii=1;
+			var id=document.getElementById("country").value;
+			var select = document.getElementById("station");
+			for(var i=select.options.length-1;i>=0;i--) {
+				select.options.remove(i);
+			}
+			$.ajax({
+					type:"POST",
+					contentType: "application/x-www-form-urlencoded; charset=UTF-8",
+					data:$('#fillingform').serialize(),
+					//url:"ajax/hiddenCNGStation?cityId="+id,
+					url:"ajax/hiddenspeStation?type=2",
+					success:function (data){
+						var obj=eval("(" + data + ")");
+						select.options.add(new Option("全部", ""));
+						$.each(obj.rows, function(i,item){  
+						     
+							select.options.add(new Option(item.name, item.id));
+  						});
+						      
+							
+					}
+			});
+	}
+	function selectstation1(){
+	selectstation();
+	//changeSize();
+	}
+	
+	function selectjqjandop(){
+		selectjqj();
+		selectoperatorNo();
+	}
+	function selectjqj(){
+		var ii=1;
+		var id=document.getElementById("station").value;
+		
+		 var options = $("#station option:selected");
+		 var stationName = options.text();
+		var select = document.getElementById("jqj");
+		
+		var select0817 = document.getElementById("jqj_0817");
+		var select08171 = document.getElementById("jqj_08171");
+		for(var i=select.options.length-1;i>=0;i--) {
+			select.options.remove(i);
+		}
+		for(var i=select0817.options.length-1;i>=0;i--) {
+			select0817.options.remove(i);
+		}
+		for(var i=select08171.options.length-1;i>=0;i--) {
+			select08171.options.remove(i);
+		}
+		$.ajax({
+				type:"POST",
+				contentType: "application/x-www-form-urlencoded; charset=UTF-8",
+				url:"ajax/hiddenjqj?stationId="+id,
+				success:function (data){
+					var obj=eval("(" + data + ")");
+					select.options.add(new Option("全部", ""));
+					$.each(obj.rows, function(i,item){   
+						select.options.add(new Option(item.manu+item.type, item.machineNo));
+						select0817.options.add(new Option(item.manu+item.type, item.machineNo));
+						select08171.options.add(new Option(item.manu+item.type, item.machineNo));
+						});
+					      
+					$('#btnadd').linkbutton('enable');
+					
+					document.getElementById("stationId0817").value=id;
+					document.getElementById("stationName0817").innerText=stationName;
+					document.getElementById("stationName08171").innerText=stationName;
+				}
+		});
+	}
+	var oper="";
+	var username = '<%=username %>';
+	var opers=[];
+	function selectoperatorNo(){
+		var ii=1;
+		var id=document.getElementById("station").value;
+		var select = document.getElementById("operatorNo");
+		var fillCheckNo1 = document.getElementById("fillCheckNo1");
+		var fillCheckNo2 = document.getElementById("fillCheckNo2");
+		for(var i=select.options.length-1;i>=0;i--) {
+			select.options.remove(i);
+		}
+		for(var i=fillCheckNo1.options.length-1;i>=0;i--) {
+			fillCheckNo1.options.remove(i);
+		}
+		for(var i=fillCheckNo2.options.length-1;i>=0;i--) {
+			fillCheckNo2.options.remove(i);
+		}
+		$.ajax({
+				type:"POST",
+				contentType: "application/x-www-form-urlencoded; charset=UTF-8",
+				url:"ajax/hiddenoperatorNo?stationId="+id,
+				success:function (data){
+					var obj=eval("(" + data + ")");
+					select.options.add(new Option("全部", ""));
+					fillCheckNo1.options.add(new Option("无", ""));
+					fillCheckNo2.options.add(new Option("无", ""));
+					$.each(obj.rows, function(i,item){   
+						select.options.add(new Option(item.name, item.operatorNo));
+						fillCheckNo1.options.add(new Option(item.name, item.operatorNo));
+						fillCheckNo2.options.add(new Option(item.name, item.operatorNo));
+						if(item.name!=username){
+							oper = item.name;
+							opers.push(item.name);
+							
+						}
+						
+						});
+					$('#btnadd1').linkbutton('enable');     
+					document.getElementById("stationId08171").value=id;
+						
+				}
+		});
+	}
+	function expt1(){
+		expt(grid);
+	}
+	function exptSingle(){
+		if(!grid){
+			alert("数据为空");
+			return false;
+		}else{
+			expt(grid);
+		}
+		
+	}
+	function exptAll(){
+		fLoadDataAll(1,5000);
+	}
+	
+	function fLoadDataAll(page,rows){
+				var startTime1 = $('#startTime').datebox('getValue');
+				var endTime1 = $('#endTime').datebox('getValue');
+			
+			
+				document.getElementById("pageNumber").innerText = i;
+				document.getElementById("from").innerText = (page-1)*rows;
+				document.getElementById("to").innerText = page*rows;
+			    $.messager.progress({ 
+			        title: '请等待', 
+			        msg: '正在加载数据...', 
+			        text: '查询中.......' 
+			    }); 
+				$.ajax({
+					type:"POST",
+					contentType: "application/x-www-form-urlencoded; charset=UTF-8",
+					data:$('#fillingform').serialize(),
+					url:"ajax/fillingDataQuery?page="+page+"&psize="+rows,
+					success:function (data){
+							$.messager.progress('close'); 
+							var vData = $.parseJSON(data);
+							sum = vData.total;
+							
+if(sum==0){
+								show("没有查询到相关信息!!!");
+							}
+							totalpage = Math.ceil(sum/rows);
+							document.getElementById("total").innerText = sum;
+							document.getElementById("totalpage").innerText = totalpage;
+							var vData = $.parseJSON(data);
+							$('#tt').datagrid('loadData', vData); //将数据绑定到datagrid   
+							var p = $('#tt').datagrid('getPager'); 
+							$(p).pagination({ 
+						        pageList: [10,20,30,100,200,400],//可以设置每页记录条数的列表 
+						        beforePageText: '第',//页数文本框前显示的汉字 
+						        afterPageText: '页    共 {pages} 页', 
+						        displayMsg: '当前显示 {from} - {to} 条记录   共 {total} 条记录', 
+								onSelectPage: function (pageNumber, pageSize) { 
+					                fLoadData(pageNumber, pageSize); 
+           						 } 
+							
+							});
+							
+							if(!grid){
+			alert("数据为空");
+			return false;
+		}else{
+			expt(grid);
+		}
+											}
+				});
+	
+			
+		}
+		
+				function selectpage(){
+	var selectpage = $('#selectpage').val();
+	if(selectpage>=1&&selectpage<=totalpage){
+		i = selectpage;
+		$("#selectpage").val("");
+		pageSize = $('#pageSize').val();
+		fLoadData(i,pageSize);
+	}else{
+		$("#selectpage").val("");
+		return false;
+	}
+}
+function selectjqjandop22(){
+	selectjqjandop();
+	//changeSize();
+}
+function selectoperatorNo22(){
+	//selectoperatorNo();
+	//changeSize();
+}
+function add(){
+	$("#add").dialog("open").dialog('setTitle', '设置加气机状态');
+	$("#add").panel("move",{top:$(document).scrollTop() + ($(window).height()-150) * 0.5}); 
+}
+function add1(){
+	$("#add1").dialog("open").dialog('setTitle', '设置检查人员');
+	$("#add1").panel("move",{top:$(document).scrollTop() + ($(window).height()-150) * 0.5}); 
+}
+
+function save(){
+	$.messager.progress({ 
+        title: '请等待', 
+        msg: '正在提交数据...', 
+        text: '提交中.......' 
+    }); 
+	$("#addfm").form("submit", {
+            url: "ajax/updateMachine",
+            onsubmit: function () {
+                return $(this).form("validate");
+            },
+            success:function (data){
+						$.messager.progress('close');
+						var vData = $.parseJSON(data);
+						var result = vData.result;
+						if(result==0){
+							show("设置失败!");
+						}else{
+							show("设置成功!");
+							$('#add').dialog('close');
+						}
+                        
+		},
+		error:function(XMLHttpRequest,textStatus, errorThrown) {
+				$.messager.progress('close');
+		 				
+		}
+    });
+    
+}
+
+function save1(){
+	$.messager.progress({ 
+        title: '请等待', 
+        msg: '正在提交数据...', 
+        text: '提交中.......' 
+    }); 
+	$("#add1fm").form("submit", {
+            url: "ajax/updateFillCheckOper",
+            onsubmit: function () {
+                return $(this).form("validate");
+            },
+            success:function (data){
+						$.messager.progress('close');
+						var vData = $.parseJSON(data);
+						var result = vData.result;
+						if(result==0){
+							show("设置失败!");
+						}else{
+							show("设置成功!");
+							$('#add1').dialog('close');
+						}
+                        
+		},
+		error:function(XMLHttpRequest,textStatus, errorThrown) {
+				$.messager.progress('close');
+		 				
+		}
+    });
+    
+}
+
+//判断字符是否为空的方法
+function isEmpty(obj){
+    if(typeof obj == "undefined" || obj == null || obj == ""){
+        return true;
+    }else{
+        return false;
+    }
+}
+
+function compareDate(date1,date2){
+    var oDate1 = new Date(date1);
+    var oDate2 = new Date(date2);
+    if(oDate1.getTime() > oDate2.getTime()){
+        return true; //第一个大
+    } else {
+        return false; //第二个大
+    }
+}
+	</script>
+	
+  </head>
+  
+  <body>
+    <!-- 查询结果:数据表格 -->
+  	<table id="tt"  cellspacing="0" cellpadding="0" >
+	</table>
+	<div id="toolbar" style="padding-top: 0px;height: auto;">
+	
+  		 <form id="fillingform" action="ajax/filling" method="post">
+			<input type="text" name="fillCheck2" id="fillCheck2"   style="width: 150px;height: 34px;display: none;"  class="hzbspan" value="-1">
+			<table>
+			<tr>
+				<td>
+					<span class="hzbspan">省:</span>
+				</td>
+				<td>
+					<select  name="province" style="width: 150px;height: 34px;min-width: 100px;" class="hzbspan select">
+						<%for(AuthorityRegionPlace arp:arplist){
+							cplist = arp.getCityPlace();
+						 %>
+							<option value="<%=arp.getId() %>">
+								<%=arp.getName() %>
+							</option>
+						<%} %>
+					</select>
+				</td>
+				<td>
+					<span class="hzbspan">市:</span>
+				</td>
+				<td>
+					<select  name="city" id="city" style="width: 150px;height: 34px;min-width: 100px;" class="hzbspan select" onchange="selectCountry1()">
+				
+						<%
+							
+							for(CityPlace cp:cplist){
+							cyplist = cp.getSubPlaceList();
+						%>		
+							
+							<option value="<%=cp.getId() %>">
+								<%=cp.getName() %>
+							</option>
+							
+						 
+						<%} %>
+					</select>
+				</td>
+				<td>
+					<span class="hzbspan">县:</span>
+				</td>
+				<td>
+					<select  name="country" id = "country" style="width: 150px;height: 34px;min-width: 100px;" class="hzbspan select"  onchange="selectstation1();" >
+						<option value="">全部</option>
+					</select>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<span class="hzbspan">充装站点:</span>
+				</td>
+				<td>
+					<select  name="station" id ="station" style="width: 150px;height: 34px;min-width: 100px;" class="hzbspan select"  onchange="selectjqjandop22();" >
+						<option value="">全部</option>
+					</select>
+				</td>
+				<td>
+					<span class="hzbspan">加气机:</span>
+				</td>
+				<td>
+					<select  name="jqj" id ="jqj" style="width: 150px;height: 34px;min-width: 100px;" class="hzbspan select"  onchange="selectoperatorNo22();" >
+						<option value="">全部</option>
+					</select>
+				</td>
+			
+			</tr>
+			<tr>
+			<td>
+			<span  style="cursor: default"><span class="hzbspan">应用类型:</span></span></td>
+			<td><select  name="appType" id="appType" style="width: 150px;height: 34px;" class="hzbspan select" >
+						<option value="-1" selected="selected">全部</option>
+					<option value="0">其他</option>
+					<option value="1">出租</option>
+					<option value="2">公交</option>
+					<option value="3">私用</option>
+					<option value="4">货运</option>
+					<option value="5">客运</option>
+					<option value="6">营转非</option>
+					<option value="9">外地车</option>
+				</select>
+				</td>
+			<td>
+			<span  style="cursor: default"><span class="hzbspan">开始时间:</span></span></td>
+			<td><input type="text" name="startTime" id="startTime" class="easyui-datebox"  style="width: 150px;height: 34px;"  class="hzbspan" data-options="prompt:'-   -   -   -   -   -   -'">
+			
+			</td>
+			<td>
+			<span  style="cursor: default"><span class="hzbspan">气枪编号:</span></span></td>
+			<td><input type="text" name="gunNo" id="gunNo"   style="width: 150px;height: 34px;"  class="hzbspan" placeholder="-   -   -   -   -   -   -">
+			</td>
+			<td><span  style="cursor: default"><span class="hzbspan">操作员:</span></span></td>
+			<td><select  name="operatorNo" id ="operatorNo" style="width: 150px;height: 34px;min-width: 100px;" class="hzbspan select" >
+				<option value="">全部</option>
+			</select>
+			</td>
+			</tr>
+			
+			<tr><td>
+			<span  style="cursor: default"><span class="hzbspan">充装状态:</span></span></td>
+			<td><select  name="fillState" id="fillState" style="width: 150px;height: 34px;" class="hzbspan select" >
+					<option value="-1" selected="selected">全部</option>
+					<option value="0">成功充装</option>
+					<option value="1">灰名单允许</option>
+					<option value="2">灰名单不允许</option>
+					<option value="3">黑名单不充装</option>
+					<option value="4">检验未通过</option>
+					<option value="5">超期未检</option>
+					<option value="6">使用年限超出</option>
+					<option value="7">次数不足</option>
+					<option value="8">当天次数不足</option>
+					<option value="9">站点不匹配</option>
+					<option value="10">加气机不匹配</option>
+					<option value="11">加气枪不匹配</option>
+					<option value="21">充前异常</option>
+					<option value="31">充后异常</option>
+					<!-- 
+					<option value="21">充前异常 检查内容-附件齐全符合安全要求</option>
+					
+					<option value="22">充前异常 检查内容-瓶内有余压(首次充装已置换)</option>
+					<option value="23">充前异常 检查内容-外观完好、无缺陷(裂纹、腐蚀、变形等)、安装稳定</option>
+					<option value="24">充前异常 检查内容-无私改符合规定</option>
+					<option value="25">充前异常 检查内容-无漏气、漏电、漏油现象</option>
+					<option value="26">充前异常 检查内容-电子标签与车辆信息相符并粘贴于瓶体上(判定标签除外)</option>
+					<option value="31">充后异常 检查内容-瓶内压力在规定范围内</option>
+					<option value="32">充后异常 检查内容-附件连接可靠、密封完好</option>
+					<option value="33">充后异常 检查内容-无鼓包、变形、泄漏等异常现象</option>
+					 -->
+					
+				</select></td>
+			<td>
+			<span  style="cursor: default"><span class="hzbspan">结束时间:</span></span></td>
+			<td><input type="text" name="endTime" id="endTime" class="easyui-datebox" style="width: 150px;height: 34px;"  class="hzbspan" data-options="prompt:'-   -   -   -   -   -   -'">
+			</td>
+			<td><span  style="cursor: default"><span class="hzbspan">车牌号:</span></span></td>
+			<td><input type="text" name="carNo" id="carNo"  style="width: 150px;height: 34px;"  class="hzbspan" placeholder="-   -   -   -   -   -   -">
+			
+			</td>
+			
+			<td>
+				
+				
+				<span class="hzbspan">充装介质:</span></td>
+				<td>
+				<select  name="cylinderType" id="cylinderType" style="width: 150px;height: 34px;" class="hzbspan select"  >
+					<option value="-1">全部</option>
+  						<option value="0">CNG-高压气体</option>
+  						<option value="1">LNG-低温液化天然气</option>
+				</select>
+			
+			
+			</td>
+			
+		</tr>
+		<tr>
+		<td colspan="5">
+			<a id="btninfosearch" onclick="changeSize();" class="easyui-linkbutton" icon="icon-search" href="javascript:void(0)" style="margin-bottom:  5px;" ><span class="hzbspan" style="color: #f08300;font-size: 16px;">查询</span></a> 
+			
+			<a id="btninfosearch" onclick="exptSingle();" class="easyui-linkbutton" icon="icon-export" href="javascript:void(0)" style="margin-bottom:  5px;" ><span class="hzbspan" style="color: #f08300;font-size: 16px;">导出</span></a> 
+			<div style="display: none;">
+			<a id="btnadd" onclick="add();" class="easyui-linkbutton" icon="icon-config" href="javascript:void(0)" style="margin-bottom:  5px;" ><span class="hzbspan" style="color: #f08300;font-size: 16px;">设置加气机状态</span></a> 
+			<a id="btnadd1" onclick="add1();" class="easyui-linkbutton" icon="icon-config" href="javascript:void(0)" style="margin-bottom:  5px;" ><span class="hzbspan" style="color: #f08300;font-size: 16px;">设置检查人员</span></a> 
+			</div>
+		</td>
+		</tr>
+		</table>
+		</form>	
+	</div>
+	<div id="dialog2"></div> 
+	
+	<div id="add" class="easyui-dialog" style="width: 440px; height: 280px; padding: 10px 40px;"  shadow="false"  closed="true" modal="true" buttons="#dlg-buttons">
+       <form id="addfm" method="post">
+       		<input name="stationNo" id="stationId0817" type="text"  style="display: none;"/>
+       		<div class="fitem">
+	       		<label> 站点:</label>
+	           <span id="stationName0817"></span>	 
+			</div>
+	       	<div class="fitem">
+	       		<label> 加气机:</label>
+	           <select  name="machineNo" id="jqj_0817" style="width: 200px;height: 34px;" class="hzbspan"  >
+				</select>  	 
+			</div>	 
+			<div class="fitem">
+	           <label>加气机状态:</label>
+	           <select  name="machineState" id="jqjState" style="width: 200px;height: 34px;" class="hzbspan"  >
+					<option value="0">在用</option>
+					<option value="1">可用</option>
+					<option value="2">检修</option>
+				</select>
+	       	</div>
+       </form>
+ 	<div id="dlg-buttons">
+        <a href="javascript:void(0)" class="easyui-linkbutton" onclick="save()" iconcls="icon-add">保存</a>
+        <a href="javascript:void(0)" class="easyui-linkbutton" onclick="javascript:$('#add').dialog('close')"
+            iconcls="icon-cancel">关闭</a>
+    </div> 
+    </div>
+    
+    <div id="add1" class="easyui-dialog" style="width: 440px; height: 280px; padding: 10px 40px;"  shadow="false"  closed="true" modal="true" buttons="#dlg1-buttons">
+       <form id="add1fm" method="post">
+       		<input name="stationNo" id="stationId08171" type="text" style="display: none;" />
+       		<div class="fitem">
+	       		<label> 站点:</label>
+	           <span id="stationName08171"></span>	 
+			</div>
+	       	<div class="fitem">
+	       		<label> 加气机:</label>
+	           <select  name="machineNo" id="jqj_08171" style="width: 200px;height: 34px;" class="hzbspan"  >
+				</select>  	 
+			</div>	 
+			<div class="fitem">
+	           <label>充前检查人员:</label>
+	           <select  name="fillCheckNo1" id="fillCheckNo1" style="width: 200px;height: 34px;" class="hzbspan"  >
+				</select>
+	       	</div>
+	       	<div class="fitem">
+	           <label>充后检查人员:</label>
+	           <select  name="fillCheckNo2" id="fillCheckNo2" style="width: 200px;height: 34px;" class="hzbspan"  >
+				</select>
+	       	</div>
+       </form>
+ 	<div id="dlg1-buttons">
+        <a href="javascript:void(0)" class="easyui-linkbutton" onclick="save1()" iconcls="icon-add">保存</a>
+        <a href="javascript:void(0)" class="easyui-linkbutton" onclick="javascript:$('#add1').dialog('close')"
+            iconcls="icon-cancel">关闭</a>
+    </div> 
+    </div>
+  </body>
+</html>

+ 19 - 154
WebRoot/jsp/rzx/dataQuery/FillingdataQueryNew.jsp

@@ -116,7 +116,6 @@ function show(message) {
                          }},
 						{field:'operatorName',align:'left',title:'操作员',width:'120px',rowspan:'2'},
 						{field:'operatorNameType',align:'left',title:'充装人员种类',width:'120px',rowspan:'2',formatter: function(value, row, index){
-							
 	    					return "车用气瓶充装";	
 						}},
  						{field:'fillState',align:'left',title:'充装状态',width:'120px',rowspan:'2',formatter: function(value, row, index){
@@ -126,11 +125,6 @@ function show(message) {
 	    					return value;	
 						}},
  						{field:'fillTime1',align:'left',title:'充装时间',width:160,rowspan:'2'},
- 						
-						
-						
-						
-						
 						{field:'carNo',align:'left',title:'车牌号',width:'120px',rowspan:'2',formatter: function(value, row, index){
 							if(value){
 								var v=0;
@@ -155,168 +149,39 @@ function show(message) {
 						{field:'nowNumber',align:'left',title:'已充装次数',width:'120px',rowspan:'2'},
 						{field:'fillcheckstr',align:'left',title:'已充装次数',width:'120px',rowspan:'2',hidden:true},
 						{"title":"充装前检查",align:'left',"colspan":6},
+						{"title":"充装中检查",align:'left',"colspan":3},
 						{"title":"充装后检查",align:'left',"colspan":3},
 						{field:'endTime1',align:'left',title:'结束时间',width:160,rowspan:'2'},
 						{field:'lowPress',align:'left',title:'充装前压',width:'120px',rowspan:'2',formatter: function(value, row, index){
-							
-	    					return value;	
+							return parseFloat(value).toFixed(2);	
 						}},
 						{field:'highPress',align:'left',title:'充装后压',width:'120px',rowspan:'2',formatter: function(value, row, index){
-							
-	    					return value;	
+							return parseFloat(value).toFixed(2);	
 						}},
 						{field:'flux',align:'left',title:'流量',width:'120px',rowspan:'2',formatter: function(value, row, index){
-							
-	    					return value;	
+							return parseFloat(value).toFixed(2);	
 						}},
 						{field:'money',align:'left',title:'金额(元)',width:'120px',rowspan:'2',formatter: function(value, row, index){
-							
-	    					return value;	
+							return parseFloat(value).toFixed(2);	
 						}}
 						
 					],
 					[
 					 
-{"field":"taskNo",align:'left',"title":'附件齐全'+"<br/>"+'符合安全'+"<br/>"+'要求',"rowspan":1,formatter: function(value, row, index){
-	var v=row.fillcheckstr;
-	if(v!=null&&v!=""&&v!=undefined&&(row.fillStateNum<=0||row.fillStateNum>=21)){
-		var str="✔";
-		if(v.substring(v.length-1,v.length)=="1"){
-			str="×";
-		}
-		if(row.fillStateNum=="31"){
-			str="✔";
-		}
-		return str;
-	}
-	
-}},
-{"field":"taskNo1",align:'left',"title":'瓶内有余'+"<br/>"+'压(首次充'+"<br/>"+'装已置换)',"rowspan":1,formatter: function(value, row, index){
-	var v=row.fillcheckstr;
-	if(v!=null&&v!=""&&v!=undefined&&(row.fillStateNum<=0||row.fillStateNum>=21)){
-		var str="✔";
-		if(v.substring(v.length-2,v.length-1)=="1"){
-			str="×";
-		}
-		if(row.fillStateNum=="31"){
-			str="✔";
-		}
-		return str;
-	}
-}},
-{"field":"taskNo2",align:'left',"title":'外观完好、无缺陷('+"<br/>"+'裂纹、腐蚀、'+"<br/>"+'变形等)、安装稳定',"rowspan":1,formatter: function(value, row, index){
-	var v=row.fillcheckstr;
-	if(v!=null&&v!=""&&v!=undefined&&(row.fillStateNum<=0||row.fillStateNum>=21)){
-		var str="✔";
-		if(v.substring(v.length-3,v.length-2)=="1"){
-			str="×";
-		}
-		if(row.fillStateNum=="31"){
-			str="✔";
-		}
-		return str;
-	}
-}},
-{"field":"taskNo3",align:'left',"title":'无私改'+"<br/>"+'符合规定',"rowspan":1,formatter: function(value, row, index){
-	var v=row.fillcheckstr;
-	if(v!=null&&v!=""&&v!=undefined&&(row.fillStateNum<=0||row.fillStateNum>=21)){
-		var str="✔";
-		if(v.substring(v.length-4,v.length-3)=="1"){
-			str="×";
-		}
-		if(row.fillStateNum=="31"){
-			str="✔";
-		}
-		return str;
-	}
-}},
-{"field":"taskNo4",align:'left',"title":'无漏气、'+"<br/>"+'漏电、'+"<br/>"+'漏油现象',"rowspan":1,formatter: function(value, row, index){
-	var v=row.fillcheckstr;
-	if(v!=null&&v!=""&&v!=undefined&&(row.fillStateNum<=0||row.fillStateNum>=21)){
-		var str="✔";
-		if(v.substring(v.length-5,v.length-4)=="1"){
-			str="×";
-		}
-		if(row.fillStateNum=="31"){
-			str="✔";
-		}
-		return str;
-	}
-}},
-{"field":"taskNo5",align:'left',"title":'电子标签与车辆'+"<br/>"+'信息相符并贴于瓶'+"<br/>"+'体上(判定标签除外)',"rowspan":1,formatter: function(value, row, index){
-	var v=row.fillcheckstr;
-	if(v!=null&&v!=""&&v!=undefined&&(row.fillStateNum<=0||row.fillStateNum>=21)){
-		var str="✔";
-		if(v.substring(v.length-6,v.length-5)=="1"){
-			str="×";
-		}
-		if(row.fillStateNum=="31"){
-			str="✔";
-		}
-		return str;
-	}
-}},
-
-{"field":"taskNo6",align:'left',"title":'瓶内压力'+"<br/>"+'在规定范'+"<br/>"+'围内',"rowspan":1,formatter: function(value, row, index){
-	if(row.fillStateNum<=0||row.fillStateNum>21){
-		if(
-				(row.endTime1&&row.fillTime1&&(row.endTime1>=row.fillTime1))
-				||
-				(row.fillStateNum&&row.fillStateNum=="31")
-		){
-			
-			var v=row.fillcheckstr;
-			if(v!=null&&v!=""&&v!=undefined){
-				var str="✔";
-				if(v.substring(v.length-1,v.length)=="1"){
-					str="×";
-				}
-				return str;
-			}
-		}
-	}
-	
-}},
-{"field":"taskNo7",align:'left',"title":'附件连接'+"<br/>"+'可靠、密封'+"<br/>"+'完好',"rowspan":1,formatter: function(value, row, index){
-if(row.fillStateNum<=0||row.fillStateNum>21){
-	if(
-			(row.endTime1&&row.fillTime1&&(row.endTime1>=row.fillTime1))
-			||
-			(row.fillStateNum&&row.fillStateNum=="31")
-	){
-		
-		var v=row.fillcheckstr;
-		if(v!=null&&v!=""&&v!=undefined){
-			var str="✔";
-			if(v.substring(v.length-2,v.length-1)=="1"){
-				str="×";
-			}
-			return str;
-		}
-	}
-	}
-	
-}},
-{"field":"taskNo8",align:'left',"title":'无鼓包、变'+"<br/>"+'形、泄露等'+"<br/>"+'异常现象',"rowspan":1,formatter: function(value, row, index){
-if(row.fillStateNum<=0||row.fillStateNum>21){
-	if(
-			(row.endTime1&&row.fillTime1&&(row.endTime1>=row.fillTime1))
-			||
-			(row.fillStateNum&&row.fillStateNum=="31")
-	){
-		
-		var v=row.fillcheckstr;
-		if(v!=null&&v!=""&&v!=undefined){
-			var str="✔";
-			if(v.substring(v.length-3,v.length-2)=="1"){
-				str="×";
-			}
-			return str;
-		}
-	}
-	}
-	
-}},
+						{"field":"taskNo",align:'left',"title":'附件齐全'+"<br/>"+'符合安全'+"<br/>"+'要求',"rowspan":1},
+						{"field":"taskNo1",align:'left',"title":'瓶内有余'+"<br/>"+'压(首次充'+"<br/>"+'装已置换)',"rowspan":1},
+						{"field":"taskNo2",align:'left',"title":'外观完好、无缺陷('+"<br/>"+'裂纹、腐蚀、'+"<br/>"+'变形等)、安装稳定',"rowspan":1},
+						{"field":"taskNo3",align:'left',"title":'无私改'+"<br/>"+'符合规定',"rowspan":1},
+						{"field":"taskNo4",align:'left',"title":'无漏气、'+"<br/>"+'漏电、'+"<br/>"+'漏油现象',"rowspan":1},
+						{"field":"taskNo5",align:'left',"title":'电子标签与车辆'+"<br/>"+'信息相符并贴于瓶'+"<br/>"+'体上(判定标签除外)',"rowspan":1},
+						
+						{"field":"taskNo10",align:'left',"title":'压力',"rowspan":1,"colspan":1},
+						{"field":"taskNo11",align:'left',"title":'温度',"rowspan":1,"colspan":1},
+						{"field":"taskNo12",align:'left',"title":'外观完整性',"rowspan":1,"colspan":1},
+						
+						{"field":"taskNo6",align:'left',"title":'瓶内压力'+"<br/>"+'在规定范'+"<br/>"+'围内',"rowspan":1},
+						{"field":"taskNo7",align:'left',"title":'附件连接'+"<br/>"+'可靠、密封'+"<br/>"+'完好',"rowspan":1},
+						{"field":"taskNo8",align:'left',"title":'无鼓包、变'+"<br/>"+'形、泄露等'+"<br/>"+'异常现象',"rowspan":1},
 
 					 ]
 					

+ 945 - 908
WebRoot/jsp/rzx/dataQuery/FillingdataQueryfilling.jsp

@@ -1,908 +1,945 @@
-<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%>
-
-<%@ page import="com.runzhixing.bean.CityPlace" %>
-<%@ page import="com.runzhixing.bean.CountryPlace" %>
-<%@ page import="com.runzhixing.bean.Station" %>
-<%@ page import="com.runzhixing.bean.AuthorityRegionPlace" %>
-<%@ page import="com.runzhixing.bean.User" %>
-<%@ page import="com.runzhixing.tool.Util" %>
-<%@ page import="com.runzhixing.constant.Constant" %>
-<%
-String path = request.getContextPath();
-String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
-String username = (String) session.getAttribute("username");
-
-User user = (User)session.getAttribute(Constant.userMark); 
-List<AuthorityRegionPlace> arplist = user.getPrivilegePlaces1();
-
-List<CityPlace> cplist = new ArrayList<CityPlace>();
-List<CountryPlace> cyplist = new ArrayList<CountryPlace>();
-List<Station> slist = new ArrayList<Station>();
-String ssid = (String) session.getAttribute(Constant.Privilege);
-%>
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-  <head>
-    <base href="<%=basePath%>">
-    
-    <title>充装数据查询</title>
-    
-	<meta http-equiv="pragma" content="no-cache">
-	<meta http-equiv="cache-control" content="no-cache">
-	<meta http-equiv="expires" content="0">    
-	<meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
-	<meta http-equiv="description" content="This is my page">
-	<meta http-equiv="X-UA-Compatible" content="IE=9"/>
-	<meta http-equiv="X-UA-Compatible" content="IE=10"/>
-	<link rel="stylesheet" type="text/css" href="css/easyui/themes/default/easyui.css">
-	<link rel="stylesheet" type="text/css" href="css/easyui/themes/icon.css">
-	<link rel="stylesheet" type="text/css" href="css/easyui/demo/demo.css">
-	<script type="text/javascript" src="css/easyui/jquery.min.js"></script>
-	<script type="text/javascript" src="css/easyui/jquery.easyui.min.js"  charset="utf-8"></script>
-	<script type="text/javascript" src="css/easyui/locale/easyui-lang-zh_CN.js"  charset="utf-8"></script>
-	<link rel="stylesheet" type="text/css" href="css/common/hzbstyle.css">
-	<script type="text/javascript" src="js/easyui/export.js"></script>
-	<script type="text/javascript" src="js/common/area.js"></script>
-	<style type="text/css">
-    	.datagrid-header-row td{font-weight: bold;}
-		 #fm
-        {
-            margin: 0;
-            padding: 10px 30px;
-        }
-        .ftitle
-        {
-            font-size: 14px;
-            font-weight: bold;
-            padding: 5px 0;
-            margin-bottom: 10px;
-            border-bottom: 1px solid #ccc;
-        }
-        .fitem
-        {
-            margin-bottom: 5px;
-        }
-        .fitem label
-        {
-            display: inline-block;
-            width: 100px;
-        } 
-        .fitem123 label
-        {
-            display: inline-block;
-            width: 250px;
-        } 
-        
-	</style>
-	<style type="text/css">
-		 a:HOVER{
-			color: red;
-			text-decoration: none;
-		}
-		 a{
-			color: #f08300;
-			text-decoration: none;
-		}
-	</style>
-	
-	<script type="text/javascript">
-	var ssid = '<%=ssid %>';
-		var grid="";
-		var exportString="";
-		var i = 1;//第几页
-		var sum;//总条数
-		
-var pageSize =10;
-		var totalpage;//总页数
-		$(document).ready(function(){
-			
-			pageSize = $('#pageSize').val();
-			selectCountry();
-			selectstation();
-			selectjqjandop();
-			fLoadTable();
-			$('#btnadd').linkbutton('disable');
-			$('#btnadd1').linkbutton('disable');
-			//fLoadData(i,pageSize);
-			
-		});
-		
-function show(message) {  
-	            $.messager.show({  
-	                title: '提示信息',  
-	                msg: message,  
-	                timeout: 2000,  
-	                showType: 'slide'  
-	            });  
-	        }
-function fLoadTable(){
-	grid=$('#tt').datagrid({
-		  fit: true,//自动大小   
-			title: '',
-			width: '100%',
-			height: 580,
-			toolbar: '#toolbar',
-			fitColumns: true,
-			singleSelect:false,
-			loadMsg:'正在加载, 请稍等 …',
-      	nowrap : true,//设置为true,当数据长度超出列宽时将会自动截取
-      	striped : true,//设置为true将交替显示行背景
-			collapsible : false,//显示可折叠按钮
-			singleSelect:false,
-      	fitColumns:true,//允许表格自动缩放,以适应父容器
-      	rownumbers:true,
-      	pagination:true,//分页控件
-      
-			columns:[[
-{field:'stationName',align:'left',title:'充装站',width:'160px',rowspan:'2'},
-{field:'machineName',align:'left',title:'加气机',width:'120px',rowspan:'2'},
-{field:'gunNo',align:'left',title:'加气枪',width:'120px',rowspan:'2'},
-{field:'mediaType',align:'left',title:'充装介质',width:'140px',rowspan:'2'},
-{field:'operatorName',align:'left',title:'操作员',width:'120px',rowspan:'2',formatter: function(value, row, index){
-		if(value=="未知工作人员"){
-			return "";
-	}
-	
-	return value;
-}},
-{field:'operatorNameType',align:'left',title:'充装人员种类',width:'120px',rowspan:'2'},
-	{field:'fillState',align:'left',title:'充装状态',width:'120px',rowspan:'2',formatter: function(value, row, index){
-	if(value=="超期未检"){
-        return '<div  style="background-color: #f08300;">'+value+'</div>';
-        }
-	return value;	
-}},
-	{field:'fillTime1',align:'left',title:'充装时间',width:160,rowspan:'2'},
-	
-	{field:'FILLCHECKNName1',align:'left',title:'充前气瓶检查人员',width:140,rowspan:'2',formatter: function(value, row, index){
-		//FILLCHECKNO1如果为空时,用充装人员填充前操作员名字,否则用FILLCHECKNName1
-		if(isEmpty(row.FILLCHECKNNo1)){
-			if(isEmpty(row.operatorName)){
-				return '';
-			}else{
-				if(row.operatorName=="未知工作人员"){
-					return '';
-				}else{
-					return row.operatorName;
-				}
-			}
-		}else{
-			if(isEmpty(row.FILLCHECKNName1)){
-				return '';
-			}else{
-				if(row.FILLCHECKNName1=="未知工作人员"){
-					return '';
-				}else{
-					return row.FILLCHECKNName1;
-				}
-			}
-		}
-}},
-{field:'FILLCHECKNName2',align:'left',title:'充后气瓶检查人员',width:140,rowspan:'2',formatter: function(value, row, index){
-	//当充装状态为充前检验失败时,充后检查必须为空
-	if(row.fillStateNum==21){
-		return '';
-	}
-	//当充装状态为充装成功且充后人员FILLCHECKNO2为空时,充装时间等于充后时间,充后检查没上来,充后必须填空
-	else if(row.fillState=="成功充装"&&isEmpty(row.FILLCHECKNNo2)&&!isEmpty(row.fillTime1)&&!isEmpty(row.endTime1)&&row.fillTime1==row.endTime1){
-		return '';
-	}
-	//FILLCHECKNO2为空时,充装时间不等于充后时间,充后已经上来,用当前充装人员CngOperatorName填充
-	else if(isEmpty(row.FILLCHECKNNo2)&&!isEmpty(row.fillTime1)&&!isEmpty(row.endTime1)&&compareDate(row.endTime1, row.fillTime1)){
-		if(isEmpty(row.operatorName)){
-			return '';
-		}else{
-			if(row.operatorName=="未知工作人员"){
-				return '';
-			}else{
-				return row.operatorName;
-			}
-		}
-	}
-	//FILLCHECKNO2不为空,FILLCHECKNName2表示充后人员
-	else if(!isEmpty(row.FILLCHECKNNo2)){
-		if(row.FILLCHECKNName2=="未知工作人员"){
-			return '';
-		}else{
-			return row.FILLCHECKNName2;
-		}
-	}else{
-		return '';
-	}
-}},
-
-
-
-{field:'carNo',align:'left',title:'车牌号',width:'120px',rowspan:'2',formatter: function(value, row, index){
-	if(value){
-		var v=0;
-		if(row.appType.indexOf("其他")!=-1) {v=0;}else
-		if(row.appType.indexOf("出租")!=-1) {v=1;}else
-		if(row.appType.indexOf("公交")!=-1) {v=2;}else
-		if(row.appType.indexOf("私用")!=-1){v=3;}else
-		if(row.appType.indexOf("货运")!=-1){v=4;}else
-		if(row.appType.indexOf("客运")!=-1) {v=5;}else
-		if(row.appType.indexOf("外地车")!=-1) {
-			v=9;
-		
-			return '<a href="carpublic?carNo='+value+'&appType='+v+'&operState=-1'+'&plateType='+row.plateType+'&fixCarNo='+row.fixCarNo+'&fillTimes='+row.fillTime1+'" target="_blank">'+value+'</a>';
-		}else
-		if(row.appType.indexOf("营转非")!=-1) {v=6;}
-		return '<a href="machineDetailfill?carNo='+value+'&appType='+v+'&operState=-1'+'&plateType='+row.plateType+'&fixCarNo='+row.fixCarNo+'&fillTimes='+row.fillTime1+'" target="_blank">'+value+'</a>';
-	}
-	return value;
-	
-}},
-{field:'plateTypeName',align:'left',title:'车牌类型',width:'120px',rowspan:'2'},
-{field:'appType',align:'left',title:'应用类型',width:'120px',rowspan:'2'},
-
-{field:'cylinderNum',align:'left',title:'气瓶数量',width:'120px',rowspan:'2'},
-{field:'regNo',align:'left',title:'使用登记证',width:'120px',rowspan:'2'},
-{field:'nowNumber',align:'left',title:'已充装次数',width:'120px',rowspan:'2'},
-
-/* {field:'fillcheckstr',align:'left',title:'已充装次数',width:'120px',rowspan:'2',hidden:true}, */
-
-{field:'endTime1',align:'left',title:'结束时间',width:160,rowspan:'2'},
-{field:'lowPress',align:'left',title:'充装前压',width:'120px',rowspan:'2'},
-{field:'highPress',align:'left',title:'充装后压',width:'120px',rowspan:'2'},
-{field:'flux',align:'left',title:'流量',width:'120px',rowspan:'2'},
-{field:'money',align:'left',title:'金额(元)',width:'120px',rowspan:'2'},
-
-{"title":"充装前检查",align:'left',"colspan":6},
-{"title":"充装后检查",align:'left',"colspan":3},
-				
-			],
-			[
-			 
-{"field":"taskNo1",align:'left',"title":'附件齐全'+"<br/>"+'符合安全'+"<br/>"+'要求',"rowspan":1,"colspan":1},
-{"field":"taskNo2",align:'left',"title":'瓶内有余'+"<br/>"+'压(首次充'+"<br/>"+'装已置换)',"rowspan":1,"colspan":1},
-{"field":"taskNo3",align:'left',"title":'外观完好、无缺陷('+"<br/>"+'裂纹、腐蚀、'+"<br/>"+'变形等)、安装稳定',"rowspan":1,"colspan":1},
-{"field":"taskNo4",align:'left',"title":'无私改'+"<br/>"+'符合规定',"rowspan":1,"colspan":1},
-{"field":"taskNo5",align:'left',"title":'无漏气、'+"<br/>"+'漏电、'+"<br/>"+'漏油现象',"rowspan":1,"colspan":1},
-{"field":"taskNo6",align:'left',"title":'电子标签与车辆'+"<br/>"+'信息相符并贴于瓶'+"<br/>"+'体上(判定标签除外)',"rowspan":1,"colspan":1},
-
-
-{"field":"taskNo7",align:'left',"title":'瓶内压力'+"<br/>"+'在规定范'+"<br/>"+'围内',"rowspan":1,"colspan":1},
-{"field":"taskNo8",align:'left',"title":'附件连接'+"<br/>"+'可靠、密封'+"<br/>"+'完好',"rowspan":1,"colspan":1},
-{"field":"taskNo9",align:'left',"title":'无鼓包、变'+"<br/>"+'形、泄露等'+"<br/>"+'异常现象',"rowspan":1,"colspan":1},
-
-			 ]
-			
-			
-			]
-		});	
-	if(ssid.substring(0, 2)!="51"){
-		$('#tt').datagrid('hideColumn','lowPress');
-		$('#tt').datagrid('hideColumn','highPress');
-		$('#tt').datagrid('hideColumn','flux');
-		$('#tt').datagrid('hideColumn','money');
-	}
-}
-		function fLoadData(page,rows){
-		if(!$('#station option:selected').text()){
-			return false;
-		}
-			    $.messager.progress({ 
-			        title: '请等待', 
-			        msg: '正在加载数据...', 
-			        text: '查询中.......' 
-			    }); 
-				$.ajax({
-					type:"POST",
-					contentType: "application/x-www-form-urlencoded; charset=UTF-8",
-					data:$('#fillingform').serialize(),
-					url:"ajax/fillingDataQuery?page="+page+"&psize="+rows,
-					success:function (data){
-							$.messager.progress('close'); 
-							var vData = $.parseJSON(data);
-							sum = vData.total;
-							
-						if(sum==0){
-								show("没有查询到相关信息!!!");
-							}
-							totalpage = Math.ceil(sum/rows);
-							$('#tt').datagrid('loadData', vData); //将数据绑定到datagrid   
-							var p = $('#tt').datagrid('getPager'); 
-							$(p).pagination({ 
-						        pageList: [10,20,30,100,200,400],//可以设置每页记录条数的列表 
-						        beforePageText: '第',//页数文本框前显示的汉字 
-						        afterPageText: '页    共 {pages} 页', 
-						        displayMsg: '当前显示 {from} - {to} 条记录   共 {total} 条记录', 
-								onSelectPage: function (pageNumber, pageSize) { 
-					                fLoadData(pageNumber, pageSize); 
-           						 } 
-							
-							});
- 
-											}
-				});
-	
-			
-		}
-		
-		function selectCountry(){
-			var id=document.getElementById("city").value;
-			var select = document.getElementById("country");
-			for(var i=select.options.length-1;i>=0;i--) {
-				select.options.remove(i);
-			}
-			$.ajax({
-					type:"POST",
-					contentType: "application/x-www-form-urlencoded; charset=UTF-8",
-					url:"ajax/hiddenCity?cityId="+id,
-					success:function (data){
-						var obj=eval("(" + data + ")");
-						if(obj.rows.length==1){
-						select.options.add(new Option("请选择县", ""));
-						}
-						$.each(obj.rows, function(i,item){      
-							select.options.add(new Option(item.name, item.id));
-  						});
-						      
-							
-					}
-			});
-		}
-		
-		function selectCountry1(){
-				selectCountry();
-				selectstation();
-		}
-		
-	function changeSize(){
-		fLoadData(1,10);
-	}
-	
-	function selectstation(){
-	var ii=1;
-			var id=document.getElementById("country").value;
-			var select = document.getElementById("station");
-			for(var i=select.options.length-1;i>=0;i--) {
-				select.options.remove(i);
-			}
-			$.ajax({
-					type:"POST",
-					contentType: "application/x-www-form-urlencoded; charset=UTF-8",
-					data:$('#fillingform').serialize(),
-					//url:"ajax/hiddenCNGStation?cityId="+id,
-					url:"ajax/hiddenspeStation?type=2",
-					success:function (data){
-						var obj=eval("(" + data + ")");
-						select.options.add(new Option("全部", ""));
-						$.each(obj.rows, function(i,item){  
-						//if(ii==1){
-						//	if(obj.rows.length>1){
-						//		select.options.add(new Option("全部", ""));
-						//	}
-						//	ii++;
-						//}     
-							select.options.add(new Option(item.name, item.id));
-  						});
-						      
-							
-					}
-			});
-	}
-	function selectstation1(){
-	selectstation();
-	//changeSize();
-	}
-	
-	function selectjqjandop(){
-		selectjqj();
-		selectoperatorNo();
-	}
-	function selectjqj(){
-		var ii=1;
-		var id=document.getElementById("station").value;
-		
-		 var options = $("#station option:selected");
-		 var stationName = options.text();
-		var select = document.getElementById("jqj");
-		
-		var select0817 = document.getElementById("jqj_0817");
-		var select08171 = document.getElementById("jqj_08171");
-		for(var i=select.options.length-1;i>=0;i--) {
-			select.options.remove(i);
-		}
-		for(var i=select0817.options.length-1;i>=0;i--) {
-			select0817.options.remove(i);
-		}
-		for(var i=select08171.options.length-1;i>=0;i--) {
-			select08171.options.remove(i);
-		}
-		$.ajax({
-				type:"POST",
-				contentType: "application/x-www-form-urlencoded; charset=UTF-8",
-				url:"ajax/hiddenjqj?stationId="+id,
-				success:function (data){
-					var obj=eval("(" + data + ")");
-					select.options.add(new Option("全部", ""));
-					$.each(obj.rows, function(i,item){   
-						select.options.add(new Option(item.manu+item.type, item.machineNo));
-						select0817.options.add(new Option(item.manu+item.type, item.machineNo));
-						select08171.options.add(new Option(item.manu+item.type, item.machineNo));
-						});
-					  
-					
-					
-					document.getElementById("stationId0817").value=id;
-					document.getElementById("stationName0817").innerText=stationName;
-					document.getElementById("stationName08171").innerText=stationName;
-					if(stationName){
-						$('#btnadd').linkbutton('enable');
-						$('#btnadd1').linkbutton('enable');
-					}  
-				}
-		});
-	}
-	var oper="";
-	var username = '<%=username %>';
-	var opers=[];
-	function selectoperatorNo(){
-		var ii=1;
-		var id=document.getElementById("station").value;
-		var select = document.getElementById("operatorNo");
-		var fillCheckNo1 = document.getElementById("fillCheckNo1");
-		var fillCheckNo2 = document.getElementById("fillCheckNo2");
-		for(var i=select.options.length-1;i>=0;i--) {
-			select.options.remove(i);
-		}
-		for(var i=fillCheckNo1.options.length-1;i>=0;i--) {
-			fillCheckNo1.options.remove(i);
-		}
-		for(var i=fillCheckNo2.options.length-1;i>=0;i--) {
-			fillCheckNo2.options.remove(i);
-		}
-		$.ajax({
-				type:"POST",
-				contentType: "application/x-www-form-urlencoded; charset=UTF-8",
-				url:"ajax/hiddenoperatorNo?stationId="+id,
-				success:function (data){
-					var obj=eval("(" + data + ")");
-					select.options.add(new Option("全部", ""));
-					fillCheckNo1.options.add(new Option("无", ""));
-					fillCheckNo2.options.add(new Option("无", ""));
-					$.each(obj.rows, function(i,item){   
-						select.options.add(new Option(item.name, item.operatorNo));
-						fillCheckNo1.options.add(new Option(item.name, item.operatorNo));
-						fillCheckNo2.options.add(new Option(item.name, item.operatorNo));
-						if(item.name!=username){
-							oper = item.name;
-							opers.push(item.name);
-							
-						}
-						
-						});
-					     
-					document.getElementById("stationId08171").value=id;
-						
-				}
-		});
-	}
-	function expt1(){
-		expt(grid);
-	}
-	function exptSingle(){
-		if(!grid){
-			alert("数据为空");
-			return false;
-		}else{
-			expt(grid);
-		}
-		
-	}
-	function exptAll(){
-		fLoadDataAll(1,5000);
-	}
-	
-	function fLoadDataAll(page,rows){
-				var startTime1 = $('#startTime').datebox('getValue');
-				var endTime1 = $('#endTime').datebox('getValue');
-			
-			
-				document.getElementById("pageNumber").innerText = i;
-				document.getElementById("from").innerText = (page-1)*rows;
-				document.getElementById("to").innerText = page*rows;
-			    $.messager.progress({ 
-			        title: '请等待', 
-			        msg: '正在加载数据...', 
-			        text: '查询中.......' 
-			    }); 
-				$.ajax({
-					type:"POST",
-					contentType: "application/x-www-form-urlencoded; charset=UTF-8",
-					data:$('#fillingform').serialize(),
-					url:"ajax/fillingDataQuery?page="+page+"&psize="+rows,
-					success:function (data){
-							$.messager.progress('close'); 
-							var vData = $.parseJSON(data);
-							sum = vData.total;
-							
-if(sum==0){
-								show("没有查询到相关信息!!!");
-							}
-							totalpage = Math.ceil(sum/rows);
-							document.getElementById("total").innerText = sum;
-							document.getElementById("totalpage").innerText = totalpage;
-							var vData = $.parseJSON(data);
-							$('#tt').datagrid('loadData', vData); //将数据绑定到datagrid   
-							var p = $('#tt').datagrid('getPager'); 
-							$(p).pagination({ 
-						        pageList: [10,20,30,100,200,400],//可以设置每页记录条数的列表 
-						        beforePageText: '第',//页数文本框前显示的汉字 
-						        afterPageText: '页    共 {pages} 页', 
-						        displayMsg: '当前显示 {from} - {to} 条记录   共 {total} 条记录', 
-								onSelectPage: function (pageNumber, pageSize) { 
-					                fLoadData(pageNumber, pageSize); 
-           						 } 
-							
-							});
-							
-							if(!grid){
-			alert("数据为空");
-			return false;
-		}else{
-			expt(grid);
-		}
-											}
-				});
-	
-			
-		}
-		
-				
-function selectjqjandop22(){
-	selectjqjandop();
-	//changeSize();
-}
-function selectoperatorNo22(){
-	//selectoperatorNo();
-	//changeSize();
-}
-function add(){
-	$("#add").dialog("open").dialog('setTitle', '设置加气机状态');
-	$("#add").panel("move",{top:$(document).scrollTop() + ($(window).height()-250) * 0.5}); 
-}
-function add1(){
-	$("#add1").dialog("open").dialog('setTitle', '设置检查人员');
-	$("#add1").panel("move",{top:$(document).scrollTop() + ($(window).height()-250) * 0.5}); 
-}
-function fillAfter(){
-	$("#fillAfter").dialog("open").dialog('setTitle', '补录充后检查');
-	$("#fillAfter").panel("move",{top:$(document).scrollTop() + ($(window).height()-250) * 0.5}); 
-}
-
-function save(){
-	$.messager.progress({ 
-        title: '请等待', 
-        msg: '正在提交数据...', 
-        text: '提交中.......' 
-    }); 
-	$("#addfm").form("submit", {
-            url: "ajax/updateMachine",
-            onsubmit: function () {
-                return $(this).form("validate");
-            },
-            success:function (data){
-						$.messager.progress('close');
-						var vData = $.parseJSON(data);
-						var result = vData.result;
-						if(result==0){
-							show("设置失败!");
-						}else{
-							show("设置成功!");
-							$('#add').dialog('close');
-						}
-                        
-		},
-		error:function(XMLHttpRequest,textStatus, errorThrown) {
-				$.messager.progress('close');
-		 				
-		}
-    });
-    
-}
-
-function save1(){
-	$.messager.progress({ 
-        title: '请等待', 
-        msg: '正在提交数据...', 
-        text: '提交中.......' 
-    }); 
-	$("#add1fm").form("submit", {
-            url: "ajax/updateFillCheckOper",
-            onsubmit: function () {
-                return $(this).form("validate");
-            },
-            success:function (data){
-						$.messager.progress('close');
-						var vData = $.parseJSON(data);
-						var result = vData.result;
-						if(result==0){
-							show("设置失败!");
-						}else{
-							show("设置成功!");
-							$('#add1').dialog('close');
-						}
-                        
-		},
-		error:function(XMLHttpRequest,textStatus, errorThrown) {
-				$.messager.progress('close');
-		 				
-		}
-    });
-    
-}
-
-//判断字符是否为空的方法
-function isEmpty(obj){
-    if(typeof obj == "undefined" || obj == null || obj == ""){
-        return true;
-    }else{
-        return false;
-    }
-}
-
-function compareDate(date1,date2){
-    var oDate1 = new Date(date1);
-    var oDate2 = new Date(date2);
-    if(oDate1.getTime() > oDate2.getTime()){
-        return true; //第一个大
-    } else {
-        return false; //第二个大
-    }
-}
-	</script>
-	
-  </head>
-  
-  <body>
-    <!-- 查询结果:数据表格 -->
-  	<table id="tt"  cellspacing="0" cellpadding="0" >
-	</table>
-	<div id="toolbar" style="padding-top: 0px;height: auto;">
-	
-  		 <form id="fillingform" action="ajax/filling" method="post">
-  		 <input type="text" name="fillCheck2" id="fillCheck2"   style="width: 150px;height: 34px;display: none;"  class="hzbspan" value="-1">
-  		 	<table>
-  		 		<tr>
-  		 			<td>
-  		 				<span class="hzbspan" >省:</span>
-  		 			</td>
-  		 			<td>
-  		 				<select  name="province" style="width: 150px;height: 34px;min-width: 100px;" class="hzbspan select">
-							<%for(AuthorityRegionPlace arp:arplist){
-								cplist = arp.getCityPlace();
-							 %>
-								<option value="<%=arp.getId() %>">
-									<%=arp.getName() %>
-								</option>
-							<%} %>
-						</select>
-  		 			</td>
-  		 			<td>
-  		 				<span class="hzbspan" >市:</span>
-  		 			</td>
-  		 			<td>
-  		 				<select  name="city" id="city" style="width: 150px;height: 34px;min-width: 100px;" class="hzbspan select" onchange="selectCountry1()">
-				
-							<%
-								
-								for(CityPlace cp:cplist){
-								cyplist = cp.getSubPlaceList();
-							%>		
-								
-								<option value="<%=cp.getId() %>">
-									<%=cp.getName() %>
-								</option>
-								
-							 
-							<%} %>
-						</select>
-  		 			</td>
-  		 			<td>
-  		 				<span class="hzbspan" >县:</span>
-  		 			</td>
-  		 			<td>
-  		 				<select  name="country" id = "country" style="width: 150px;height: 34px;min-width: 100px;" class="hzbspan select"  onchange="selectstation1();" >
-						</select>
-  		 			</td>
-  		 		</tr>
-  		 		<tr>
-  		 			<td>
-  		 				<span class="hzbspan" >充装站点:</span>
-  		 			</td>
-  		 			<td>
-  		 				<select  name="station" id ="station" style="width: 150px;height:34px;min-width: 100px;" class="hzbspan select"  onchange="selectjqjandop22();" >
-							<option value="">全部</option>
-						</select>
-  		 			</td>
-  		 			<td>
-  		 				<span class="hzbspan" >加气机:</span>
-  		 			</td>
-  		 			<td>
-  		 				<select  name="jqj" id ="jqj" style="width: 150px;height: 34px;min-width: 100px;" class="hzbspan select"  onchange="selectoperatorNo22();" >
-							<option value="">全部</option>
-						</select>
-  		 			</td>
-  		 		</tr>
-			<tr><td>
-			<span  style="cursor: default"><span class="hzbspan">应用类型:</span></span></td>
-			<td><select  name="appType" id="appType" style="width: 150px;height: 34px;" class="hzbspan select" >
-						<option value="-1" selected="selected">全部</option>
-					<option value="0">其他</option>
-					<option value="1">出租</option>
-					<option value="2">公交</option>
-					<option value="3">私用</option>
-					<option value="4">货运</option>
-					<option value="5">客运</option>
-					<option value="6">营转非</option>
-					<option value="9">外地车</option>
-				</select></td>
-			<td>
-			<span  style="cursor: default"><span class="hzbspan">开始时间:</span></span></td>
-			<td><input type="text" name="startTime" id="startTime" class="easyui-datebox"  style="width: 150px;height: 34px;"  class="hzbspan" data-options="prompt:'-   -   -   -   -   -   -'">
-			
-			</td>
-			<td>
-			<span  style="cursor: default"><span class="hzbspan">气枪编号:</span></span></td>
-			<td><input type="text" name="gunNo" id="gunNo"   style="width: 150px;height: 34px;"  class="hzbspan" placeholder="-   -   -   -   -   -   -">
-			</td>
-			<td><span  style="cursor: default"><span class="hzbspan">操作员:</span></span></td>
-			<td><select  name="operatorNo" id ="operatorNo" style="width: 150px;height: 34px;min-width: 100px;" class="hzbspan select" >
-				<option value="">全部</option>
-			</select></td>
-			</tr><tr>
-			<td>
-			
-			<span  style="cursor: default"><span class="hzbspan">充装状态:</span></span></td>
-			<td><select  name="fillState" id="fillState" style="width: 150px;height: 34px;" class="hzbspan select" >
-					<option value="-1" selected="selected">全部</option>
-					<option value="0">成功充装</option>
-					<option value="1">灰名单允许</option>
-					<option value="2">灰名单不允许</option>
-					<option value="3">黑名单不充装</option>
-					<option value="4">检验未通过</option>
-					<option value="5">超期未检</option>
-					<option value="6">使用年限超出</option>
-					<option value="7">次数不足</option>
-					<option value="8">当天次数不足</option>
-					<option value="9">站点不匹配</option>
-					<option value="10">加气机不匹配</option>
-					<option value="11">加气枪不匹配</option>
-					
-				</select></td>
-			<td>
-			<span  style="cursor: default"><span class="hzbspan">结束时间:</span></span></td>
-			<td><input type="text" name="endTime" id="endTime" class="easyui-datebox" style="width: 150px;height: 34px;"  class="hzbspan select" data-options="prompt:'-   -   -   -   -   -   -'">
-			</td>
-			<td><span  style="cursor: default"><span class="hzbspan">车牌号:</span></span></td>
-			<td><input type="text" name="carNo" id="carNo"  style="width: 150px;height: 34px;"  class="hzbspan" placeholder="-   -   -   -   -   -   -">
-			
-			</td>
-			<td>
-				
-				
-				<span class="hzbspan">充装介质:</span></td>
-				<td>
-				<select  name="cylinderType" id="cylinderType" style="width: 150px;height: 34px;" class="hzbspan select"  >
-					<option value="-1">全部</option>
-  						<option value="0">CNG-高压气体</option>
-  						<option value="1">LNG-低温液化天然气</option>
-				</select>
-			
-			
-			</td>
-		</tr>
-		<tr>
-		<td colspan="5">
-			<a id="btninfosearch" onclick="changeSize();" class="easyui-linkbutton" icon="icon-search" href="javascript:void(0)" style="margin-bottom:  5px;" ><span class="hzbspan" style="color: #f08300;font-size: 16px;">查询</span></a> 
-		
-			<a id="btninfosearch" onclick="exptSingle();" class="easyui-linkbutton" icon="icon-export" href="javascript:void(0)" style="margin-bottom:  5px;" ><span class="hzbspan" style="color: #f08300;font-size: 16px;">导出</span></a> 
-				<a id="btnadd" onclick="add();" class="easyui-linkbutton" icon="icon-config" href="javascript:void(0)" style="margin-bottom:  5px;" ><span class="hzbspan" style="color: #f08300;font-size: 16px;">设置加气机状态</span></a> 
-				<a id="btnadd1" onclick="add1();" class="easyui-linkbutton" icon="icon-config" href="javascript:void(0)" style="margin-bottom:  5px;" ><span class="hzbspan" style="color: #f08300;font-size: 16px;">设置检查人员</span></a> 
-		</td>
-		</tr>
-		</table>
-		</form>	
-	</div>
-	<div id="dialog2"></div> 
-	<div id="add" class="easyui-dialog" style="width: 440px; height: 250px; padding: 10px 40px;"  shadow="false"  closed="true" modal="true" buttons="#dlg-buttons">
-       <form id="addfm" method="post">
-       		<input name="stationNo" id="stationId0817" type="text"  style="display: none;"/>
-       		<div class="fitem">
-	       		<label> 站点:</label>
-	           <span id="stationName0817"></span>	 
-			</div>
-	       	<div class="fitem">
-	       		<label> 加气机:</label>
-	           <select  name="machineNo" id="jqj_0817" style="width: 200px;height: 34px;" class="hzbspan"  >
-				</select>  	 
-			</div>	 
-			<div class="fitem">
-	           <label>加气机状态:</label>
-	           <select  name="machineState" id="jqjState" style="width: 200px;height: 34px;" class="hzbspan"  >
-					<option value="0">在用</option>
-					<option value="1">可用</option>
-					<option value="2">检修</option>
-				</select>
-	       	</div>
-       </form>
- 	<div id="dlg-buttons">
-        <a href="javascript:void(0)" class="easyui-linkbutton" onclick="save()" iconcls="icon-add">保存</a>
-        <a href="javascript:void(0)" class="easyui-linkbutton" onclick="javascript:$('#add').dialog('close')"
-            iconcls="icon-cancel">关闭</a>
-    </div> 
-    </div>
-    
-   <div id="add1" class="easyui-dialog" style="width: 440px; height: 250px; padding: 10px 40px;"  shadow="false"  closed="true" modal="true" buttons="#dlg1-buttons">
-       <form id="add1fm" method="post">
-       		<input name="stationNo" id="stationId08171" type="text" style="display: none;" />
-       		<div class="fitem">
-	       		<label> 站点:</label>
-	           <span id="stationName08171"></span>	 
-			</div>
-	       	<div class="fitem">
-	       		<label> 加气机:</label>
-	           <select  name="machineNo" id="jqj_08171" style="width: 200px;height: 34px;" class="hzbspan"  >
-				</select>  	 
-			</div>	 
-			<div class="fitem">
-	           <label>充前检查人员:</label>
-	           <select  name="fillCheckNo1" id="fillCheckNo1" style="width: 200px;height: 34px;" class="hzbspan"  >
-				</select>
-	       	</div>
-	       	<div class="fitem">
-	           <label>充后检查人员:</label>
-	           <select  name="fillCheckNo2" id="fillCheckNo2" style="width: 200px;height: 34px;" class="hzbspan"  >
-				</select>
-	       	</div>
-       </form>
- 	<div id="dlg1-buttons">
-        <a href="javascript:void(0)" class="easyui-linkbutton" onclick="save1()" iconcls="icon-add">保存</a>
-        <a href="javascript:void(0)" class="easyui-linkbutton" onclick="javascript:$('#add1').dialog('close')"
-            iconcls="icon-cancel">关闭</a>
-    </div> 
-    </div>
-    
-    <div id="fillAfter" class="easyui-dialog" style="width: 900px; height: 250px; padding: 10px 40px;"  shadow="false"  closed="true" modal="true" buttons="#dlg2-buttons">
-       <form id="fillAfterfm" method="post">
-       		<table style="font-weight: 450;font-size: 12px;">
-       			<tr>
-       				<td><span style="font-weight: 550;font-size: 18px;">充后检查项:</span></td>
-       			</tr>
-       			<tr>
-       				<td style="text-indent: 2em;">瓶内压力在规定范围内:</td>
-       				<td>&nbsp;&nbsp;&nbsp;&nbsp;</td>
-       				<td><input name="item1" type="radio" value="0" checked="checked" />合格 </td>
-       				<td>&nbsp;&nbsp;&nbsp;&nbsp;</td>
-       				<td><input name="item1" type="radio" value="1" />不合格 </td>
-       			</tr>
-       			<tr>
-       				<td style="text-indent: 2em;">附件连接可靠、密封完好:</td>
-       				<td>&nbsp;&nbsp;&nbsp;&nbsp;</td>
-       				<td><input name="item2" type="radio" value="0" checked="checked"/>合格 </td>
-       				<td>&nbsp;&nbsp;&nbsp;&nbsp;</td>
-       				<td><input name="item2" type="radio" value="1" />不合格 </td>
-       			</tr>
-       			<tr>
-       				<td style="text-indent: 2em;">无鼓包、变形、泄露等异常现象:</td>
-       				<td>&nbsp;&nbsp;&nbsp;&nbsp;</td>
-       				<td><input name="item3" type="radio" value="0" checked="checked"/>合格 </td>
-       				<td>&nbsp;&nbsp;&nbsp;&nbsp;</td>
-       				<td><input name="item3" type="radio" value="1" />不合格 </td>
-       			</tr>
-       		</table>
-			
-       </form>
- 	<div id="dlg2-buttons">
-        <a href="javascript:void(0)" class="easyui-linkbutton" onclick="save1()" iconcls="icon-add">保存</a>
-        <a href="javascript:void(0)" class="easyui-linkbutton" onclick="javascript:$('#add1').dialog('close')"
-            iconcls="icon-cancel">关闭</a>
-    </div> 
-    </div>
-      
-  </body>
-</html>
+<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%>
+
+<%@ page import="com.runzhixing.bean.CityPlace" %>
+<%@ page import="com.runzhixing.bean.CountryPlace" %>
+<%@ page import="com.runzhixing.bean.Station" %>
+<%@ page import="com.runzhixing.bean.AuthorityRegionPlace" %>
+<%@ page import="com.runzhixing.bean.User" %>
+<%@ page import="com.runzhixing.tool.Util" %>
+<%@ page import="com.runzhixing.constant.Constant" %>
+<%
+String path = request.getContextPath();
+String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
+String username = (String) session.getAttribute("username");
+
+User user = (User)session.getAttribute(Constant.userMark); 
+List<AuthorityRegionPlace> arplist = user.getPrivilegePlaces1();
+
+List<CityPlace> cplist = new ArrayList<CityPlace>();
+List<CountryPlace> cyplist = new ArrayList<CountryPlace>();
+List<Station> slist = new ArrayList<Station>();
+String ssid = (String) session.getAttribute(Constant.Privilege);
+%>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+  <head>
+    <base href="<%=basePath%>">
+    
+    <title>充装数据查询</title>
+    
+	<meta http-equiv="pragma" content="no-cache">
+	<meta http-equiv="cache-control" content="no-cache">
+	<meta http-equiv="expires" content="0">    
+	<meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
+	<meta http-equiv="description" content="This is my page">
+	<meta http-equiv="X-UA-Compatible" content="IE=9"/>
+	<meta http-equiv="X-UA-Compatible" content="IE=10"/>
+	<link rel="stylesheet" type="text/css" href="css/easyui/themes/default/easyui.css">
+	<link rel="stylesheet" type="text/css" href="css/easyui/themes/icon.css">
+	<link rel="stylesheet" type="text/css" href="css/easyui/demo/demo.css">
+	<script type="text/javascript" src="css/easyui/jquery.min.js"></script>
+	<script type="text/javascript" src="css/easyui/jquery.easyui.min.js"  charset="utf-8"></script>
+	<script type="text/javascript" src="css/easyui/locale/easyui-lang-zh_CN.js"  charset="utf-8"></script>
+	<link rel="stylesheet" type="text/css" href="css/common/hzbstyle.css">
+	<script type="text/javascript" src="js/easyui/export.js"></script>
+	<script type="text/javascript" src="js/common/area.js"></script>
+	<style type="text/css">
+    	.datagrid-header-row td{font-weight: bold;}
+		 #fm
+        {
+            margin: 0;
+            padding: 10px 30px;
+        }
+        .ftitle
+        {
+            font-size: 14px;
+            font-weight: bold;
+            padding: 5px 0;
+            margin-bottom: 10px;
+            border-bottom: 1px solid #ccc;
+        }
+        .fitem
+        {
+            margin-bottom: 5px;
+        }
+        .fitem label
+        {
+            display: inline-block;
+            width: 100px;
+        } 
+        .fitem123 label
+        {
+            display: inline-block;
+            width: 250px;
+        } 
+        
+	</style>
+	<style type="text/css">
+		 a:HOVER{
+			color: red;
+			text-decoration: none;
+		}
+		 a{
+			color: #f08300;
+			text-decoration: none;
+		}
+	</style>
+	
+	<script type="text/javascript">
+	var ssid = '<%=ssid %>';
+		var grid="";
+		var exportString="";
+		var i = 1;//第几页
+		var sum;//总条数
+		
+var pageSize =10;
+		var totalpage;//总页数
+		$(document).ready(function(){
+			
+			pageSize = $('#pageSize').val();
+			selectCountry();
+			selectstation();
+			selectjqjandop();
+			fLoadTable();
+			$('#btnadd').linkbutton('disable');
+			$('#btnadd1').linkbutton('disable');
+			//fLoadData(i,pageSize);
+			
+		});
+		
+function show(message) {  
+	            $.messager.show({  
+	                title: '提示信息',  
+	                msg: message,  
+	                timeout: 2000,  
+	                showType: 'slide'  
+	            });  
+	        }
+function fLoadTable(){
+	grid=$('#tt').datagrid({
+		  fit: true,//自动大小   
+			title: '',
+			width: '100%',
+			height: 580,
+			toolbar: '#toolbar',
+			fitColumns: true,
+			singleSelect:false,
+			loadMsg:'正在加载, 请稍等 …',
+      	nowrap : true,//设置为true,当数据长度超出列宽时将会自动截取
+      	striped : true,//设置为true将交替显示行背景
+			collapsible : false,//显示可折叠按钮
+			singleSelect:false,
+      	fitColumns:true,//允许表格自动缩放,以适应父容器
+      	rownumbers:true,
+      	pagination:true,//分页控件
+      
+			columns:[[
+				{field:'stationName',align:'left',title:'充装站',width:'160px',rowspan:'2'},
+				{field:'machineName',align:'left',title:'加气机',width:'120px',rowspan:'2'},
+				{field:'gunNo',align:'left',title:'加气枪',width:'120px',rowspan:'2'},
+				{field:'mediaType',align:'left',title:'充装介质',width:'140px',rowspan:'2'},
+				{field:'operatorName',align:'left',title:'操作员',width:'120px',rowspan:'2',formatter: function(value, row, index){
+						if(value=="未知工作人员"){
+							return "";
+					}
+					
+					return value;
+				}},
+				{field:'operatorNameType',align:'left',title:'充装人员种类',width:'120px',rowspan:'2'},
+					{field:'fillState',align:'left',title:'充装状态',width:'120px',rowspan:'2',formatter: function(value, row, index){
+					if(value=="超期未检"){
+				        return '<div  style="background-color: #f08300;">'+value+'</div>';
+				        }
+					return value;	
+				}},
+					{field:'fillTime1',align:'left',title:'充装时间',width:160,rowspan:'2'},
+					
+					{field:'FILLCHECKNName1',align:'left',title:'充前气瓶检查人员',width:140,rowspan:'2',formatter: function(value, row, index){
+						/*
+						//FILLCHECKNO1如果为空时,用充装人员填充前操作员名字,否则用FILLCHECKNName1
+						if(isEmpty(row.FILLCHECKNNo1)){
+							if(isEmpty(row.operatorName)){
+								return '';
+							}else{
+								if(row.operatorName=="未知工作人员"){
+									return '';
+								}else{
+									return row.operatorName;
+								}
+							}
+						}else{
+							if(isEmpty(row.FILLCHECKNName1)){
+								return '';
+							}else{
+								if(row.FILLCHECKNName1=="未知工作人员"){
+									return '';
+								}else{
+									return row.FILLCHECKNName1;
+								}
+							}
+						}
+						*/
+						return value;
+				}},
+				{field:'FILLCHECKNName2',align:'left',title:'充后气瓶检查人员',width:140,rowspan:'2',formatter: function(value, row, index){
+					/*
+					//当充装状态为充前检验失败时,充后检查必须为空
+					if(row.fillStateNum==21){
+						return '';
+					}
+					//当充装状态为充装成功且充后人员FILLCHECKNO2为空时,充装时间等于充后时间,充后检查没上来,充后必须填空
+					else if(row.fillState=="成功充装"&&isEmpty(row.FILLCHECKNNo2)&&!isEmpty(row.fillTime1)&&!isEmpty(row.endTime1)&&row.fillTime1==row.endTime1){
+						return '';
+					}
+					//FILLCHECKNO2为空时,充装时间不等于充后时间,充后已经上来,用当前充装人员CngOperatorName填充
+					else if(isEmpty(row.FILLCHECKNNo2)&&!isEmpty(row.fillTime1)&&!isEmpty(row.endTime1)&&compareDate(row.endTime1, row.fillTime1)){
+						if(isEmpty(row.operatorName)){
+							return '';
+						}else{
+							if(row.operatorName=="未知工作人员"){
+								return '';
+							}else{
+								return row.operatorName;
+							}
+						}
+					}
+					//FILLCHECKNO2不为空,FILLCHECKNName2表示充后人员
+					else if(!isEmpty(row.FILLCHECKNNo2)){
+						if(row.FILLCHECKNName2=="未知工作人员"){
+							return '';
+						}else{
+							return row.FILLCHECKNName2;
+						}
+					}else{
+						return '';
+					}
+					*/
+					return value;
+				}},
+				{field:'fillMonitorName',align:'left',title:'充装监督人员',width:140,rowspan:'2',formatter: function(value, row, index){
+					/*
+					if(isEmpty(row.fillMonitorNo)){//监督人员不存在
+						if (!isEmpty(row.FILLCHECKNNo2) && !(row.FILLCHECKNName2=="未知工作人员")) {//充后检查人员存在
+							return row.FILLCHECKNName2;
+						}
+						if(!isEmpty(row.FILLCHECKNNo1) && !(row.FILLCHECKNName1=="未知工作人员")){//充前检查人员存在
+							return row.FILLCHECKNName1;
+						}
+						if(!isEmpty(row.operatorName) && !(row.operatorName=="未知工作人员")){//充装人员
+							return row.operatorName;
+						}
+					}else{//监督人员存在
+						if(!(row.fillMonitorName=="未知工作人员")){
+							return row.fillMonitorName;
+						}
+					}
+					return "";
+					*/
+					return value;
+				}},
+				
+				{field:'carNo',align:'left',title:'车牌号',width:'120px',rowspan:'2',formatter: function(value, row, index){
+					if(value){
+						var v=0;
+						if(row.appType.indexOf("其他")!=-1) {v=0;}else
+						if(row.appType.indexOf("出租")!=-1) {v=1;}else
+						if(row.appType.indexOf("公交")!=-1) {v=2;}else
+						if(row.appType.indexOf("私用")!=-1){v=3;}else
+						if(row.appType.indexOf("货运")!=-1){v=4;}else
+						if(row.appType.indexOf("客运")!=-1) {v=5;}else
+						if(row.appType.indexOf("外地车")!=-1) {
+							v=9;
+						
+							return '<a href="carpublic?carNo='+value+'&appType='+v+'&operState=-1'+'&plateType='+row.plateType+'&fixCarNo='+row.fixCarNo+'&fillTimes='+row.fillTime1+'" target="_blank">'+value+'</a>';
+						}else
+						if(row.appType.indexOf("营转非")!=-1) {v=6;}
+						return '<a href="machineDetailfill?carNo='+value+'&appType='+v+'&operState=-1'+'&plateType='+row.plateType+'&fixCarNo='+row.fixCarNo+'&fillTimes='+row.fillTime1+'" target="_blank">'+value+'</a>';
+					}
+					return value;
+					
+				}},
+				{field:'plateTypeName',align:'left',title:'车牌类型',width:'120px',rowspan:'2'},
+				{field:'appType',align:'left',title:'应用类型',width:'120px',rowspan:'2'},
+				
+				{field:'cylinderNum',align:'left',title:'气瓶数量',width:'120px',rowspan:'2'},
+				{field:'regNo',align:'left',title:'使用登记证',width:'120px',rowspan:'2'},
+				{field:'nowNumber',align:'left',title:'已充装次数',width:'120px',rowspan:'2'},
+				
+				/* {field:'fillcheckstr',align:'left',title:'已充装次数',width:'120px',rowspan:'2',hidden:true}, */
+				
+				{field:'endTime1',align:'left',title:'结束时间',width:160,rowspan:'2'},
+				{field:'lowPress',align:'left',title:'充装前压',width:'120px',rowspan:'2',formatter: function(value, row, index){
+					return parseFloat(value).toFixed(2);	
+				}},
+				{field:'highPress',align:'left',title:'充装后压',width:'120px',rowspan:'2',formatter: function(value, row, index){
+					return parseFloat(value).toFixed(2);	
+				}},
+				{field:'flux',align:'left',title:'流量',width:'120px',rowspan:'2',formatter: function(value, row, index){
+					return parseFloat(value).toFixed(2);	
+				}},
+				{field:'money',align:'left',title:'金额(元)',width:'120px',rowspan:'2',formatter: function(value, row, index){
+					return parseFloat(value).toFixed(2);	
+				}},
+				
+				{"title":"充装前检查",align:'left',"colspan":6},
+				{"title":"充装中检查",align:'left',"colspan":3},
+				{"title":"充装后检查",align:'left',"colspan":3},
+								
+							],
+							[
+							 
+				{"field":"taskNo1",align:'left',"title":'附件齐全'+"<br/>"+'符合安全'+"<br/>"+'要求',"rowspan":1,"colspan":1},
+				{"field":"taskNo2",align:'left',"title":'瓶内有余'+"<br/>"+'压(首次充'+"<br/>"+'装已置换)',"rowspan":1,"colspan":1},
+				{"field":"taskNo3",align:'left',"title":'外观完好、无缺陷('+"<br/>"+'裂纹、腐蚀、'+"<br/>"+'变形等)、安装稳定',"rowspan":1,"colspan":1},
+				{"field":"taskNo4",align:'left',"title":'无私改'+"<br/>"+'符合规定',"rowspan":1,"colspan":1},
+				{"field":"taskNo5",align:'left',"title":'无漏气、'+"<br/>"+'漏电、'+"<br/>"+'漏油现象',"rowspan":1,"colspan":1},
+				{"field":"taskNo6",align:'left',"title":'电子标签与车辆'+"<br/>"+'信息相符并贴于瓶'+"<br/>"+'体上(判定标签除外)',"rowspan":1,"colspan":1},
+				
+				{"field":"taskNo10",align:'left',"title":'压力',"rowspan":1,"colspan":1},
+				{"field":"taskNo11",align:'left',"title":'温度',"rowspan":1,"colspan":1},
+				{"field":"taskNo12",align:'left',"title":'外观完整性',"rowspan":1},
+				
+				{"field":"taskNo7",align:'left',"title":'瓶内压力'+"<br/>"+'在规定范'+"<br/>"+'围内',"rowspan":1,"colspan":1},
+				{"field":"taskNo8",align:'left',"title":'附件连接'+"<br/>"+'可靠、密封'+"<br/>"+'完好',"rowspan":1,"colspan":1},
+				{"field":"taskNo9",align:'left',"title":'无鼓包、变'+"<br/>"+'形、泄露等'+"<br/>"+'异常现象',"rowspan":1,"colspan":1},
+
+			 ]
+			
+			
+			]
+		});	
+	if(ssid.substring(0, 2)!="51"){
+		$('#tt').datagrid('hideColumn','lowPress');
+		$('#tt').datagrid('hideColumn','highPress');
+		$('#tt').datagrid('hideColumn','flux');
+		$('#tt').datagrid('hideColumn','money');
+	}
+}
+		function fLoadData(page,rows){
+		if(!$('#station option:selected').text()){
+			return false;
+		}
+			    $.messager.progress({ 
+			        title: '请等待', 
+			        msg: '正在加载数据...', 
+			        text: '查询中.......' 
+			    }); 
+				$.ajax({
+					type:"POST",
+					contentType: "application/x-www-form-urlencoded; charset=UTF-8",
+					data:$('#fillingform').serialize(),
+					url:"ajax/fillingDataQuery?page="+page+"&psize="+rows,
+					success:function (data){
+							$.messager.progress('close'); 
+							var vData = $.parseJSON(data);
+							sum = vData.total;
+							
+						if(sum==0){
+								show("没有查询到相关信息!!!");
+							}
+							totalpage = Math.ceil(sum/rows);
+							$('#tt').datagrid('loadData', vData); //将数据绑定到datagrid   
+							var p = $('#tt').datagrid('getPager'); 
+							$(p).pagination({ 
+						        pageList: [10,20,30,100,200,400],//可以设置每页记录条数的列表 
+						        beforePageText: '第',//页数文本框前显示的汉字 
+						        afterPageText: '页    共 {pages} 页', 
+						        displayMsg: '当前显示 {from} - {to} 条记录   共 {total} 条记录', 
+								onSelectPage: function (pageNumber, pageSize) { 
+					                fLoadData(pageNumber, pageSize); 
+           						 } 
+							
+							});
+ 
+											}
+				});
+	
+			
+		}
+		
+		function selectCountry(){
+			var id=document.getElementById("city").value;
+			var select = document.getElementById("country");
+			for(var i=select.options.length-1;i>=0;i--) {
+				select.options.remove(i);
+			}
+			$.ajax({
+					type:"POST",
+					contentType: "application/x-www-form-urlencoded; charset=UTF-8",
+					url:"ajax/hiddenCity?cityId="+id,
+					success:function (data){
+						var obj=eval("(" + data + ")");
+						if(obj.rows.length==1){
+						select.options.add(new Option("请选择县", ""));
+						}
+						$.each(obj.rows, function(i,item){      
+							select.options.add(new Option(item.name, item.id));
+  						});
+						      
+							
+					}
+			});
+		}
+		
+		function selectCountry1(){
+				selectCountry();
+				selectstation();
+		}
+		
+	function changeSize(){
+		fLoadData(1,10);
+	}
+	
+	function selectstation(){
+	var ii=1;
+			var id=document.getElementById("country").value;
+			var select = document.getElementById("station");
+			for(var i=select.options.length-1;i>=0;i--) {
+				select.options.remove(i);
+			}
+			$.ajax({
+					type:"POST",
+					contentType: "application/x-www-form-urlencoded; charset=UTF-8",
+					data:$('#fillingform').serialize(),
+					//url:"ajax/hiddenCNGStation?cityId="+id,
+					url:"ajax/hiddenspeStation?type=2",
+					success:function (data){
+						var obj=eval("(" + data + ")");
+						select.options.add(new Option("全部", ""));
+						$.each(obj.rows, function(i,item){  
+						//if(ii==1){
+						//	if(obj.rows.length>1){
+						//		select.options.add(new Option("全部", ""));
+						//	}
+						//	ii++;
+						//}     
+							select.options.add(new Option(item.name, item.id));
+  						});
+						      
+							
+					}
+			});
+	}
+	function selectstation1(){
+	selectstation();
+	//changeSize();
+	}
+	
+	function selectjqjandop(){
+		selectjqj();
+		selectoperatorNo();
+	}
+	function selectjqj(){
+		var ii=1;
+		var id=document.getElementById("station").value;
+		
+		 var options = $("#station option:selected");
+		 var stationName = options.text();
+		var select = document.getElementById("jqj");
+		
+		var select0817 = document.getElementById("jqj_0817");
+		var select08171 = document.getElementById("jqj_08171");
+		for(var i=select.options.length-1;i>=0;i--) {
+			select.options.remove(i);
+		}
+		for(var i=select0817.options.length-1;i>=0;i--) {
+			select0817.options.remove(i);
+		}
+		for(var i=select08171.options.length-1;i>=0;i--) {
+			select08171.options.remove(i);
+		}
+		$.ajax({
+				type:"POST",
+				contentType: "application/x-www-form-urlencoded; charset=UTF-8",
+				url:"ajax/hiddenjqj?stationId="+id,
+				success:function (data){
+					var obj=eval("(" + data + ")");
+					select.options.add(new Option("全部", ""));
+					$.each(obj.rows, function(i,item){   
+						select.options.add(new Option(item.manu+item.type, item.machineNo));
+						select0817.options.add(new Option(item.manu+item.type, item.machineNo));
+						select08171.options.add(new Option(item.manu+item.type, item.machineNo));
+						});
+					  
+					
+					
+					document.getElementById("stationId0817").value=id;
+					document.getElementById("stationName0817").innerText=stationName;
+					document.getElementById("stationName08171").innerText=stationName;
+					if(stationName){
+						$('#btnadd').linkbutton('enable');
+						$('#btnadd1').linkbutton('enable');
+					}  
+				}
+		});
+	}
+	var oper="";
+	var username = '<%=username %>';
+	var opers=[];
+	function selectoperatorNo(){
+		var ii=1;
+		var id=document.getElementById("station").value;
+		var select = document.getElementById("operatorNo");
+		var fillCheckNo1 = document.getElementById("fillCheckNo1");
+		var fillCheckNo2 = document.getElementById("fillCheckNo2");
+		for(var i=select.options.length-1;i>=0;i--) {
+			select.options.remove(i);
+		}
+		for(var i=fillCheckNo1.options.length-1;i>=0;i--) {
+			fillCheckNo1.options.remove(i);
+		}
+		for(var i=fillCheckNo2.options.length-1;i>=0;i--) {
+			fillCheckNo2.options.remove(i);
+		}
+		$.ajax({
+				type:"POST",
+				contentType: "application/x-www-form-urlencoded; charset=UTF-8",
+				url:"ajax/hiddenoperatorNo?stationId="+id,
+				success:function (data){
+					var obj=eval("(" + data + ")");
+					select.options.add(new Option("全部", ""));
+					fillCheckNo1.options.add(new Option("无", ""));
+					fillCheckNo2.options.add(new Option("无", ""));
+					$.each(obj.rows, function(i,item){   
+						select.options.add(new Option(item.name, item.operatorNo));
+						fillCheckNo1.options.add(new Option(item.name, item.operatorNo));
+						fillCheckNo2.options.add(new Option(item.name, item.operatorNo));
+						if(item.name!=username){
+							oper = item.name;
+							opers.push(item.name);
+							
+						}
+						
+						});
+					     
+					document.getElementById("stationId08171").value=id;
+						
+				}
+		});
+	}
+	function expt1(){
+		expt(grid);
+	}
+	function exptSingle(){
+		if(!grid){
+			alert("数据为空");
+			return false;
+		}else{
+			expt(grid);
+		}
+		
+	}
+	function exptAll(){
+		fLoadDataAll(1,5000);
+	}
+	
+	function fLoadDataAll(page,rows){
+				var startTime1 = $('#startTime').datebox('getValue');
+				var endTime1 = $('#endTime').datebox('getValue');
+			
+			
+				document.getElementById("pageNumber").innerText = i;
+				document.getElementById("from").innerText = (page-1)*rows;
+				document.getElementById("to").innerText = page*rows;
+			    $.messager.progress({ 
+			        title: '请等待', 
+			        msg: '正在加载数据...', 
+			        text: '查询中.......' 
+			    }); 
+				$.ajax({
+					type:"POST",
+					contentType: "application/x-www-form-urlencoded; charset=UTF-8",
+					data:$('#fillingform').serialize(),
+					url:"ajax/fillingDataQuery?page="+page+"&psize="+rows,
+					success:function (data){
+							$.messager.progress('close'); 
+							var vData = $.parseJSON(data);
+							sum = vData.total;
+							
+if(sum==0){
+								show("没有查询到相关信息!!!");
+							}
+							totalpage = Math.ceil(sum/rows);
+							document.getElementById("total").innerText = sum;
+							document.getElementById("totalpage").innerText = totalpage;
+							var vData = $.parseJSON(data);
+							$('#tt').datagrid('loadData', vData); //将数据绑定到datagrid   
+							var p = $('#tt').datagrid('getPager'); 
+							$(p).pagination({ 
+						        pageList: [10,20,30,100,200,400],//可以设置每页记录条数的列表 
+						        beforePageText: '第',//页数文本框前显示的汉字 
+						        afterPageText: '页    共 {pages} 页', 
+						        displayMsg: '当前显示 {from} - {to} 条记录   共 {total} 条记录', 
+								onSelectPage: function (pageNumber, pageSize) { 
+					                fLoadData(pageNumber, pageSize); 
+           						 } 
+							
+							});
+							
+							if(!grid){
+			alert("数据为空");
+			return false;
+		}else{
+			expt(grid);
+		}
+											}
+				});
+	
+			
+		}
+		
+				
+function selectjqjandop22(){
+	selectjqjandop();
+	//changeSize();
+}
+function selectoperatorNo22(){
+	//selectoperatorNo();
+	//changeSize();
+}
+function add(){
+	$("#add").dialog("open").dialog('setTitle', '设置加气机状态');
+	$("#add").panel("move",{top:$(document).scrollTop() + ($(window).height()-250) * 0.5}); 
+}
+function add1(){
+	$("#add1").dialog("open").dialog('setTitle', '设置检查人员');
+	$("#add1").panel("move",{top:$(document).scrollTop() + ($(window).height()-250) * 0.5}); 
+}
+function fillAfter(){
+	$("#fillAfter").dialog("open").dialog('setTitle', '补录充后检查');
+	$("#fillAfter").panel("move",{top:$(document).scrollTop() + ($(window).height()-250) * 0.5}); 
+}
+
+function save(){
+	$.messager.progress({ 
+        title: '请等待', 
+        msg: '正在提交数据...', 
+        text: '提交中.......' 
+    }); 
+	$("#addfm").form("submit", {
+            url: "ajax/updateMachine",
+            onsubmit: function () {
+                return $(this).form("validate");
+            },
+            success:function (data){
+						$.messager.progress('close');
+						var vData = $.parseJSON(data);
+						var result = vData.result;
+						if(result==0){
+							show("设置失败!");
+						}else{
+							show("设置成功!");
+							$('#add').dialog('close');
+						}
+                        
+		},
+		error:function(XMLHttpRequest,textStatus, errorThrown) {
+				$.messager.progress('close');
+		 				
+		}
+    });
+    
+}
+
+function save1(){
+	$.messager.progress({ 
+        title: '请等待', 
+        msg: '正在提交数据...', 
+        text: '提交中.......' 
+    }); 
+	$("#add1fm").form("submit", {
+            url: "ajax/updateFillCheckOper",
+            onsubmit: function () {
+                return $(this).form("validate");
+            },
+            success:function (data){
+						$.messager.progress('close');
+						var vData = $.parseJSON(data);
+						var result = vData.result;
+						if(result==0){
+							show("设置失败!");
+						}else{
+							show("设置成功!");
+							$('#add1').dialog('close');
+						}
+                        
+		},
+		error:function(XMLHttpRequest,textStatus, errorThrown) {
+				$.messager.progress('close');
+		 				
+		}
+    });
+    
+}
+
+//判断字符是否为空的方法
+function isEmpty(obj){
+    if(typeof obj == "undefined" || obj == null || obj == ""){
+        return true;
+    }else{
+        return false;
+    }
+}
+
+function compareDate(date1,date2){
+    var oDate1 = new Date(date1);
+    var oDate2 = new Date(date2);
+    if(oDate1.getTime() > oDate2.getTime()){
+        return true; //第一个大
+    } else {
+        return false; //第二个大
+    }
+}
+	</script>
+	
+  </head>
+  
+  <body>
+    <!-- 查询结果:数据表格 -->
+  	<table id="tt"  cellspacing="0" cellpadding="0" >
+	</table>
+	<div id="toolbar" style="padding-top: 0px;height: auto;">
+	
+  		 <form id="fillingform" action="ajax/filling" method="post">
+  		 <input type="text" name="fillCheck2" id="fillCheck2"   style="width: 150px;height: 34px;display: none;"  class="hzbspan" value="-1">
+  		 	<table>
+  		 		<tr>
+  		 			<td>
+  		 				<span class="hzbspan" >省:</span>
+  		 			</td>
+  		 			<td>
+  		 				<select  name="province" style="width: 150px;height: 34px;min-width: 100px;" class="hzbspan select">
+							<%for(AuthorityRegionPlace arp:arplist){
+								cplist = arp.getCityPlace();
+							 %>
+								<option value="<%=arp.getId() %>">
+									<%=arp.getName() %>
+								</option>
+							<%} %>
+						</select>
+  		 			</td>
+  		 			<td>
+  		 				<span class="hzbspan" >市:</span>
+  		 			</td>
+  		 			<td>
+  		 				<select  name="city" id="city" style="width: 150px;height: 34px;min-width: 100px;" class="hzbspan select" onchange="selectCountry1()">
+				
+							<%
+								
+								for(CityPlace cp:cplist){
+								cyplist = cp.getSubPlaceList();
+							%>		
+								
+								<option value="<%=cp.getId() %>">
+									<%=cp.getName() %>
+								</option>
+								
+							 
+							<%} %>
+						</select>
+  		 			</td>
+  		 			<td>
+  		 				<span class="hzbspan" >县:</span>
+  		 			</td>
+  		 			<td>
+  		 				<select  name="country" id = "country" style="width: 150px;height: 34px;min-width: 100px;" class="hzbspan select"  onchange="selectstation1();" >
+						</select>
+  		 			</td>
+  		 		</tr>
+  		 		<tr>
+  		 			<td>
+  		 				<span class="hzbspan" >充装站点:</span>
+  		 			</td>
+  		 			<td>
+  		 				<select  name="station" id ="station" style="width: 150px;height:34px;min-width: 100px;" class="hzbspan select"  onchange="selectjqjandop22();" >
+							<option value="">全部</option>
+						</select>
+  		 			</td>
+  		 			<td>
+  		 				<span class="hzbspan" >加气机:</span>
+  		 			</td>
+  		 			<td>
+  		 				<select  name="jqj" id ="jqj" style="width: 150px;height: 34px;min-width: 100px;" class="hzbspan select"  onchange="selectoperatorNo22();" >
+							<option value="">全部</option>
+						</select>
+  		 			</td>
+  		 		</tr>
+			<tr><td>
+			<span  style="cursor: default"><span class="hzbspan">应用类型:</span></span></td>
+			<td><select  name="appType" id="appType" style="width: 150px;height: 34px;" class="hzbspan select" >
+						<option value="-1" selected="selected">全部</option>
+					<option value="0">其他</option>
+					<option value="1">出租</option>
+					<option value="2">公交</option>
+					<option value="3">私用</option>
+					<option value="4">货运</option>
+					<option value="5">客运</option>
+					<option value="6">营转非</option>
+					<option value="9">外地车</option>
+				</select></td>
+			<td>
+			<span  style="cursor: default"><span class="hzbspan">开始时间:</span></span></td>
+			<td><input type="text" name="startTime" id="startTime" class="easyui-datebox"  style="width: 150px;height: 34px;"  class="hzbspan" data-options="prompt:'-   -   -   -   -   -   -'">
+			
+			</td>
+			<td>
+			<span  style="cursor: default"><span class="hzbspan">气枪编号:</span></span></td>
+			<td><input type="text" name="gunNo" id="gunNo"   style="width: 150px;height: 34px;"  class="hzbspan" placeholder="-   -   -   -   -   -   -">
+			</td>
+			<td><span  style="cursor: default"><span class="hzbspan">操作员:</span></span></td>
+			<td><select  name="operatorNo" id ="operatorNo" style="width: 150px;height: 34px;min-width: 100px;" class="hzbspan select" >
+				<option value="">全部</option>
+			</select></td>
+			</tr><tr>
+			<td>
+			
+			<span  style="cursor: default"><span class="hzbspan">充装状态:</span></span></td>
+			<td><select  name="fillState" id="fillState" style="width: 150px;height: 34px;" class="hzbspan select" >
+					<option value="-1" selected="selected">全部</option>
+					<option value="0">成功充装</option>
+					<option value="1">灰名单允许</option>
+					<option value="2">灰名单不允许</option>
+					<option value="3">黑名单不充装</option>
+					<option value="4">检验未通过</option>
+					<option value="5">超期未检</option>
+					<option value="6">使用年限超出</option>
+					<option value="7">次数不足</option>
+					<option value="8">当天次数不足</option>
+					<option value="9">站点不匹配</option>
+					<option value="10">加气机不匹配</option>
+					<option value="11">加气枪不匹配</option>
+					
+				</select></td>
+			<td>
+			<span  style="cursor: default"><span class="hzbspan">结束时间:</span></span></td>
+			<td><input type="text" name="endTime" id="endTime" class="easyui-datebox" style="width: 150px;height: 34px;"  class="hzbspan select" data-options="prompt:'-   -   -   -   -   -   -'">
+			</td>
+			<td><span  style="cursor: default"><span class="hzbspan">车牌号:</span></span></td>
+			<td><input type="text" name="carNo" id="carNo"  style="width: 150px;height: 34px;"  class="hzbspan" placeholder="-   -   -   -   -   -   -">
+			
+			</td>
+			<td>
+				
+				
+				<span class="hzbspan">充装介质:</span></td>
+				<td>
+				<select  name="cylinderType" id="cylinderType" style="width: 150px;height: 34px;" class="hzbspan select"  >
+					<option value="-1">全部</option>
+  						<option value="0">CNG-高压气体</option>
+  						<option value="1">LNG-低温液化天然气</option>
+				</select>
+			
+			
+			</td>
+		</tr>
+		<tr>
+		<td colspan="5">
+			<a id="btninfosearch" onclick="changeSize();" class="easyui-linkbutton" icon="icon-search" href="javascript:void(0)" style="margin-bottom:  5px;" ><span class="hzbspan" style="color: #f08300;font-size: 16px;">查询</span></a> 
+		
+			<a id="btninfosearch" onclick="exptSingle();" class="easyui-linkbutton" icon="icon-export" href="javascript:void(0)" style="margin-bottom:  5px;" ><span class="hzbspan" style="color: #f08300;font-size: 16px;">导出</span></a> 
+				<a id="btnadd" onclick="add();" class="easyui-linkbutton" icon="icon-config" href="javascript:void(0)" style="margin-bottom:  5px;" ><span class="hzbspan" style="color: #f08300;font-size: 16px;">设置加气机状态</span></a> 
+				<a id="btnadd1" onclick="add1();" class="easyui-linkbutton" icon="icon-config" href="javascript:void(0)" style="margin-bottom:  5px;" ><span class="hzbspan" style="color: #f08300;font-size: 16px;">设置检查人员</span></a> 
+		</td>
+		</tr>
+		</table>
+		</form>	
+	</div>
+	<div id="dialog2"></div> 
+	<div id="add" class="easyui-dialog" style="width: 440px; height: 250px; padding: 10px 40px;"  shadow="false"  closed="true" modal="true" buttons="#dlg-buttons">
+       <form id="addfm" method="post">
+       		<input name="stationNo" id="stationId0817" type="text"  style="display: none;"/>
+       		<div class="fitem">
+	       		<label> 站点:</label>
+	           <span id="stationName0817"></span>	 
+			</div>
+	       	<div class="fitem">
+	       		<label> 加气机:</label>
+	           <select  name="machineNo" id="jqj_0817" style="width: 200px;height: 34px;" class="hzbspan"  >
+				</select>  	 
+			</div>	 
+			<div class="fitem">
+	           <label>加气机状态:</label>
+	           <select  name="machineState" id="jqjState" style="width: 200px;height: 34px;" class="hzbspan"  >
+					<option value="0">在用</option>
+					<option value="1">可用</option>
+					<option value="2">检修</option>
+				</select>
+	       	</div>
+       </form>
+ 	<div id="dlg-buttons">
+        <a href="javascript:void(0)" class="easyui-linkbutton" onclick="save()" iconcls="icon-add">保存</a>
+        <a href="javascript:void(0)" class="easyui-linkbutton" onclick="javascript:$('#add').dialog('close')"
+            iconcls="icon-cancel">关闭</a>
+    </div> 
+    </div>
+    
+   <div id="add1" class="easyui-dialog" style="width: 440px; height: 250px; padding: 10px 40px;"  shadow="false"  closed="true" modal="true" buttons="#dlg1-buttons">
+       <form id="add1fm" method="post">
+       		<input name="stationNo" id="stationId08171" type="text" style="display: none;" />
+       		<div class="fitem">
+	       		<label> 站点:</label>
+	           <span id="stationName08171"></span>	 
+			</div>
+	       	<div class="fitem">
+	       		<label> 加气机:</label>
+	           <select  name="machineNo" id="jqj_08171" style="width: 200px;height: 34px;" class="hzbspan"  >
+				</select>  	 
+			</div>	 
+			<div class="fitem">
+	           <label>充前检查人员:</label>
+	           <select  name="fillCheckNo1" id="fillCheckNo1" style="width: 200px;height: 34px;" class="hzbspan"  >
+				</select>
+	       	</div>
+	       	<div class="fitem">
+	           <label>充后检查人员:</label>
+	           <select  name="fillCheckNo2" id="fillCheckNo2" style="width: 200px;height: 34px;" class="hzbspan"  >
+				</select>
+	       	</div>
+       </form>
+ 	<div id="dlg1-buttons">
+        <a href="javascript:void(0)" class="easyui-linkbutton" onclick="save1()" iconcls="icon-add">保存</a>
+        <a href="javascript:void(0)" class="easyui-linkbutton" onclick="javascript:$('#add1').dialog('close')"
+            iconcls="icon-cancel">关闭</a>
+    </div> 
+    </div>
+    
+    <div id="fillAfter" class="easyui-dialog" style="width: 900px; height: 250px; padding: 10px 40px;"  shadow="false"  closed="true" modal="true" buttons="#dlg2-buttons">
+       <form id="fillAfterfm" method="post">
+       		<table style="font-weight: 450;font-size: 12px;">
+       			<tr>
+       				<td><span style="font-weight: 550;font-size: 18px;">充后检查项:</span></td>
+       			</tr>
+       			<tr>
+       				<td style="text-indent: 2em;">瓶内压力在规定范围内:</td>
+       				<td>&nbsp;&nbsp;&nbsp;&nbsp;</td>
+       				<td><input name="item1" type="radio" value="0" checked="checked" />合格 </td>
+       				<td>&nbsp;&nbsp;&nbsp;&nbsp;</td>
+       				<td><input name="item1" type="radio" value="1" />不合格 </td>
+       			</tr>
+       			<tr>
+       				<td style="text-indent: 2em;">附件连接可靠、密封完好:</td>
+       				<td>&nbsp;&nbsp;&nbsp;&nbsp;</td>
+       				<td><input name="item2" type="radio" value="0" checked="checked"/>合格 </td>
+       				<td>&nbsp;&nbsp;&nbsp;&nbsp;</td>
+       				<td><input name="item2" type="radio" value="1" />不合格 </td>
+       			</tr>
+       			<tr>
+       				<td style="text-indent: 2em;">无鼓包、变形、泄露等异常现象:</td>
+       				<td>&nbsp;&nbsp;&nbsp;&nbsp;</td>
+       				<td><input name="item3" type="radio" value="0" checked="checked"/>合格 </td>
+       				<td>&nbsp;&nbsp;&nbsp;&nbsp;</td>
+       				<td><input name="item3" type="radio" value="1" />不合格 </td>
+       			</tr>
+       		</table>
+			
+       </form>
+ 	<div id="dlg2-buttons">
+        <a href="javascript:void(0)" class="easyui-linkbutton" onclick="save1()" iconcls="icon-add">保存</a>
+        <a href="javascript:void(0)" class="easyui-linkbutton" onclick="javascript:$('#add1').dialog('close')"
+            iconcls="icon-cancel">关闭</a>
+    </div> 
+    </div>
+      
+  </body>
+</html>

+ 207 - 147
WebRoot/jsp/rzx/dataQuery/LatelyFill.jsp

@@ -158,168 +158,228 @@ function show(message) {
 						{field:'nowNumber',align:'left',title:'已充装次数',width:'120px',rowspan:'2'},
 						{field:'fillcheckstr',align:'left',title:'已充装次数',width:'120px',rowspan:'2'},
 						{"title":"充装前检查",align:'left',"colspan":6},
+						{"title":"充装中检查",align:'left',"colspan":3},
 						{"title":"充装后检查",align:'left',"colspan":3},
 						{field:'endTime1',align:'left',title:'结束时间',width:160,rowspan:'2'},
 						{field:'lowPress',align:'left',title:'充装前压',width:'120px',rowspan:'2',formatter: function(value, row, index){
 							
-	    					return value;	
+							return parseFloat(value).toFixed(2);		
 						}},
 						{field:'highPress',align:'left',title:'充装后压',width:'120px',rowspan:'2',formatter: function(value, row, index){
-							
-	    					return value;	
+	    					return parseFloat(value).toFixed(2);	
 						}},
 						{field:'flux',align:'left',title:'流量',width:'120px',rowspan:'2',formatter: function(value, row, index){
-							
-	    					return value;	
+							return parseFloat(value).toFixed(2);	
 						}},
 						{field:'money',align:'left',title:'金额(元)',width:'120px',rowspan:'2',formatter: function(value, row, index){
-							
-	    					return value;	
+							return parseFloat(value).toFixed(2);	
 						}}
 						
 					],
 					[
 					 
-{"field":"taskNo",align:'left',"title":'附件齐全'+"<br/>"+'符合安全'+"<br/>"+'要求',"rowspan":1,formatter: function(value, row, index){
-	var v=row.fillcheckstr;
-	if(v!=null&&v!=""&&v!=undefined&&(row.fillStateNum<=0||row.fillStateNum>=21)){
-		var str="✔";
-		if(v.substring(v.length-1,v.length)=="1"){
-			str="×";
-		}
-		if(row.fillStateNum=="31"){
-			str="✔";
-		}
-		return str;
-	}
-	
-}},
-{"field":"taskNo1",align:'left',"title":'瓶内有余'+"<br/>"+'压(首次充'+"<br/>"+'装已置换)',"rowspan":1,formatter: function(value, row, index){
-	var v=row.fillcheckstr;
-	if(v!=null&&v!=""&&v!=undefined&&(row.fillStateNum<=0||row.fillStateNum>=21)){
-		var str="✔";
-		if(v.substring(v.length-2,v.length-1)=="1"){
-			str="×";
-		}
-		if(row.fillStateNum=="31"){
-			str="✔";
-		}
-		return str;
-	}
-}},
-{"field":"taskNo2",align:'left',"title":'外观完好、无缺陷('+"<br/>"+'裂纹、腐蚀、'+"<br/>"+'变形等)、安装稳定',"rowspan":1,formatter: function(value, row, index){
-	var v=row.fillcheckstr;
-	if(v!=null&&v!=""&&v!=undefined&&(row.fillStateNum<=0||row.fillStateNum>=21)){
-		var str="✔";
-		if(v.substring(v.length-3,v.length-2)=="1"){
-			str="×";
-		}
-		if(row.fillStateNum=="31"){
-			str="✔";
-		}
-		return str;
-	}
-}},
-{"field":"taskNo3",align:'left',"title":'无私改'+"<br/>"+'符合规定',"rowspan":1,formatter: function(value, row, index){
-	var v=row.fillcheckstr;
-	if(v!=null&&v!=""&&v!=undefined&&(row.fillStateNum<=0||row.fillStateNum>=21)){
-		var str="✔";
-		if(v.substring(v.length-4,v.length-3)=="1"){
-			str="×";
-		}
-		if(row.fillStateNum=="31"){
-			str="✔";
-		}
-		return str;
-	}
-}},
-{"field":"taskNo4",align:'left',"title":'无漏气、'+"<br/>"+'漏电、'+"<br/>"+'漏油现象',"rowspan":1,formatter: function(value, row, index){
-	var v=row.fillcheckstr;
-	if(v!=null&&v!=""&&v!=undefined&&(row.fillStateNum<=0||row.fillStateNum>=21)){
-		var str="✔";
-		if(v.substring(v.length-5,v.length-4)=="1"){
-			str="×";
-		}
-		if(row.fillStateNum=="31"){
-			str="✔";
-		}
-		return str;
-	}
-}},
-{"field":"taskNo5",align:'left',"title":'电子标签与车辆'+"<br/>"+'信息相符并贴于瓶'+"<br/>"+'体上(判定标签除外)',"rowspan":1,formatter: function(value, row, index){
-	var v=row.fillcheckstr;
-	if(v!=null&&v!=""&&v!=undefined&&(row.fillStateNum<=0||row.fillStateNum>=21)){
-		var str="✔";
-		if(v.substring(v.length-6,v.length-5)=="1"){
-			str="×";
-		}
-		if(row.fillStateNum=="31"){
-			str="✔";
-		}
-		return str;
-	}
-}},
-
-{"field":"taskNo6",align:'left',"title":'瓶内压力'+"<br/>"+'在规定范'+"<br/>"+'围内',"rowspan":1,formatter: function(value, row, index){
-	if(row.fillStateNum<=0||row.fillStateNum>=21){
-		if(
-				(row.endTime1&&row.fillTime1&&(row.endTime1>row.fillTime1))
-				||
-				(row.fillStateNum&&row.fillStateNum=="31")
-		){
-			
-			var v=row.fillcheckstr;
-			if(v!=null&&v!=""&&v!=undefined){
-				var str="✔";
-				if(v.substring(v.length-1,v.length)=="1"){
-					str="×";
-				}
-				return str;
-			}
-		}
-	}
-	
-}},
-{"field":"taskNo7",align:'left',"title":'附件连接'+"<br/>"+'可靠、密封'+"<br/>"+'完好',"rowspan":1,formatter: function(value, row, index){
-if(row.fillStateNum<=0||row.fillStateNum>=21){
-	if(
-			(row.endTime1&&row.fillTime1&&(row.endTime1>row.fillTime1))
-			||
-			(row.fillStateNum&&row.fillStateNum=="31")
-	){
-		
-		var v=row.fillcheckstr;
-		if(v!=null&&v!=""&&v!=undefined){
-			var str="✔";
-			if(v.substring(v.length-2,v.length-1)=="1"){
-				str="×";
-			}
-			return str;
-		}
-	}
-	}
-	
-}},
-{"field":"taskNo8",align:'left',"title":'无鼓包、变'+"<br/>"+'形、泄露等'+"<br/>"+'异常现象',"rowspan":1,formatter: function(value, row, index){
-if(row.fillStateNum<=0||row.fillStateNum>=21){
-	if(
-			(row.endTime1&&row.fillTime1&&(row.endTime1>row.fillTime1))
-			||
-			(row.fillStateNum&&row.fillStateNum=="31")
-	){
-		
-		var v=row.fillcheckstr;
-		if(v!=null&&v!=""&&v!=undefined){
-			var str="✔";
-			if(v.substring(v.length-3,v.length-2)=="1"){
-				str="×";
-			}
-			return str;
-		}
-	}
-	}
-	
-}},
+						{"field":"taskNo",align:'left',"title":'附件齐全'+"<br/>"+'符合安全'+"<br/>"+'要求',"rowspan":1,formatter: function(value, row, index){
+							var v=row.fillcheckstr;
+							if(v!=null&&v!=""&&v!=undefined&&(row.fillStateNum<=0||row.fillStateNum>=21)){
+								var str="✔";
+								if(v.substring(v.length-1,v.length)=="1"){
+									str="×";
+								}
+								if(row.fillStateNum=="31"){
+									str="✔";
+								}
+								return str;
+							}
+							
+						}},
+						{"field":"taskNo1",align:'left',"title":'瓶内有余'+"<br/>"+'压(首次充'+"<br/>"+'装已置换)',"rowspan":1,formatter: function(value, row, index){
+							var v=row.fillcheckstr;
+							if(v!=null&&v!=""&&v!=undefined&&(row.fillStateNum<=0||row.fillStateNum>=21)){
+								var str="✔";
+								if(v.substring(v.length-2,v.length-1)=="1"){
+									str="×";
+								}
+								if(row.fillStateNum=="31"){
+									str="✔";
+								}
+								return str;
+							}
+						}},
+						{"field":"taskNo2",align:'left',"title":'外观完好、无缺陷('+"<br/>"+'裂纹、腐蚀、'+"<br/>"+'变形等)、安装稳定',"rowspan":1,formatter: function(value, row, index){
+							var v=row.fillcheckstr;
+							if(v!=null&&v!=""&&v!=undefined&&(row.fillStateNum<=0||row.fillStateNum>=21)){
+								var str="✔";
+								if(v.substring(v.length-3,v.length-2)=="1"){
+									str="×";
+								}
+								if(row.fillStateNum=="31"){
+									str="✔";
+								}
+								return str;
+							}
+						}},
+						{"field":"taskNo3",align:'left',"title":'无私改'+"<br/>"+'符合规定',"rowspan":1,formatter: function(value, row, index){
+							var v=row.fillcheckstr;
+							if(v!=null&&v!=""&&v!=undefined&&(row.fillStateNum<=0||row.fillStateNum>=21)){
+								var str="✔";
+								if(v.substring(v.length-4,v.length-3)=="1"){
+									str="×";
+								}
+								if(row.fillStateNum=="31"){
+									str="✔";
+								}
+								return str;
+							}
+						}},
+						{"field":"taskNo4",align:'left',"title":'无漏气、'+"<br/>"+'漏电、'+"<br/>"+'漏油现象',"rowspan":1,formatter: function(value, row, index){
+							var v=row.fillcheckstr;
+							if(v!=null&&v!=""&&v!=undefined&&(row.fillStateNum<=0||row.fillStateNum>=21)){
+								var str="✔";
+								if(v.substring(v.length-5,v.length-4)=="1"){
+									str="×";
+								}
+								if(row.fillStateNum=="31"){
+									str="✔";
+								}
+								return str;
+							}
+						}},
+						{"field":"taskNo5",align:'left',"title":'电子标签与车辆'+"<br/>"+'信息相符并贴于瓶'+"<br/>"+'体上(判定标签除外)',"rowspan":1,formatter: function(value, row, index){
+							var v=row.fillcheckstr;
+							if(v!=null&&v!=""&&v!=undefined&&(row.fillStateNum<=0||row.fillStateNum>=21)){
+								var str="✔";
+								if(v.substring(v.length-6,v.length-5)=="1"){
+									str="×";
+								}
+								if(row.fillStateNum=="31"){
+									str="✔";
+								}
+								return str;
+							}
+						}},
+						
+						{"field":"taskNo10",align:'left',"title":'压力',"rowspan":1,formatter: function(value, row, index){
+							if(row.fillStateNum<=0||row.fillStateNum>=21){
+								if(
+										(row.endTime1&&row.fillTime1&&(row.endTime1>row.fillTime1))
+										||
+										(row.fillStateNum&&row.fillStateNum=="31")
+								){
+									
+									var v=row.fillcheckstr;
+									if(v!=null&&v!=""&&v!=undefined){
+										var str="✔";
+										if(v.substring(v.length-6,v.length-5)=="1"){
+											str="×";
+										}
+										return str;
+									}
+								}
+							}
+							
+						}},
+						{"field":"taskNo11",align:'left',"title":'温度',"rowspan":1,formatter: function(value, row, index){
+						if(row.fillStateNum<=0||row.fillStateNum>=21){
+							if(
+									(row.endTime1&&row.fillTime1&&(row.endTime1>row.fillTime1))
+									||
+									(row.fillStateNum&&row.fillStateNum=="31")
+							){
+								
+								var v=row.fillcheckstr;
+								if(v!=null&&v!=""&&v!=undefined){
+									var str="✔";
+									if(v.substring(v.length-7,v.length-6)=="1"){
+										str="×";
+									}
+									return str;
+								}
+							}
+							}
+							
+						}},
+						{"field":"taskNo12",align:'left',"title":'外观完整性',"rowspan":1,formatter: function(value, row, index){
+						if(row.fillStateNum<=0||row.fillStateNum>=21){
+							if(
+									(row.endTime1&&row.fillTime1&&(row.endTime1>row.fillTime1))
+									||
+									(row.fillStateNum&&row.fillStateNum=="31")
+							){
+								
+								var v=row.fillcheckstr;
+								if(v!=null&&v!=""&&v!=undefined){
+									var str="✔";
+									if(v.substring(v.length-8,v.length-7)=="1"){
+										str="×";
+									}
+									return str;
+								}
+							}
+							}
+							
+						}},
+						
+						
+						{"field":"taskNo6",align:'left',"title":'瓶内压力'+"<br/>"+'在规定范'+"<br/>"+'围内',"rowspan":1,formatter: function(value, row, index){
+							if(row.fillStateNum<=0||row.fillStateNum>=21){
+								if(
+										(row.endTime1&&row.fillTime1&&(row.endTime1>row.fillTime1))
+										||
+										(row.fillStateNum&&row.fillStateNum=="31")
+								){
+									
+									var v=row.fillcheckstr;
+									if(v!=null&&v!=""&&v!=undefined){
+										var str="✔";
+										if(v.substring(v.length-1,v.length)=="1"){
+											str="×";
+										}
+										return str;
+									}
+								}
+							}
+							
+						}},
+						{"field":"taskNo7",align:'left',"title":'附件连接'+"<br/>"+'可靠、密封'+"<br/>"+'完好',"rowspan":1,formatter: function(value, row, index){
+						if(row.fillStateNum<=0||row.fillStateNum>=21){
+							if(
+									(row.endTime1&&row.fillTime1&&(row.endTime1>row.fillTime1))
+									||
+									(row.fillStateNum&&row.fillStateNum=="31")
+							){
+								
+								var v=row.fillcheckstr;
+								if(v!=null&&v!=""&&v!=undefined){
+									var str="✔";
+									if(v.substring(v.length-2,v.length-1)=="1"){
+										str="×";
+									}
+									return str;
+								}
+							}
+							}
+							
+						}},
+						{"field":"taskNo8",align:'left',"title":'无鼓包、变'+"<br/>"+'形、泄露等'+"<br/>"+'异常现象',"rowspan":1,formatter: function(value, row, index){
+						if(row.fillStateNum<=0||row.fillStateNum>=21){
+							if(
+									(row.endTime1&&row.fillTime1&&(row.endTime1>row.fillTime1))
+									||
+									(row.fillStateNum&&row.fillStateNum=="31")
+							){
+								
+								var v=row.fillcheckstr;
+								if(v!=null&&v!=""&&v!=undefined){
+									var str="✔";
+									if(v.substring(v.length-3,v.length-2)=="1"){
+										str="×";
+									}
+									return str;
+								}
+							}
+							}
+							
+						}},
 
 					 ]
 					

+ 285 - 371
src/com/runzhixing/action/FillingDataQueryAction.java

@@ -1,371 +1,285 @@
-package com.runzhixing.action;
-
-import java.io.PrintWriter;
-import java.sql.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import net.sf.json.JSONObject;
-
-import org.apache.struts2.ServletActionContext;
-
-import com.opensymphony.xwork2.ActionSupport;
-import com.runzhixing.bean.CNGFillLog;
-import com.runzhixing.bean.CNGMachineState;
-import com.runzhixing.bean.Machine;
-import com.runzhixing.bean.User;
-import com.runzhixing.constant.Constant;
-import com.runzhixing.dao.AuthorityRegionDao;
-import com.runzhixing.packageProcedure.AreatedmachinerunningstateProcedure;
-import com.runzhixing.packageProcedure.FillingDataQueryProcedure;
-import com.runzhixing.tool.Tool;
-import com.runzhixing.tool.Util;
-/**
- * 告警参数设置
- * @author 小黄
- *
- */
-@SuppressWarnings("serial")
-public class FillingDataQueryAction extends ActionSupport {
-	//设置新的告警参数
-	@SuppressWarnings({ "unchecked", "static-access" })
-	public void fillingDataQuery() throws Exception{
-		HttpServletResponse response = ServletActionContext.getResponse();
-		HttpServletRequest req = ServletActionContext.getRequest();
-		Map map=new HashMap();
-		User user = (User)req.getSession().getAttribute(Constant.userMark); 
-		
-		
-		int moudel = user.getModule();
-		String ssid = (String) req.getSession().getAttribute(Constant.Privilege);
-		
-		
-		//获取地址,默认全部
-		String province = req.getParameter("province");
-		String city = req.getParameter("city");
-		String country = req.getParameter("country");
-		if(province==null){
-			province = "";
-		}
-		if(city==null){
-			city = "";
-		}
-		if(country==null){
-			country = "";
-		}
-		String regionNo = province+city+country;//地区编号
-		regionNo = regionNo.replaceAll("(00)*$", "");
-		
-		
-		
-		String operatorNo = req.getParameter("operatorNo");//操作员编号
-		String stationNo = req.getParameter("station");//充装点编号
-		
-		String machineNo = req.getParameter("jqj");//设备编号
-		
-		String gunNo = req.getParameter("gunNo");//气枪编号
-		String carNo = req.getParameter("carNo");//车牌号
-		
-		int appType = Integer.parseInt(req.getParameter("appType"));//应用类型
-		
-		int fillState = Integer.parseInt(req.getParameter("fillState"));//充装状态
-		
-		int cylinderType= Integer.parseInt(req.getParameter("cylinderType")); //加气机	
-		
-		
-		//开始时间
-		String sTime=req.getParameter("startTime");
-		String eTime=req.getParameter("endTime");
-		
-		Date startsTime = null;
-		//结束时间
-		Date endsTime = null;
-		// 0:时间无效 1:开始时间有效 2:结束时间有效 3:都有效
-		if(sTime!=null&&!sTime.equals("")){
-			startsTime = Util.dateChange(sTime);
-		}
-		if(eTime!=null&&!eTime.equals("")){
-			endsTime = Util.dateChange(eTime);
-		}
-		Long l = new java.util.Date().getTime();
-		if(startsTime==null){
-			startsTime= new java.sql.Date(l);
-		}
-		if(endsTime==null){
-			endsTime= new java.sql.Date(l+1000 * 3600 * 24L);
-		}
-		
-		
-		//根据地址获取地址编号
-		int pagesize = Integer.parseInt(req.getParameter("psize"));
-		int pageno = Integer.parseInt(req.getParameter("page"));
-		
-		if(stationNo==null||stationNo.equals("")){
-			stationNo =regionNo ;
-		}
-		if(ssid.length()==12&&moudel!=1){
-			stationNo = ssid;
-		}
-		int fillCheck2 = Integer.parseInt(req.getParameter("fillCheck2"));
-		List<CNGFillLog>  list1 = new FillingDataQueryProcedure().fillingDataQuery(pagesize, pageno, operatorNo,stationNo,machineNo,gunNo,carNo,appType,fillState,startsTime,endsTime,cylinderType,fillCheck2);
-		
-		
-		for(CNGFillLog log:list1){
-			String fillcheckstr = log.getFillcheckstr();
-			int fillStateNum = log.getFillStateNum();
-			String task1 = "✔";
-			if(!Util.isEmpty(fillcheckstr)){
-				if(fillStateNum<=0||fillStateNum>=21){
-					task1 = "✔";
-					if(fillcheckstr.substring(fillcheckstr.length()-1,fillcheckstr.length()).equals("1")){
-						task1 = "×";
-					}
-					if(fillStateNum==31){
-						task1 = "✔";
-					}
-				}
-			}
-			log.setTaskNo1(task1);
-			
-			String task2 = "✔";
-			if(!Util.isEmpty(fillcheckstr)){
-				if(fillStateNum<=0||fillStateNum>=21){
-					task1 = "✔";
-					if(fillcheckstr.substring(fillcheckstr.length()-2,fillcheckstr.length()-1).equals("1")){
-						task1 = "×";
-					}
-					if(fillStateNum==31){
-						task1 = "✔";
-					}
-				}
-			}
-			log.setTaskNo2(task2);
-			
-			
-			String task3 = "✔";
-			if(!Util.isEmpty(fillcheckstr)){
-				if(fillStateNum<=0||fillStateNum>=21){
-					task3 = "✔";
-					if(fillcheckstr.substring(fillcheckstr.length()-3,fillcheckstr.length()-2).equals("1")){
-						task3 = "×";
-					}
-					if(fillStateNum==31){
-						task3 = "✔";
-					}
-				}
-			}
-			log.setTaskNo3(task3);
-			
-			
-			
-			String task4 = "✔";
-			if(!Util.isEmpty(fillcheckstr)){
-				if(fillStateNum<=0||fillStateNum>=21){
-					task4 = "✔";
-					if(fillcheckstr.substring(fillcheckstr.length()-4,fillcheckstr.length()-3).equals("1")){
-						task4 = "×";
-					}
-					if(fillStateNum==31){
-						task4 = "✔";
-					}
-				}
-			}
-			log.setTaskNo4(task4);
-			
-			
-			String task5 = "✔";
-			if(!Util.isEmpty(fillcheckstr)){
-				if(fillStateNum<=0||fillStateNum>=21){
-					task5 = "✔";
-					if(fillcheckstr.substring(fillcheckstr.length()-5,fillcheckstr.length()-4).equals("1")){
-						task5 = "×";
-					}
-					if(fillStateNum==31){
-						task5 = "✔";
-					}
-				}
-			}
-			log.setTaskNo5(task5);
-			
-			
-			String task6 = "✔";
-			if(!Util.isEmpty(fillcheckstr)){
-				if(fillStateNum<=0||fillStateNum>=21){
-					task6 = "✔";
-					if(fillcheckstr.substring(fillcheckstr.length()-6,fillcheckstr.length()-5).equals("1")){
-						task6 = "×";
-					}
-					if(fillStateNum==31){
-						task6 = "✔";
-					}
-				}
-			}
-			log.setTaskNo6(task6);
-			
-			
-			String fillState1 = log.getFillState();
-			String task7 = "";
-			//当充装状态为充前检验失败时,充后检查必须为空
-			if(fillStateNum==21){
-				task7 = "";
-			}
-			//当充装状态为充装成功且充后人员FILLCHECKNO2为空时,充装时间等于充后时间,充后检查没上来,充后必须填空
-			else if(fillState1.equals("成功充装")&&Util.isEmpty(log.getFILLCHECKNNo2())&&!Util.isEmpty(log.getEndTime1())&&log.getFillTime1().equals(log.getEndTime1())){
-				task7 = "";
-			}
-			//FILLCHECKNO2为空时,充装时间不等于充后时间,充后已经上来,用当前充装人员CngOperatorName填充
-			else if(Util.isEmpty(log.getFILLCHECKNNo2())&&!Util.isEmpty(log.getFillTime1())&&!Util.isEmpty(log.getEndTime1())&&Tool.compare_date2(log.getEndTime1(), log.getFillTime1())){
-				if(Util.isEmpty(log.getOperatorName())){
-					task7 = "";
-				}else{
-					if(log.getOperatorName().equals("未知工作人员")){
-						task7 = "";
-					}else{
-						if(!Util.isEmpty(fillcheckstr)){
-							task7 = "✔";
-							if(fillcheckstr.substring(fillcheckstr.length()-1,fillcheckstr.length()).equals("1")){
-								task7="×";
-							}
-						}else{
-							task7 = "";
-						}
-					}
-				}
-			}else if(!Util.isEmpty(log.getFILLCHECKNNo2())){
-				if(log.getFILLCHECKNName2().equals("未知工作人员")){
-					task7 = "";
-				}else{
-					if(!Util.isEmpty(fillcheckstr)){
-						task7="✔";
-						if(fillcheckstr.substring(fillcheckstr.length()-1,fillcheckstr.length())=="1"){
-							task7="×";
-						}
-					}else{
-						task7 = "";
-					}
-				}
-			}else{
-				task7 = "";
-			}
-			
-			log.setTaskNo7(task7);
-			
-			
-			
-			String task8 = "";
-			//当充装状态为充前检验失败时,充后检查必须为空
-			if(fillStateNum==21){
-				task8 = "";
-			}
-			//当充装状态为充装成功且充后人员FILLCHECKNO2为空时,充装时间等于充后时间,充后检查没上来,充后必须填空
-			else if(fillState1.equals("成功充装")&&Util.isEmpty(log.getFILLCHECKNNo2())&&!Util.isEmpty(log.getEndTime1())&&log.getFillTime1().equals(log.getEndTime1())){
-				task8 = "";
-			}
-			//FILLCHECKNO2为空时,充装时间不等于充后时间,充后已经上来,用当前充装人员CngOperatorName填充
-			else if(Util.isEmpty(log.getFILLCHECKNNo2())&&!Util.isEmpty(log.getFillTime1())&&!Util.isEmpty(log.getEndTime1())&&Tool.compare_date2(log.getEndTime1(), log.getFillTime1())){
-				if(Util.isEmpty(log.getOperatorName())){
-					task8 = "";
-				}else{
-					if(log.getOperatorName().equals("未知工作人员")){
-						task8 = "";
-					}else{
-						if(!Util.isEmpty(fillcheckstr)){
-							task8 = "✔";
-							if(fillcheckstr.substring(fillcheckstr.length()-2,fillcheckstr.length()-1).equals("1")){
-								task8="×";
-							}
-						}else{
-							task8 = "";
-						}
-					}
-				}
-			}else if(!Util.isEmpty(log.getFILLCHECKNNo2())){
-				if(log.getFILLCHECKNName2().equals("未知工作人员")){
-					task8 = "";
-				}else{
-					if(!Util.isEmpty(fillcheckstr)){
-						task8="✔";
-						if(fillcheckstr.substring(fillcheckstr.length()-2,fillcheckstr.length()-1)=="1"){
-							task8="×";
-						}
-					}else{
-						task8 = "";
-					}
-				}
-			}else{
-				task8 = "";
-			}
-			
-			log.setTaskNo8(task8);
-			
-			
-			String task9 = "";
-			//当充装状态为充前检验失败时,充后检查必须为空
-			if(fillStateNum==21){
-				task9 = "";
-			}
-			//当充装状态为充装成功且充后人员FILLCHECKNO2为空时,充装时间等于充后时间,充后检查没上来,充后必须填空
-			else if(fillState1.equals("成功充装")&&Util.isEmpty(log.getFILLCHECKNNo2())&&!Util.isEmpty(log.getEndTime1())&&log.getFillTime1().equals(log.getEndTime1())){
-				task9 = "";
-			}
-			//FILLCHECKNO2为空时,充装时间不等于充后时间,充后已经上来,用当前充装人员CngOperatorName填充
-			else if(Util.isEmpty(log.getFILLCHECKNNo2())&&!Util.isEmpty(log.getFillTime1())&&!Util.isEmpty(log.getEndTime1())&&Tool.compare_date2(log.getEndTime1(), log.getFillTime1())){
-				if(Util.isEmpty(log.getOperatorName())){
-					task9 = "";
-				}else{
-					if(log.getOperatorName().equals("未知工作人员")){
-						task9 = "";
-					}else{
-						if(!Util.isEmpty(fillcheckstr)){
-							task9 = "✔";
-							if(fillcheckstr.substring(fillcheckstr.length()-3,fillcheckstr.length()-2).equals("1")){
-								task9="×";
-							}
-						}else{
-							task9 = "";
-						}
-					}
-				}
-			}else if(!Util.isEmpty(log.getFILLCHECKNNo2())){
-				if(log.getFILLCHECKNName2().equals("未知工作人员")){
-					task9 = "";
-				}else{
-					if(!Util.isEmpty(fillcheckstr)){
-						task9="✔";
-						if(fillcheckstr.substring(fillcheckstr.length()-3,fillcheckstr.length()-2)=="1"){
-							task9="×";
-						}
-					}else{
-						task9 = "";
-					}
-				}
-			}else{
-				task9 = "";
-			}
-			
-			log.setTaskNo9(task9);
-			
-		}
-		
-		
-		
-		User u = (User) req.getSession().getAttribute(Constant.fillingSum);
-		
-		
-		
-		
-		
-		
-		map.put("total", u.getFillingSum());
-		map.put("rows", list1);
-		String result = new JSONObject().fromObject(map).toString();
-		response.setContentType("text/html;charset=utf-8");
-		PrintWriter out = response.getWriter();
-		out.write(result);
-	}
-}
-		
+package com.runzhixing.action;
+
+import java.io.PrintWriter;
+import java.sql.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import net.sf.json.JSONObject;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.struts2.ServletActionContext;
+
+import com.opensymphony.xwork2.ActionSupport;
+import com.runzhixing.bean.CNGFillLog;
+import com.runzhixing.bean.User;
+import com.runzhixing.constant.Constant;
+import com.runzhixing.packageProcedure.FillingDataQueryProcedure;
+import com.runzhixing.tool.Tool;
+import com.runzhixing.tool.Util;
+/**
+ * 告警参数设置
+ * @author 小黄
+ *
+ */
+@SuppressWarnings("serial")
+public class FillingDataQueryAction extends ActionSupport {
+	//设置新的告警参数
+	@SuppressWarnings({ "unchecked", "static-access" })
+	public void fillingDataQuery() throws Exception{
+		HttpServletResponse response = ServletActionContext.getResponse();
+		HttpServletRequest req = ServletActionContext.getRequest();
+		Map<String,Object> map=new HashMap<String,Object>();
+		User user = (User)req.getSession().getAttribute(Constant.userMark); 
+		
+		int moudel = user.getModule();
+		String ssid = (String) req.getSession().getAttribute(Constant.Privilege);
+		
+		//获取地址,默认全部
+		String province = req.getParameter("province");
+		String city = req.getParameter("city");
+		String country = req.getParameter("country");
+		if(province==null){
+			province = "";
+		}
+		if(city==null){
+			city = "";
+		}
+		if(country==null){
+			country = "";
+		}
+		String regionNo = province+city+country;//地区编号
+		regionNo = regionNo.replaceAll("(00)*$", "");
+		String operatorNo = req.getParameter("operatorNo");//操作员编号
+		String stationNo = req.getParameter("station");//充装点编号
+		String machineNo = req.getParameter("jqj");//设备编号
+		String gunNo = req.getParameter("gunNo");//气枪编号
+		String carNo = req.getParameter("carNo");//车牌号
+		int appType = Integer.parseInt(req.getParameter("appType"));//应用类型
+		int fillState = Integer.parseInt(req.getParameter("fillState"));//充装状态
+		int cylinderType= Integer.parseInt(req.getParameter("cylinderType")); //加气机	
+		
+		//开始时间
+		String sTime=req.getParameter("startTime");
+		String eTime=req.getParameter("endTime");
+		
+		Date startsTime = null;
+		//结束时间
+		Date endsTime = null;
+		// 0:时间无效 1:开始时间有效 2:结束时间有效 3:都有效
+		if(sTime!=null&&!sTime.equals("")){
+			startsTime = Util.dateChange(sTime);
+		}
+		if(eTime!=null&&!eTime.equals("")){
+			endsTime = Util.dateChange(eTime);
+		}
+		Long l = new java.util.Date().getTime();
+		if(startsTime==null){
+			startsTime= new java.sql.Date(l);
+		}
+		if(endsTime==null){
+			endsTime= new java.sql.Date(l+1000 * 3600 * 24L);
+		}
+		
+		
+		//根据地址获取地址编号
+		int pagesize = Integer.parseInt(req.getParameter("psize"));
+		int pageno = Integer.parseInt(req.getParameter("page"));
+		
+		if(stationNo==null||stationNo.equals("")){
+			stationNo =regionNo ;
+		}
+		if(ssid.length()==12&&moudel!=1){
+			stationNo = ssid;
+		}
+		int fillCheck2 = Integer.parseInt(req.getParameter("fillCheck2") != null?req.getParameter("fillCheck2"):"-1");
+		List<CNGFillLog>  list1 = new FillingDataQueryProcedure().fillingDataQuery(pagesize, pageno, operatorNo,stationNo,machineNo,gunNo,carNo,appType,fillState,startsTime,endsTime,cylinderType,fillCheck2);
+		if (list1 != null && list1.size() > 0) {
+			for(CNGFillLog log:list1){
+				String fillchecknNo1 = log.getFILLCHECKNNo1();
+				String operatorName = log.getOperatorName();
+				String fillchecknName1 = log.getFILLCHECKNName1();
+				if (StringUtils.isEmpty(fillchecknNo1) && StringUtils.isNotEmpty(operatorName) && !"未知工作人员".equals(operatorName)) {
+					log.setFILLCHECKNName1(operatorName);
+				}else if(StringUtils.isNotEmpty(fillchecknName1) && !"未知工作人员".equals(fillchecknName1)) {
+					log.setFILLCHECKNName1(fillchecknName1);
+				}else {
+					log.setFILLCHECKNName1("");
+				}
+				
+				String fillchecknNo2 = log.getFILLCHECKNNo2();
+				String fillchecknName2 = log.getFILLCHECKNName2();
+				
+				if (log.getFillStateNum() == 21 
+						|| ("成功充装".equals(log.getFillState()) && StringUtils.isEmpty(fillchecknNo2) && StringUtils.isEmpty(log.getFillTime1())
+								&& StringUtils.isEmpty(log.getEndTime1()) &&  log.getFillTime1().equals(log.getEndTime1())   )) {
+					log.setFILLCHECKNName2("");
+				}else if(StringUtils.isEmpty(fillchecknNo2) &&  StringUtils.isEmpty(log.getFillTime1()) && StringUtils.isEmpty(log.getEndTime1()) 
+						&& Util.str2Date(log.getEndTime1(), "yyyy-MM-dd HH:mm:ss").getTime() > Util.str2Date(log.getFillTime1(), "yyyy-MM-dd HH:mm:ss").getTime() 
+						&& StringUtils.isNotEmpty(operatorName) && !"未知工作人员".equals(operatorName)) {
+					log.setFILLCHECKNName2(operatorName);
+				}else if(StringUtils.isNotEmpty(fillchecknName2) && !"未知工作人员".equals(fillchecknName2)) {
+					log.setFILLCHECKNName2(fillchecknName2);
+				}else {
+					log.setFILLCHECKNName2("");
+				}
+				
+				String fillMonitorName = log.getFillMonitorName();
+				if (StringUtils.isEmpty(log.getFillMonitorNo())) {
+					if (StringUtils.isNotEmpty(fillchecknNo2) &&  !"未知工作人员".equals(fillchecknName2)) {
+						log.setFillMonitorName(fillchecknName2);
+					}else if (StringUtils.isNotEmpty(fillchecknNo1) &&  !"未知工作人员".equals(fillchecknName1)) {
+						log.setFillMonitorName(fillchecknName1);
+					}else if ( StringUtils.isNotEmpty(operatorName) &&  !"未知工作人员".equals(operatorName)) {
+						log.setFillMonitorName(operatorName);
+					}
+				}else {
+					if ("未知工作人员".equals(fillMonitorName)) {
+						log.setFillMonitorName("");
+					}
+				}
+				
+				if (StringUtils.isEmpty(log.getFillMonitorNo()) && StringUtils.isNotEmpty(fillchecknNo2) &&  !"未知工作人员".equals(fillchecknName2)) {
+					log.setFillMonitorName(fillchecknName2);
+				}else if (StringUtils.isEmpty(log.getFillMonitorNo()) && StringUtils.isNotEmpty(fillchecknNo1) &&  !"未知工作人员".equals(fillchecknName1)) {
+					log.setFillMonitorName(fillchecknName1);
+				}else if (StringUtils.isEmpty(log.getFillMonitorNo()) && StringUtils.isNotEmpty(operatorName) &&  !"未知工作人员".equals(operatorName)) {
+					log.setFillMonitorName(operatorName);
+				}else if(StringUtils.isNotEmpty(log.getFillMonitorNo()) && "未知工作人员".equals(fillMonitorName)){
+					log.setFillMonitorName("");
+				}
+				
+				String fillcheckstr = log.getFillcheckstr();
+				int fillStateNum = log.getFillStateNum();
+				String task1 = "✔";
+				String task2 = "✔";
+				String task3 = "✔";
+				String task4 = "✔";
+				String task5 = "✔";
+				String task6 = "✔";
+				if(!Util.isEmpty(fillcheckstr)){
+					if(fillStateNum<=0||fillStateNum>=21){
+						if(fillcheckstr.substring(fillcheckstr.length()-1,fillcheckstr.length()).equals("1")){
+							task1 = "×";
+						}
+						if(fillcheckstr.substring(fillcheckstr.length()-2,fillcheckstr.length()-1).equals("1")){
+							task2 = "×";
+						}
+						if(fillcheckstr.substring(fillcheckstr.length()-3,fillcheckstr.length()-2).equals("1")){
+							task3 = "×";
+						}
+						if(fillcheckstr.substring(fillcheckstr.length()-4,fillcheckstr.length()-3).equals("1")){
+							task4 = "×";
+						}
+						if(fillcheckstr.substring(fillcheckstr.length()-5,fillcheckstr.length()-4).equals("1")){
+							task5 = "×";
+						}
+						if(fillcheckstr.substring(fillcheckstr.length()-6,fillcheckstr.length()-5).equals("1")){
+							task6 = "×";
+						}
+						if(fillStateNum==31){
+							task1 = "✔";
+							task2 = "✔";
+							task3 = "✔";
+							task4 = "✔";
+							task5 = "✔";
+							task6 = "✔";
+						}
+					}
+				}
+				log.setTaskNo1(task1);
+				log.setTaskNo2(task2);
+				log.setTaskNo3(task3);
+				log.setTaskNo4(task4);
+				log.setTaskNo5(task5);
+				log.setTaskNo6(task6);
+				
+				//当充装状态为充前检验失败时,充后检查必须为空
+				//当充装状态为充装成功且充后人员FILLCHECKNO2为空时,充装时间等于充后时间,充后检查没上来,充后必须填空
+				//FILLCHECKNO2为空时,充装时间不等于充后时间,充后已经上来,用当前充装人员CngOperatorName填充
+				String task7 = "";
+				String task8 = "";
+				String task9 = "";
+				String task10 = "";
+				String task11 = "";
+				String task12 = "";
+				if(Util.isEmpty(log.getFILLCHECKNNo2())&&!Util.isEmpty(log.getFillTime1())&&!Util.isEmpty(log.getEndTime1())&&Tool.compare_date2(log.getEndTime1(), log.getFillTime1())){
+					if(!Util.isEmpty(log.getOperatorName()) && !"未知工作人员".equals(log.getOperatorName()) && !Util.isEmpty(fillcheckstr)){
+						task7 = "✔";
+						task8 = "✔";
+						task9 = "✔";
+						task10 = "✔";
+						task11 = "✔";
+						task12 = "✔";
+						if(fillcheckstr.substring(fillcheckstr.length()-1,fillcheckstr.length()).equals("1")){
+							task7="×";
+						}
+						if(fillcheckstr.substring(fillcheckstr.length()-2,fillcheckstr.length()-1).equals("1")){
+							task8="×";
+						}
+						if(fillcheckstr.substring(fillcheckstr.length()-3,fillcheckstr.length()-2).equals("1")){
+							task9="×";
+						}
+						if(fillcheckstr.substring(fillcheckstr.length()-6,fillcheckstr.length()-5).equals("1")){
+							task10="×";
+						}
+						if(fillcheckstr.substring(fillcheckstr.length()-7,fillcheckstr.length()-6).equals("1")){
+							task11="×";
+						}
+						if(fillcheckstr.substring(fillcheckstr.length()-8,fillcheckstr.length()-7).equals("1")){
+							task12="×";
+						}
+					}
+				}else if(!Util.isEmpty(log.getFILLCHECKNNo2())){
+					if(!"未知工作人员".equals(log.getFILLCHECKNName2()) && !Util.isEmpty(fillcheckstr)){
+						task7="✔";
+						task8="✔";
+						task9="✔";
+						task10 = "✔";
+						task11 = "✔";
+						task12 = "✔";
+						if(fillcheckstr.substring(fillcheckstr.length()-1,fillcheckstr.length()).equals("1")){
+							task7="×";
+						}
+						if(fillcheckstr.substring(fillcheckstr.length()-2,fillcheckstr.length()-1).equals("1")){
+							task8="×";
+						}
+						if(fillcheckstr.substring(fillcheckstr.length()-3,fillcheckstr.length()-2).equals("1")){
+							task9="×";
+						}
+						if(fillcheckstr.substring(fillcheckstr.length()-6,fillcheckstr.length()-5).equals("1")){
+							task10="×";
+						}
+						if(fillcheckstr.substring(fillcheckstr.length()-7,fillcheckstr.length()-6).equals("1")){
+							task11="×";
+						}
+						if(fillcheckstr.substring(fillcheckstr.length()-8,fillcheckstr.length()-7).equals("1")){
+							task12="×";
+						}
+					}
+				}
+				
+				log.setTaskNo7(task7);
+				log.setTaskNo8(task8);
+				log.setTaskNo9(task9);
+				log.setTaskNo10(task10);
+				log.setTaskNo11(task11);
+				log.setTaskNo12(task12);
+				
+			}
+		}
+		User u = (User) req.getSession().getAttribute(Constant.fillingSum);
+		
+		map.put("total", u.getFillingSum());
+		map.put("rows", list1);
+		String result = new JSONObject().fromObject(map).toString();
+		response.setContentType("text/html;charset=utf-8");
+		PrintWriter out = response.getWriter();
+		out.write(result);
+	}
+}
+		

+ 427 - 391
src/com/runzhixing/bean/CNGFillLog.java

@@ -1,391 +1,427 @@
-package com.runzhixing.bean;
-
-import java.util.Date;
-
-public class CNGFillLog {
-	
-	private String taskNo1 = "";
-	private String taskNo2 = "";
-	private String taskNo3 = "";
-	private String taskNo4 = "";
-	private String taskNo5 = "";
-	private String taskNo6 = "";
-	private String taskNo7 = "";
-	private String taskNo8 = "";
-	private String taskNo9 = "";
-	private String operatorNameType = "车用气瓶充装";
-	private String mediaType;
-	
-	
-	
-	public String getMediaType() {
-//		if(this.media==0){
-//			this.mediaType="CNG_高压气体";
-//		}else if(this.media==1){
-//			this.mediaType="LNG_低温液化天然气";
-//		}else{
-//			this.mediaType="其他";
-//		}
-		
-		if(this.media==0){
-			return "CNG_高压气体";
-		}else if(this.media==1){
-			return "LNG_低温液化天然气";
-		}else{
-			return "其他";
-		}
-//		return mediaType;
-	}
-	public void setMediaType(String mediaType) {
-		
-		this.mediaType = mediaType;
-	}
-	public String getOperatorNameType() {
-		return operatorNameType;
-	}
-	public void setOperatorNameType(String operatorNameType) {
-		this.operatorNameType = operatorNameType;
-	}
-	public String getTaskNo9() {
-		return taskNo9;
-	}
-	public void setTaskNo9(String taskNo9) {
-		this.taskNo9 = taskNo9;
-	}
-	public String getTaskNo1() {
-		return taskNo1;
-	}
-	public void setTaskNo1(String taskNo1) {
-		this.taskNo1 = taskNo1;
-	}
-	public String getTaskNo2() {
-		return taskNo2;
-	}
-	public void setTaskNo2(String taskNo2) {
-		this.taskNo2 = taskNo2;
-	}
-	public String getTaskNo3() {
-		return taskNo3;
-	}
-	public void setTaskNo3(String taskNo3) {
-		this.taskNo3 = taskNo3;
-	}
-	public String getTaskNo4() {
-		return taskNo4;
-	}
-	public void setTaskNo4(String taskNo4) {
-		this.taskNo4 = taskNo4;
-	}
-	public String getTaskNo5() {
-		return taskNo5;
-	}
-	public void setTaskNo5(String taskNo5) {
-		this.taskNo5 = taskNo5;
-	}
-	public String getTaskNo6() {
-		return taskNo6;
-	}
-	public void setTaskNo6(String taskNo6) {
-		this.taskNo6 = taskNo6;
-	}
-	public String getTaskNo7() {
-		return taskNo7;
-	}
-	public void setTaskNo7(String taskNo7) {
-		this.taskNo7 = taskNo7;
-	}
-	public String getTaskNo8() {
-		return taskNo8;
-	}
-	public void setTaskNo8(String taskNo8) {
-		this.taskNo8 = taskNo8;
-	}
-	private String FILLCHECKNName1;
-	private String FILLCHECKNName2;
-	
-	private String FILLCHECKNNo1;
-	private String FILLCHECKNNo2;
-	private int fillcheck;
-	private String fillcheckstr;
-	
-	
-	
-	public String getFILLCHECKNNo1() {
-		return FILLCHECKNNo1;
-	}
-	public void setFILLCHECKNNo1(String fILLCHECKNNo1) {
-		FILLCHECKNNo1 = fILLCHECKNNo1;
-	}
-	public String getFILLCHECKNNo2() {
-		return FILLCHECKNNo2;
-	}
-	public void setFILLCHECKNNo2(String fILLCHECKNNo2) {
-		FILLCHECKNNo2 = fILLCHECKNNo2;
-	}
-	public String getFILLCHECKNName1() {
-		return FILLCHECKNName1;
-	}
-	public void setFILLCHECKNName1(String fILLCHECKNName1) {
-		FILLCHECKNName1 = fILLCHECKNName1;
-	}
-	public String getFILLCHECKNName2() {
-		return FILLCHECKNName2;
-	}
-	public void setFILLCHECKNName2(String fILLCHECKNName2) {
-		FILLCHECKNName2 = fILLCHECKNName2;
-	}
-	public int getFillcheck() {
-		return fillcheck;
-	}
-	public void setFillcheck(int fillcheck) {
-		this.fillcheck = fillcheck;
-	}
-	public String getFillcheckstr() {
-		return fillcheckstr;
-	}
-	public void setFillcheckstr(String fillcheckstr) {
-		this.fillcheckstr = fillcheckstr;
-	}
-	private int fillStateNum;
-	
-	public int getFillStateNum() {
-		return fillStateNum;
-	}
-	public void setFillStateNum(int fillStateNum) {
-		this.fillStateNum = fillStateNum;
-	}
-	private Date fillTime=null;//充装时间
-	private Date endTime=null;//结束时间
-	private String fillTime1=null;//充装时间
-	public String getFillTime1() {
-		return fillTime1;
-	}
-	public void setFillTime1(String fillTime1) {
-		this.fillTime1 = fillTime1;
-	}
-	public String getEndTime1() {
-		return endTime1;
-	}
-	public void setEndTime1(String endTime1) {
-		this.endTime1 = endTime1;
-	}
-	
-	public String getTac() {
-		return tac;
-	}
-	public void setTac(String tac) {
-		this.tac = tac;
-	}
-	private String endTime1=null;//结束时间
-	private String tagUid=null;//标签UID
-	private String tac=null;//标签UID
-	private String tagNo=null;//标签编号
-	private int tagType=0;//标签类型
-	private String appType=null;//应用类型
-	private String fillState=null;//充装状态
-	private String stationNo=null;//充装站编号
-	private String machineNo=null;//加气机编号
-	
-	private String stationName=null;//充装站编号
-	private String machineName=null;//加气机编号
-	private String operatorNo=null;//操作员姓名
-	
-	private int gunNo=0;//加气枪编号
-	private String operatorName=null;//操作员姓名
-	private String carNo=null;//车牌号
-	private int plateType;
-	private String plateTypeName;//车牌类型
-	private String regNo=null;//使用登记证
-	private int cylinderNum=0;//气瓶数量
-	private String leftNumber=null;//剩余充装次数
-	private int nowNumber=0;//已充装次数
-	private float lowPress=0.0f;//前压
-	private float highPress=0.0f;//后压
-	private float flux=0.0f;//流量
-	private float money=0.0f;//金额
-	private int turnOverType;//周转类型 0 非周转 1 周转
-	private int benefitType;//补贴类型,0 无 1 补贴
-	private String fixCarNo;//车牌号修正
-	
-	
-	
-	public String getStationName() {
-		return stationName;
-	}
-	public void setStationName(String stationName) {
-		this.stationName = stationName;
-	}
-	public String getMachineName() {
-		return machineName;
-	}
-	public void setMachineName(String machineName) {
-		this.machineName = machineName;
-	}
-	public String getOperatorNo() {
-		return operatorNo;
-	}
-	public void setOperatorNo(String operatorNo) {
-		this.operatorNo = operatorNo;
-	}
-	public String getFixCarNo() {
-	    return fixCarNo;
-	}
-	public void setFixCarNo(String fixCarNo) {
-	    this.fixCarNo = fixCarNo;
-	}
-	public int getBenefitType() {
-	    return benefitType;
-	}
-	public void setBenefitType(int benefitType) {
-	    this.benefitType = benefitType;
-	}
-	public int getTurnOverType() {
-		return turnOverType;
-	}
-	public void setTurnOverType(int turnOverType) {
-		this.turnOverType = turnOverType;
-	}
-	public String getAppType() {
-		return this.appType;
-	}
-	public void setAppType(String appType) {
-		this.appType = appType;
-	}
-	public String getCarNo() {
-		return this.carNo;
-	}
-	public void setCarNo(String carNo) {
-		this.carNo = carNo;
-	}
-	public int getCylinderNum() {
-		return this.cylinderNum;
-	}
-	public void setCylinderNum(int cylinderNum) {
-		this.cylinderNum = cylinderNum;
-	}
-	public Date getEndTime() {
-		return this.endTime;
-	}
-	public void setEndTime(Date endTime) {
-		this.endTime = endTime;
-	}
-	public String getFillState() {
-		return this.fillState;
-	}
-	public void setFillState(String fillState) {
-		this.fillState = fillState;
-	}
-	public Date getFillTime() {
-		return fillTime;
-	}
-	public void setFillTime(Date fillTime) {
-		this.fillTime = fillTime;
-	}
-	public int getGunNo() {
-		return this.gunNo;
-	}
-	public void setGunNo(int gunNo) {
-		this.gunNo = gunNo;
-	}
-	public String getMachineNo() {
-		return this.machineNo;
-	}
-	public void setMachineNo(String machineNo) {
-		this.machineNo = machineNo;
-	}
-	public String getOperatorName() {
-		return this.operatorName;
-	}
-	public void setOperatorName(String operatorNo) {
-		this.operatorName = operatorNo;
-	}
-	public String getRegNo() {
-		return this.regNo;
-	}
-	public void setRegNo(String regNo) {
-		this.regNo = regNo;
-	}
-	public String getStationNo() {
-		return this.stationNo;
-	}
-	public void setStationNo(String stationNo) {
-		this.stationNo = stationNo;
-	}
-	public String getTagNo() {
-		return this.tagNo;
-	}
-	public void setTagNo(String tagNo) {
-		this.tagNo = tagNo;
-	}
-	public int getTagType() {
-		return this.tagType;
-	}
-	public void setTagType(int tagType) {
-		this.tagType = tagType;
-	}
-	public String getTagUid() {
-		return this.tagUid;
-	}
-	public void setTagUid(String tagUid) {
-		this.tagUid = tagUid;
-	}
-	
-	public void setLeftNumber(String allNumber) {
-		this.leftNumber = allNumber;
-	}
-	public String getLeftNumber() {
-		return this.leftNumber;
-	}
-	
-	public int getNowNumber() {
-		return this.nowNumber;
-	}
-	public void setNowNumber(int nowNumber) {
-		this.nowNumber = nowNumber;
-	}
-	
-	public float getLowPress() {
-		return this.lowPress;
-	}
-	public void setLowPress(float lowPress) {
-		this.lowPress = lowPress;
-	}
-	public float getHighPress() {
-		return this.highPress;
-	}
-	public void setHighPress(float highPress) {
-		this.highPress = highPress;
-	}
-	public float getFlux() {
-		return this.flux;
-	}
-	public void setFlux(float flux) {
-		this.flux = flux;
-	}
-	public float getMoney() {
-		return this.money;
-	}
-	public void setMoney(float money) {
-		this.money = money;
-	}
-	public int getPlateType() {
-		return this.plateType;
-	}
-	public void setPlateType(int plateType) {
-		this.plateType = plateType;
-	}
-	public String getPlateTypeName() {
-		return this.plateTypeName;
-	}
-	public void setPlateTypeName(String plateTypeName) {
-		this.plateTypeName = plateTypeName;
-	}
-	private int media;
-	public int getMedia() {
-		return media;
-	}
-	public void setMedia(int media) {
-		this.media = media;
-	}
-	
-}
+package com.runzhixing.bean;
+
+import java.util.Date;
+
+public class CNGFillLog {
+	
+	private String taskNo1 = "";
+	private String taskNo2 = "";
+	private String taskNo3 = "";
+	private String taskNo4 = "";
+	private String taskNo5 = "";
+	private String taskNo6 = "";
+	private String taskNo7 = "";
+	private String taskNo8 = "";
+	private String taskNo9 = "";
+	private String taskNo10 = "";
+	private String taskNo11 = "";
+	private String taskNo12 = "";
+	private String operatorNameType = "车用气瓶充装";
+	private String mediaType;
+	
+	
+	
+	public String getMediaType() {
+//		if(this.media==0){
+//			this.mediaType="CNG_高压气体";
+//		}else if(this.media==1){
+//			this.mediaType="LNG_低温液化天然气";
+//		}else{
+//			this.mediaType="其他";
+//		}
+		
+		if(this.media==0){
+			return "CNG_高压气体";
+		}else if(this.media==1){
+			return "LNG_低温液化天然气";
+		}else{
+			return "其他";
+		}
+//		return mediaType;
+	}
+	public void setMediaType(String mediaType) {
+		
+		this.mediaType = mediaType;
+	}
+	public String getOperatorNameType() {
+		return operatorNameType;
+	}
+	public void setOperatorNameType(String operatorNameType) {
+		this.operatorNameType = operatorNameType;
+	}
+	public String getTaskNo9() {
+		return taskNo9;
+	}
+	public void setTaskNo9(String taskNo9) {
+		this.taskNo9 = taskNo9;
+	}
+	public String getTaskNo1() {
+		return taskNo1;
+	}
+	public void setTaskNo1(String taskNo1) {
+		this.taskNo1 = taskNo1;
+	}
+	public String getTaskNo2() {
+		return taskNo2;
+	}
+	public void setTaskNo2(String taskNo2) {
+		this.taskNo2 = taskNo2;
+	}
+	public String getTaskNo3() {
+		return taskNo3;
+	}
+	public void setTaskNo3(String taskNo3) {
+		this.taskNo3 = taskNo3;
+	}
+	public String getTaskNo4() {
+		return taskNo4;
+	}
+	public void setTaskNo4(String taskNo4) {
+		this.taskNo4 = taskNo4;
+	}
+	public String getTaskNo5() {
+		return taskNo5;
+	}
+	public void setTaskNo5(String taskNo5) {
+		this.taskNo5 = taskNo5;
+	}
+	public String getTaskNo6() {
+		return taskNo6;
+	}
+	public void setTaskNo6(String taskNo6) {
+		this.taskNo6 = taskNo6;
+	}
+	public String getTaskNo7() {
+		return taskNo7;
+	}
+	public void setTaskNo7(String taskNo7) {
+		this.taskNo7 = taskNo7;
+	}
+	public String getTaskNo8() {
+		return taskNo8;
+	}
+	public void setTaskNo8(String taskNo8) {
+		this.taskNo8 = taskNo8;
+	}
+	public String getTaskNo10() {
+		return taskNo10;
+	}
+	public void setTaskNo10(String taskNo10) {
+		this.taskNo10 = taskNo10;
+	}
+	public String getTaskNo11() {
+		return taskNo11;
+	}
+	public void setTaskNo11(String taskNo11) {
+		this.taskNo11 = taskNo11;
+	}
+	public String getTaskNo12() {
+		return taskNo12;
+	}
+	public void setTaskNo12(String taskNo12) {
+		this.taskNo12 = taskNo12;
+	}
+
+	private String FILLCHECKNName1;
+	private String FILLCHECKNName2;
+	private String FillMonitorName;
+	
+	private String FILLCHECKNNo1;
+	private String FILLCHECKNNo2;
+	private String FillMonitorNo;
+	private int fillcheck;
+	private String fillcheckstr;
+	
+	
+	
+	public String getFillMonitorName() {
+		return FillMonitorName;
+	}
+	public void setFillMonitorName(String fillMonitorName) {
+		FillMonitorName = fillMonitorName;
+	}
+	public String getFillMonitorNo() {
+		return FillMonitorNo;
+	}
+	public void setFillMonitorNo(String fillMonitorNo) {
+		FillMonitorNo = fillMonitorNo;
+	}
+	public String getFILLCHECKNNo1() {
+		return FILLCHECKNNo1;
+	}
+	public void setFILLCHECKNNo1(String fILLCHECKNNo1) {
+		FILLCHECKNNo1 = fILLCHECKNNo1;
+	}
+	public String getFILLCHECKNNo2() {
+		return FILLCHECKNNo2;
+	}
+	public void setFILLCHECKNNo2(String fILLCHECKNNo2) {
+		FILLCHECKNNo2 = fILLCHECKNNo2;
+	}
+	public String getFILLCHECKNName1() {
+		return FILLCHECKNName1;
+	}
+	public void setFILLCHECKNName1(String fILLCHECKNName1) {
+		FILLCHECKNName1 = fILLCHECKNName1;
+	}
+	public String getFILLCHECKNName2() {
+		return FILLCHECKNName2;
+	}
+	public void setFILLCHECKNName2(String fILLCHECKNName2) {
+		FILLCHECKNName2 = fILLCHECKNName2;
+	}
+	public int getFillcheck() {
+		return fillcheck;
+	}
+	public void setFillcheck(int fillcheck) {
+		this.fillcheck = fillcheck;
+	}
+	public String getFillcheckstr() {
+		return fillcheckstr;
+	}
+	public void setFillcheckstr(String fillcheckstr) {
+		this.fillcheckstr = fillcheckstr;
+	}
+	private int fillStateNum;
+	
+	public int getFillStateNum() {
+		return fillStateNum;
+	}
+	public void setFillStateNum(int fillStateNum) {
+		this.fillStateNum = fillStateNum;
+	}
+	private Date fillTime=null;//充装时间
+	private Date endTime=null;//结束时间
+	private String fillTime1=null;//充装时间
+	public String getFillTime1() {
+		return fillTime1;
+	}
+	public void setFillTime1(String fillTime1) {
+		this.fillTime1 = fillTime1;
+	}
+	public String getEndTime1() {
+		return endTime1;
+	}
+	public void setEndTime1(String endTime1) {
+		this.endTime1 = endTime1;
+	}
+	
+	public String getTac() {
+		return tac;
+	}
+	public void setTac(String tac) {
+		this.tac = tac;
+	}
+	private String endTime1=null;//结束时间
+	private String tagUid=null;//标签UID
+	private String tac=null;//标签UID
+	private String tagNo=null;//标签编号
+	private int tagType=0;//标签类型
+	private String appType=null;//应用类型
+	private String fillState=null;//充装状态
+	private String stationNo=null;//充装站编号
+	private String machineNo=null;//加气机编号
+	
+	private String stationName=null;//充装站编号
+	private String machineName=null;//加气机编号
+	private String operatorNo=null;//操作员姓名
+	
+	private int gunNo=0;//加气枪编号
+	private String operatorName=null;//操作员姓名
+	private String carNo=null;//车牌号
+	private int plateType;
+	private String plateTypeName;//车牌类型
+	private String regNo=null;//使用登记证
+	private int cylinderNum=0;//气瓶数量
+	private String leftNumber=null;//剩余充装次数
+	private int nowNumber=0;//已充装次数
+	private float lowPress=0.0f;//前压
+	private float highPress=0.0f;//后压
+	private float flux=0.0f;//流量
+	private float money=0.0f;//金额
+	private int turnOverType;//周转类型 0 非周转 1 周转
+	private int benefitType;//补贴类型,0 无 1 补贴
+	private String fixCarNo;//车牌号修正
+	
+	
+	
+	public String getStationName() {
+		return stationName;
+	}
+	public void setStationName(String stationName) {
+		this.stationName = stationName;
+	}
+	public String getMachineName() {
+		return machineName;
+	}
+	public void setMachineName(String machineName) {
+		this.machineName = machineName;
+	}
+	public String getOperatorNo() {
+		return operatorNo;
+	}
+	public void setOperatorNo(String operatorNo) {
+		this.operatorNo = operatorNo;
+	}
+	public String getFixCarNo() {
+	    return fixCarNo;
+	}
+	public void setFixCarNo(String fixCarNo) {
+	    this.fixCarNo = fixCarNo;
+	}
+	public int getBenefitType() {
+	    return benefitType;
+	}
+	public void setBenefitType(int benefitType) {
+	    this.benefitType = benefitType;
+	}
+	public int getTurnOverType() {
+		return turnOverType;
+	}
+	public void setTurnOverType(int turnOverType) {
+		this.turnOverType = turnOverType;
+	}
+	public String getAppType() {
+		return this.appType;
+	}
+	public void setAppType(String appType) {
+		this.appType = appType;
+	}
+	public String getCarNo() {
+		return this.carNo;
+	}
+	public void setCarNo(String carNo) {
+		this.carNo = carNo;
+	}
+	public int getCylinderNum() {
+		return this.cylinderNum;
+	}
+	public void setCylinderNum(int cylinderNum) {
+		this.cylinderNum = cylinderNum;
+	}
+	public Date getEndTime() {
+		return this.endTime;
+	}
+	public void setEndTime(Date endTime) {
+		this.endTime = endTime;
+	}
+	public String getFillState() {
+		return this.fillState;
+	}
+	public void setFillState(String fillState) {
+		this.fillState = fillState;
+	}
+	public Date getFillTime() {
+		return fillTime;
+	}
+	public void setFillTime(Date fillTime) {
+		this.fillTime = fillTime;
+	}
+	public int getGunNo() {
+		return this.gunNo;
+	}
+	public void setGunNo(int gunNo) {
+		this.gunNo = gunNo;
+	}
+	public String getMachineNo() {
+		return this.machineNo;
+	}
+	public void setMachineNo(String machineNo) {
+		this.machineNo = machineNo;
+	}
+	public String getOperatorName() {
+		return this.operatorName;
+	}
+	public void setOperatorName(String operatorNo) {
+		this.operatorName = operatorNo;
+	}
+	public String getRegNo() {
+		return this.regNo;
+	}
+	public void setRegNo(String regNo) {
+		this.regNo = regNo;
+	}
+	public String getStationNo() {
+		return this.stationNo;
+	}
+	public void setStationNo(String stationNo) {
+		this.stationNo = stationNo;
+	}
+	public String getTagNo() {
+		return this.tagNo;
+	}
+	public void setTagNo(String tagNo) {
+		this.tagNo = tagNo;
+	}
+	public int getTagType() {
+		return this.tagType;
+	}
+	public void setTagType(int tagType) {
+		this.tagType = tagType;
+	}
+	public String getTagUid() {
+		return this.tagUid;
+	}
+	public void setTagUid(String tagUid) {
+		this.tagUid = tagUid;
+	}
+	
+	public void setLeftNumber(String allNumber) {
+		this.leftNumber = allNumber;
+	}
+	public String getLeftNumber() {
+		return this.leftNumber;
+	}
+	
+	public int getNowNumber() {
+		return this.nowNumber;
+	}
+	public void setNowNumber(int nowNumber) {
+		this.nowNumber = nowNumber;
+	}
+	
+	public float getLowPress() {
+		return this.lowPress;
+	}
+	public void setLowPress(float lowPress) {
+		this.lowPress = lowPress;
+	}
+	public float getHighPress() {
+		return this.highPress;
+	}
+	public void setHighPress(float highPress) {
+		this.highPress = highPress;
+	}
+	public float getFlux() {
+		return this.flux;
+	}
+	public void setFlux(float flux) {
+		this.flux = flux;
+	}
+	public float getMoney() {
+		return this.money;
+	}
+	public void setMoney(float money) {
+		this.money = money;
+	}
+	public int getPlateType() {
+		return this.plateType;
+	}
+	public void setPlateType(int plateType) {
+		this.plateType = plateType;
+	}
+	public String getPlateTypeName() {
+		return this.plateTypeName;
+	}
+	public void setPlateTypeName(String plateTypeName) {
+		this.plateTypeName = plateTypeName;
+	}
+	private int media;
+	public int getMedia() {
+		return media;
+	}
+	public void setMedia(int media) {
+		this.media = media;
+	}
+	
+}

+ 5 - 4
src/com/runzhixing/config/config.properties

@@ -1,10 +1,11 @@
 driver=oracle.jdbc.OracleDriver
 #url=jdbc:oracle:thin:@//61.188.37.164:3355/SCJGQPBQ
+#username=cngdba
+#password=nxBot*5087
 url=jdbc:oracle:thin:@//192.168.1.8:1521/cng
 username=cngdba
 password=temp1234
-#password=nxBot*5087
-whitelist=localhost;127.0.0.1;218.95.174.32;nx.cngrfid.com;111.51.123.243;192.168.1.110;
+whitelist=localhost;127.0.0.1;218.95.174.32;nx.cngrfid.com;111.51.123.243;192.168.1.110;110.185.229.92;110.185.230.12;110.185.229.196;61.188.37.164;
 company=\u56DB\u5DDD\u6DA6\u667A\u5174\u79D1\u6280\u6709\u9650\u516C\u53F8
 unified_login_baseUrl=http://111.50.160.216:8083/
 unified_login_redirectUrl=https://nx.cngrfid.com/cng3/nxlogin.do
@@ -24,6 +25,6 @@ integration_login_clientId=qpzlaqzs
 integration_login_clientSecret=5ebae3ab1ab44af2a7b02dd5b8a2da80
 
 statistics_path=D://statistics
-secret_key=1213123
-nx_user=宁夏
+secret_key=nxycxzywt
+nx_user=ningxia
 nx_pwd=nx123456

+ 106 - 104
src/com/runzhixing/config/sqlxml/Copy of getRegion.xml

@@ -1,105 +1,107 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.runzhixing.dao.interf.AuthorityRegionInterface">
-	<resultMap type="com.runzhixing.bean.DynamicattemptMap" id="dynamicattemptMap">
-		<result property="TMSTATIONNO" column="tmstationno"/>
-		<result property="TMMACHINENO" column="tmmachineno"/>
-		<result property="TMTYPE" column="tmtype"/>
-		<result property="TMMANU" column="tmmanu"/>
-		<result property="TMGUNNUM" column="tmgunnum"/>
-		<result property="TMOPTYPE" column="tmoptype"/>
-		<result property="TMSTATE" column="tmstate"/>
-		<result property="TMGUNDIR" column="tmgundir"/>
-		
-		<result property="TSDSTATIONNO" column="tsdstationno"/>
-		<result property="TSDMACHINENO" column="tsdmachineno"/>
-		<result property="TSDGUNNO" column="tsdgunno"/>
-		<result property="TSDOPERATORNO" column="tsdoperatorno"/>
-		<result property="TSDSTATE" column="tsdstate"/>
-		<result property="TSDOPERTIME" column="tsdopertime"/>
-		<result property="TSDENDTIME" column="tsdendtime"/>
-		<result property="TSDCARNO" column="tsdcarno"/>
-		<result property="TSDAPPTYPE" column="tsdapptype"/>
-		<result property="TSDTURNOVERTYPE" column="tsdturnovertype"/>
-		<result property="TSDPLATETYPE" column="tsdplatetype" />
-		
-		<result property="TODSTARTTIME" column="todstarttime"/>
-		<result property="TODENDTIME" column="todendtime"/>
-		
-		<result property="TOSTATIONNO" column="tostationno"/>
-		<result property="TOOPERATORNO" column="tooperatorno"/>
-		<result property="TONAME" column="toname"/>
-		<result property="TOIDNO" column="toidno"/>
-		<result property="TOLICENCE" column="tolicence"/>
-		<result property="TOLICENCEORG" column="tolicenceorg"/>
-		<result property="TOLICENCEDATE" column="tolicencedate"/>
-		<result property="TOVALIDITY" column="tovalidity"/>
-		<result property="TOSEX" column="tosex"/>
-	
-	</resultMap>
-	<select id="getDynamicattempt" parameterType="com.runzhixing.util.bean.ConditionParameter" resultMap="dynamicattemptMap">
-	
-		select 
-				tm.stationno as TMSTATIONNO,
-				tm.machineno as TMMACHINENO,
-				tm.type as TMTYPE,
-				tm.manu as TMMANU,
-				tm.gunnum as TMGUNNUM,
-				tm.optype as TMOPTYPE,
-				tm.state as TMSTATE,
-				tm.gundir as TMGUNDIR,
-				
-				tsd.stationno as TSDSTATIONNO,
-				tsd.machineno as TSDMACHINENO,
-				tsd.gunno as TSDGUNNO,
-				tsd.operatorno as TSDOPERATORNO,
-				tsd.state as TSDSTATE,
-				tsd.opertime as TSDOPERTIME,
-				tsd.endtime as TSDENDTIME,
-				tsd.carno as TSDCARNO,
-		        tsd.apptype as TSDAPPTYPE,
-		        tsd.turnovertype as TSDTURNOVERTYPE,
-				tsd.platetype as TSDPLATETYPE,
-				
-		        tod.starttime as TODSTARTTIME,
-				tod.endtime as TODENDTIME,
-				
-				to.stationno as TOSTATION,
-				to.operatorno as TOOPERATORNO, 
-				to.name as TONAME, 
-				to.idno as TOIDNO, 
-				to.licence as TOLICENCE, 
-				to.licenceorg as TOLICENCEORG, 
-				to.licencedate as TOLICENCEDATE, 
-				to.validity as TOVALIDITY,
-				to.sex as TOSEX
-				
-			from 
-				tb_cngmachine tm,
-				tb_cngstation_dyn tsd,
-				tb_cngoperator_duty tod,
-				tb_cngoperator to
-			where
-				tm.STATIONNO = #{cpstring1}
-			and
-				tsd.STATIONNO = tm.STATIONNO
-			and
-			 	tsd.MACHINENO = tm.machineno
-			and
-				tod.STATIONNO = tsd.STATIONNO
-			and
-				tod.MACHINENO = tsd.MACHINENO
-			and
-				tod.GUNNO = tsd.gunno
-			and 
-				tod.OPERATORNO = tsd.operatorno
-			and
-				to.operatorno = tod.OPERATORNO			
-				 		
-			
-	</select>
-	
-	
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.runzhixing.dao.interf.AuthorityRegionInterface">
+	<resultMap type="com.runzhixing.bean.DynamicattemptMap" id="dynamicattemptMap">
+		<result column="TMSTATIONNO" property="tmstationno"/>
+		<result column="TMMACHINENO" property="tmmachineno"/>
+		<result column="TMTYPE" property="tmtype"/>
+		<result column="TMMANU" property="tmmanu"/>
+		<result column="TMGUNNUM" property="tmgunnum"/>
+		<result column="TMOPTYPE" property="tmoptype"/>
+		<result column="TMSTATE" property="tmstate"/>
+		<result column="TMGUNDIR" property="tmgundir"/>
+		<collection property="tbcngstationdyn" ofType="com.runzhixing.bean.DynamicattemptMap1">
+			<result column="TSDSTATIONNO" property="tsdstationno"/>
+			<result column="TSDMACHINENO" property="tsdmachineno"/>
+			<result column="TSDGUNNO" property="tsdgunno"/>
+			<result column="TSDOPERATORNO" property="tsdoperatorno"/>
+			<result column="TSDSTATE" property="tsdstate"/>
+			<result column="TSDOPERTIME" property="tsdopertime"/>
+			<result column="TSDENDTIME" property="tsdendtime"/>
+			<result column="TSDCARNO" property="tsdcarno"/>
+			<result column="TSDAPPTYPE" property="tsdapptype"/>
+			<result column="TSDTURNOVERTYPE" property="tsdturnovertype"/>
+			<result column="TSDPLATETYPE" property="tsdplatetype" />
+			<collection property="tbcngoperatorduty" ofType="com.runzhixing.bean.DynamicattemptMap2">
+				<result column="TODSTARTTIME" property="todstarttime"/>
+				<result column="TODENDTIME" property="todendtime"/>
+				<collection property="tbcngoperator" ofType="com.runzhixing.bean.DynamicattemptMap3">
+					<result column="TOSTATIONNO" property="tostationno"/>
+					<result column="TOOPERATORNO" property="tooperatorno"/>
+					<result column="TONAME" property="toname"/>
+					<result column="TOIDNO" property="toidno"/>
+					<result column="TOLICENCE" property="tolicence"/>
+					<result column="TOLICENCEORG" property="tolicenceorg"/>
+					<result column="TOLICENCEDATE" property="tolicencedate"/>
+					<result column="TOVALIDITY" property="tovalidity"/>
+					<result column="TOSEX" property="tosex"/>
+				</collection>
+			</collection>
+		</collection>
+	</resultMap>
+	<select id="getDynamicattempt" parameterType="com.runzhixing.util.bean.ConditionParameter" resultMap="dynamicattemptMap">
+	
+		select 
+				tm.stationno as TMSTATIONNO,
+				tm.machineno as TMMACHINENO,
+				tm.type as TMTYPE,
+				tm.manu as TMMANU,
+				tm.gunnum as TMGUNNUM,
+				tm.optype as TMOPTYPE,
+				tm.state as TMSTATE,
+				tm.gundir as TMGUNDIR,
+				
+				tsd.stationno as TSDSTATIONNO,
+				tsd.machineno as TSDMACHINENO,
+				tsd.gunno as TSDGUNNO,
+				tsd.operatorno as TSDOPERATORNO,
+				tsd.state as TSDSTATE,
+				tsd.opertime as TSDOPERTIME,
+				tsd.endtime as TSDENDTIME,
+				tsd.carno as TSDCARNO,
+		        tsd.apptype as TSDAPPTYPE,
+		        tsd.turnovertype as TSDTURNOVERTYPE,
+				tsd.platetype as TSDPLATETYPE,
+				
+		        tod.starttime as TODSTARTTIME,
+				tod.endtime as TODENDTIME,
+				
+				to.stationno as TOSTATION,
+				to.operatorno as TOOPERATORNO, 
+				to.name as TONAME, 
+				to.idno as TOIDNO, 
+				to.licence as TOLICENCE, 
+				to.licenceorg as TOLICENCEORG, 
+				to.licencedate as TOLICENCEDATE, 
+				to.validity as TOVALIDITY,
+				to.sex as TOSEX
+				
+			from 
+				tb_cngmachine tm,
+				tb_cngstation_dyn tsd,
+				tb_cngoperator_duty tod,
+				tb_cngoperator to
+			where
+				tm.STATIONNO = #{cpstring1}
+			and
+				tsd.STATIONNO = tm.STATIONNO
+			and
+			 	tsd.MACHINENO = tm.machineno
+			and
+				tod.STATIONNO = tsd.STATIONNO
+			and
+				tod.MACHINENO = tsd.MACHINENO
+			and
+				tod.GUNNO = tsd.gunno
+			and 
+				tod.OPERATORNO = tsd.operatorno
+			and
+				to.operatorno = tod.OPERATORNO			
+				 		
+			
+	</select>
+	
+	
 </mapper>

+ 26 - 26
src/com/runzhixing/config/sqlxml/Province.xml

@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.runzhixing.dao.interf.PlaceLoadertest">
-	<!-- 结果集 -->
-	<resultMap id="provincemap" type="com.runzhixing.bean.Place1">
-		<result property="name" column="NAME"/>
-		<result property="id" column="ID"/>
-		<result property="placeAB" column="PLACEAB"/>
-		<result property="carPrefix" column="CARPREFIX"/>
-	</resultMap>
-	<!-- sql配置文件 -->
-	
-	
-	<select id="province" parameterClass="string" resultMap="provincemap">
-			select 
-				t.provincename as NAME,
-				t.provinceno as ID,
-				t.provinceab as PLACEAB,
-				t.carprefix  as CARPREFIX
-			from td_province t
-			<where>
-				and t.provinceno = #{provinceId}#
-			</where>
-	</select>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.runzhixing.dao.interf.PlaceLoadertest">
+	<!-- 结果集 -->
+	<resultMap id="provincemap" type="com.runzhixing.bean.Place1">
+		<result property="name" column="NAME"/>
+		<result property="id" column="ID"/>
+		<result property="placeAB" column="PLACEAB"/>
+		<result property="carPrefix" column="CARPREFIX"/>
+	</resultMap>
+	<!-- sql配置文件 -->
+	
+	
+	<select id="province" parameterType="string" resultMap="provincemap">
+			select 
+				t.provincename as NAME,
+				t.provinceno as ID,
+				t.provinceab as PLACEAB,
+				t.carprefix  as CARPREFIX
+			from td_province t
+			<where>
+				and t.provinceno = #{provinceId}#
+			</where>
+	</select>
 </mapper>

+ 395 - 393
src/com/runzhixing/packageProcedure/FillingDataQueryProcedure.java

@@ -1,393 +1,395 @@
-package com.runzhixing.packageProcedure;
-
-import java.io.UnsupportedEncodingException;
-import java.sql.CallableStatement;
-import java.sql.Connection;
-import java.sql.Date;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Types;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.struts2.ServletActionContext;
-
-import java.sql.ResultSetMetaData;
-
-import com.runzhixing.bean.CNGFillLog;
-import com.runzhixing.bean.CNGFillLog1;
-import com.runzhixing.bean.CNGMachineState;
-import com.runzhixing.bean.CngFillLogs;
-import com.runzhixing.bean.User;
-import com.runzhixing.constant.Constant;
-import com.runzhixing.db.JDBCUtils;
-import com.runzhixing.tool.Tool;
-import com.runzhixing.tool.Util;
-
-import oracle.jdbc.OracleTypes;
-
-
-/**
- * 充装数据查询存储函数
- * @author 小黄
- *
- */
-public class FillingDataQueryProcedure {
-	
-	/**
-	 * 外部调用充装数据接口
-	 * @param un
-	 * @param ps
-	 * @return
-	 */
-	@SuppressWarnings("unchecked")
-	public List<CngFillLogs> fillDataQuery(int pagesize, int pageno,String operatorNo, String stationNo, String machineNo,String gunNo, String carNo, int appType, int fillState,Date startsTime, Date endsTime,int cylinderType){
-		List<CngFillLogs> list=new ArrayList<CngFillLogs>();
-		Map<Integer, Object> reValues = new HashMap<Integer, Object>();
-//		String sql = "{?=call PA_CNGSTATION_NEW.GetFillLog(?,?,?,?,?,?,?,?,?,?,?,?,?,?)}";
-		String sql = "{?=call PA_CNGSTATION_NEW.GetFillLog(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)}";
-		Connection conn =null;
-		CallableStatement call = null;
-		ResultSet rs = null;
-		try {
-			conn = JDBCUtils.getConnection();
-			call = (CallableStatement) conn.prepareCall(sql);
-			call.registerOutParameter(1, Types.INTEGER);//返回值
-			call.setInt(2 ,pagesize);//每次取的行数
-			call.setInt(3, pageno);//第几页
-			call.setString(4,operatorNo);//操作员编号
-			call.setString(5,stationNo);//充装点编号
-			call.setString(6,machineNo);//设备编号
-			call.setString(7,gunNo);//气枪编号
-			call.setString(8,carNo);//车牌号
-			call.setInt(9,appType);//应用类型
-			call.setInt(10, fillState);//充装状态
-			call.setDate(11, startsTime);
-			call.setDate(12, endsTime);
-			call.setInt(13, cylinderType);
-			call.setInt(14, -1);
-			call.registerOutParameter(15,Types.INTEGER);//总行数
-			call.registerOutParameter(16, OracleTypes.CURSOR);//结果集
-			call.execute();
-			int total = ((Integer) call.getObject(15)).intValue();
-			HttpServletRequest req = ServletActionContext.getRequest();
-			User user = new User();
-			user.setFillingSum(total);
-			req.getSession().setAttribute(Constant.fillingSum+"123", user);
-			rs = (ResultSet) call.getObject(16);
-			while(rs.next()){
-				CngFillLogs log = new CngFillLogs();
-//				log.setStationNo(rs.getString("cngstationno"));
-				log.setStationNo(rs.getString("cngstationname"));
-//				log.setMachineNo(rs.getString("cngmachineno"));
-				log.setMachineNo(rs.getString("cngmachinename"));
-				log.setGunNo(rs.getInt("cnggunno"));
-				log.setMedia(rs.getInt("BENEFITTYPE"));
-//				log.setOperator(rs.getString("cngoperatorno"));
-				log.setOperator(rs.getString("cngoperatorname"));
-				log.setFillState(rs.getString("fillstate"));
-				log.setFillTime(rs.getTimestamp("filltime"));
-				log.setEndTime(rs.getTimestamp("endtime"));
-				log.setFillCheckName1(rs.getString("FILLCHECKNNAME1"));
-				log.setFillCheckName2(rs.getString("FILLCHECKNAME2"));
-				log.setCarNo(rs.getString("carno"));
-				log.setAppType(rs.getString("apptype"));
-				log.setPlateType(rs.getString("platetypename"));
-				log.setCylinderNum(rs.getInt("cylindernum"));
-				log.setRegNo(rs.getString("regno"));
-				log.setNowNumber(rs.getInt("nownumber"));
-				log.setLowPress(rs.getFloat("lowpress"));
-				log.setHighPress(rs.getFloat("highpress"));
-				log.setFlux(rs.getFloat("flux"));
-				log.setMoney(rs.getFloat("money"));
-				
-				list.add(log);
-				log=null;
-				
-				
-				
-			}	
-			reValues.put(1, list);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		finally{
-			JDBCUtils.release(conn, call, rs);
-		}
-		return (List<CngFillLogs>) reValues.get(1);
-	}
-	
-	/**
-	 * 充装数据查询存储函数
-	 * @param un
-	 * @param ps
-	 * @return
-	 */
-	@SuppressWarnings("unchecked")
-	public List<CNGFillLog> fillingDataQuery(int pagesize, int pageno,String operatorNo, String stationNo, String machineNo,String gunNo, String carNo, int appType, int fillState,Date startsTime, Date endsTime,int cylinderType,int fillCheck2){
-		List<CNGFillLog> list=new ArrayList<CNGFillLog>();
-		Map<Integer, Object> reValues = new HashMap<Integer, Object>();
-//		String sql = "{?=call PA_CNGSTATION_NEW.GetFillLog(?,?,?,?,?,?,?,?,?,?,?,?,?,?)}";
-		String sql = "{?=call PA_CNGSTATION_NEW.GetFillLog(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)}";
-		Connection conn =null;
-		
-		CallableStatement call = null;
-		
-		ResultSet rs = null;
-		try {
-			conn = JDBCUtils.getConnection();
-			
-			call = (CallableStatement) conn.prepareCall(sql);
-			call.registerOutParameter(1, Types.INTEGER);//返回值
-			
-			call.setInt(2 ,pagesize);//每次取的行数
-			call.setInt(3, pageno);//第几页
-			call.setString(4,operatorNo);//操作员编号
-			call.setString(5,stationNo);//充装点编号
-			call.setString(6,machineNo);//设备编号
-			call.setString(7,gunNo);//气枪编号
-			call.setString(8,carNo);//车牌号
-			call.setInt(9,appType);//应用类型
-			call.setInt(10, fillState);//充装状态
-			call.setDate(11, startsTime);
-			call.setDate(12, endsTime);
-			call.setInt(13, cylinderType);
-			call.setInt(14, fillCheck2);//充后检查人员  -1全部  0无  1有
-			call.registerOutParameter(15,Types.INTEGER);//总行数
-			call.registerOutParameter(16, OracleTypes.CURSOR);//结果集
-			call.execute();
-			
-			int total = ((Integer) call.getObject(15)).intValue();
-			HttpServletRequest req = ServletActionContext.getRequest();
-			User user = new User();
-			user.setFillingSum(total);
-			req.getSession().setAttribute(Constant.fillingSum, user);
-			
-			rs = (ResultSet) call.getObject(16);
-//			Tool.printRsDetail(rs);
-			while(rs.next()){
-				CNGFillLog obj=new CNGFillLog();
-				obj.setAppType(rs.getString("apptype"));
-				obj.setCarNo(rs.getString("carno"));
-				obj.setFixCarNo(fixCarNo(rs.getString("carno")));
-				obj.setCylinderNum(rs.getInt("cylindernum"));
-				obj.setEndTime(rs.getTimestamp("endtime"));
-				obj.setEndTime1(Util.jiequString(rs.getString("endtime"), 19));
-				obj.setFillState(rs.getString("fillstate"));
-				obj.setFillTime(rs.getTimestamp("filltime"));
-				obj.setFillTime1(Util.jiequString(rs.getString("filltime"), 19));
-				obj.setGunNo(rs.getInt("cnggunno"));
-				obj.setMachineNo(rs.getString("cngmachineno"));
-				obj.setMachineName(rs.getString("cngmachinename"));
-				
-				obj.setOperatorName(rs.getString("cngoperatorname"));
-				obj.setOperatorNo(rs.getString("cngoperatorno"));
-				
-				obj.setRegNo(rs.getString("regno"));
-				obj.setStationNo(rs.getString("cngstationno"));
-				obj.setStationName(rs.getString("cngstationname"));
-				
-				obj.setTagNo(rs.getString("tagno"));
-				obj.setTagType(rs.getInt("tagtype"));
-				obj.setTagUid(rs.getString("taguid"));
-				obj.setTac(rs.getString("tac"));
-				obj.setLeftNumber(rs.getString("leftnumber"));
-				obj.setNowNumber(rs.getInt("nownumber"));
-				obj.setLowPress(rs.getFloat("lowpress"));
-				obj.setHighPress(rs.getFloat("highpress"));
-				obj.setFlux(rs.getFloat("flux"));
-				obj.setMoney(rs.getFloat("money"));
-				obj.setPlateType(rs.getInt("platetype"));
-				obj.setPlateTypeName(rs.getString("platetypename"));
-				obj.setMedia(rs.getInt("BENEFITTYPE"));
-				obj.setFillStateNum(rs.getInt("fillstatenum"));
-				obj.setFillcheck(rs.getInt("FILLCHECK"));
-				obj.setFillcheckstr(Util.toBinary(rs.getInt("FILLCHECK"), 8));
-				
-				obj.setFILLCHECKNName1(rs.getString("FILLCHECKNNAME1"));
-				obj.setFILLCHECKNName2(rs.getString("FILLCHECKNAME2"));
-				
-				obj.setFILLCHECKNNo1(rs.getString("FILLCHECKNO1"));
-				obj.setFILLCHECKNNo2(rs.getString("FILLCHECKNO2"));
-				list.add(obj);
-				obj=null;
-				
-				
-				
-			}	
-			reValues.put(1, list);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		finally{
-			JDBCUtils.release(conn, call, rs);
-		}
-		return (List<CNGFillLog>) reValues.get(1);
-	}
-	
-	
-	private String fixCarNo(String carNo) {
-	    StringBuilder result = new StringBuilder();
-	    if (carNo!=null && !carNo.equals("")) {
-		byte[] t;
-		try {
-		    t = carNo.getBytes("utf-8");
-		    for (int i = 0;i < t.length; ++i) {
-			result.append(String.format("%02X", t[i]));
-		    }
-		} catch (UnsupportedEncodingException e) {
-		    // TODO Auto-generated catch block
-		    e.printStackTrace();
-		}
-		
-	    }
-	    return result.toString();
-	}
-
-	public List<CNGFillLog> latelyFill(String day1, String day2,
-			String carGuid, String cylinderGuid) {
-		List<CNGFillLog> list=new ArrayList<CNGFillLog>();
-		Map<Integer, Object> reValues = new HashMap<Integer, Object>();
-		String sql = "{?=call PA_CNGSTATION_NEW.GetFillLogByDay(?,?,?,?,?)}";
-		
-		Connection conn =null;
-		
-		CallableStatement call = null;
-		
-		ResultSet rs = null;
-		try {
-			conn = JDBCUtils.getConnection();
-			
-			call = (CallableStatement) conn.prepareCall(sql);
-			int index=1;
-			call.registerOutParameter(index, Types.INTEGER);index++;
-			call.setString(index,carGuid);index++;
-			call.setString(index,cylinderGuid);index++;
-			call.setInt(index ,Integer.parseInt(day1));index++;
-			call.setInt(index, Integer.parseInt(day2));index++;
-			call.registerOutParameter(index, OracleTypes.CURSOR);
-			call.execute();
-			
-			
-			rs = (ResultSet) call.getObject(index);
-			while(rs.next()){
-				CNGFillLog obj=new CNGFillLog();
-				obj.setAppType(rs.getString("apptype"));
-				obj.setCarNo(rs.getString("carno"));
-				obj.setFixCarNo(fixCarNo(rs.getString("carno")));
-				obj.setCylinderNum(rs.getInt("cylindernum"));
-//				obj.setEndTime(rs.getTimestamp("endtime"));
-				obj.setEndTime1(Util.jiequString(rs.getString("endtime"), 19));
-				obj.setFillState(rs.getString("fillstate"));
-//				obj.setFillTime(rs.getTimestamp("filltime"));
-				obj.setFillTime1(Util.jiequString(rs.getString("filltime"), 19));
-				obj.setGunNo(rs.getInt("cnggunno"));
-				obj.setMachineNo(rs.getString("cngmachineno"));
-				obj.setOperatorName(rs.getString("cngoperatorno"));
-				obj.setRegNo(rs.getString("regno"));
-				obj.setStationNo(rs.getString("cngstationno"));
-				obj.setTagNo(rs.getString("tagno"));
-				obj.setTagType(rs.getInt("tagtype"));
-				obj.setTagUid(rs.getString("taguid"));
-				obj.setLeftNumber(rs.getString("leftnumber"));
-				obj.setNowNumber(rs.getInt("nownumber"));
-				obj.setLowPress(rs.getFloat("lowpress"));
-				obj.setHighPress(rs.getFloat("highpress"));
-				obj.setFlux(rs.getFloat("flux"));
-				obj.setMoney(rs.getFloat("money"));
-				obj.setPlateType(rs.getInt("platetype"));
-				obj.setPlateTypeName(rs.getString("platetypename"));
-				obj.setMedia(rs.getInt("BENEFITTYPE"));
-				obj.setFillStateNum(rs.getInt("fillstatenum"));
-				obj.setFillcheck(rs.getInt("FILLCHECK"));
-				obj.setFillcheckstr(Util.toBinary(rs.getInt("FILLCHECK"), 8));
-				list.add(obj);
-				obj=null;
-				
-				
-				
-			}	
-			reValues.put(1, list);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		finally{
-			JDBCUtils.release(conn, call, rs);
-		}
-		return (List<CNGFillLog>) reValues.get(1);
-	}
-	public List<CNGFillLog1> latelyFill123(String day1, String day2,
-			String carGuid, String cylinderGuid) {
-		List<CNGFillLog1> list=new ArrayList<CNGFillLog1>();
-		Map<Integer, Object> reValues = new HashMap<Integer, Object>();
-		String sql = "{?=call PA_CNGSTATION_NEW.GetFillLogByDay(?,?,?,?,?)}";
-		Connection conn =null;
-		
-		CallableStatement call = null;
-		
-		ResultSet rs = null;
-		try {
-			conn = JDBCUtils.getConnection();
-			
-			call = (CallableStatement) conn.prepareCall(sql);
-			int index=1;
-			call.registerOutParameter(index, Types.INTEGER);index++;
-			call.setString(index,carGuid);index++;
-			call.setString(index,cylinderGuid);index++;
-			call.setInt(index ,Integer.parseInt(day1));index++;
-			call.setInt(index, Integer.parseInt(day2));index++;
-			call.registerOutParameter(index, OracleTypes.CURSOR);
-			call.execute();
-			
-			
-			rs = (ResultSet) call.getObject(index);
-			while(rs.next()){
-				CNGFillLog1 obj = new CNGFillLog1();
-				obj.setAppType(rs.getString("apptype"));
-				obj.setCarNo(rs.getString("carno"));
-				obj.setFixCarNo(fixCarNo(rs.getString("carno")));
-				obj.setCylinderNum(rs.getInt("cylindernum"));
-				obj.setEndTime(Util.jiequString(rs.getString("endtime"), 19));
-				obj.setFillState(rs.getString("fillstate"));
-				obj.setFillTime(Util.jiequString(rs.getString("filltime"), 19));
-				obj.setGunNo(rs.getInt("cnggunno"));
-				obj.setMachineNo(rs.getString("cngmachineno"));
-				obj.setOperatorName(rs.getString("cngoperatorno"));
-				obj.setRegNo(rs.getString("regno"));
-				obj.setStationNo(rs.getString("cngstationno"));
-				obj.setTagNo(rs.getString("tagno"));
-				obj.setTagType(rs.getInt("tagtype"));
-				obj.setTagUid(rs.getString("taguid"));
-				obj.setLeftNumber(rs.getString("leftnumber"));
-				obj.setNowNumber(rs.getInt("nownumber"));
-				obj.setLowPress(rs.getFloat("lowpress"));
-				obj.setHighPress(rs.getFloat("highpress"));
-				obj.setFlux(rs.getFloat("flux"));
-				obj.setMoney(rs.getFloat("money"));
-				obj.setPlateType(rs.getInt("platetype"));
-				obj.setPlateTypeName(rs.getString("platetypename"));
-				obj.setMedia(rs.getInt("BENEFITTYPE"));
-				obj.setFillStateNum(rs.getInt("fillstatenum"));
-				obj.setFillcheck(rs.getInt("FILLCHECK"));
-				obj.setFillcheckstr(Util.toBinary(rs.getInt("FILLCHECK"), 8));
-				list.add(obj);
-				obj=null;
-				
-				
-				
-			}	
-			reValues.put(1, list);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		finally{
-			JDBCUtils.release(conn, call, rs);
-		}
-		return (List<CNGFillLog1>) reValues.get(1);
-	}
-
-}
+package com.runzhixing.packageProcedure;
+
+import java.io.UnsupportedEncodingException;
+import java.sql.CallableStatement;
+import java.sql.Connection;
+import java.sql.Date;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.struts2.ServletActionContext;
+
+import java.sql.ResultSetMetaData;
+
+import com.runzhixing.bean.CNGFillLog;
+import com.runzhixing.bean.CNGFillLog1;
+import com.runzhixing.bean.CNGMachineState;
+import com.runzhixing.bean.CngFillLogs;
+import com.runzhixing.bean.User;
+import com.runzhixing.constant.Constant;
+import com.runzhixing.db.JDBCUtils;
+import com.runzhixing.tool.Tool;
+import com.runzhixing.tool.Util;
+
+import oracle.jdbc.OracleTypes;
+
+
+/**
+ * 充装数据查询存储函数
+ * @author 小黄
+ *
+ */
+public class FillingDataQueryProcedure {
+	
+	/**
+	 * 外部调用充装数据接口
+	 * @param un
+	 * @param ps
+	 * @return
+	 */
+	@SuppressWarnings("unchecked")
+	public List<CngFillLogs> fillDataQuery(int pagesize, int pageno,String operatorNo, String stationNo, String machineNo,String gunNo, String carNo, int appType, int fillState,Date startsTime, Date endsTime,int cylinderType){
+		List<CngFillLogs> list=new ArrayList<CngFillLogs>();
+		Map<Integer, Object> reValues = new HashMap<Integer, Object>();
+//		String sql = "{?=call PA_CNGSTATION_NEW.GetFillLog(?,?,?,?,?,?,?,?,?,?,?,?,?,?)}";
+		String sql = "{?=call PA_CNGSTATION_NEW.GetFillLog(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)}";
+		Connection conn =null;
+		CallableStatement call = null;
+		ResultSet rs = null;
+		try {
+			conn = JDBCUtils.getConnection();
+			call = (CallableStatement) conn.prepareCall(sql);
+			call.registerOutParameter(1, Types.INTEGER);//返回值
+			call.setInt(2 ,pagesize);//每次取的行数
+			call.setInt(3, pageno);//第几页
+			call.setString(4,operatorNo);//操作员编号
+			call.setString(5,stationNo);//充装点编号
+			call.setString(6,machineNo);//设备编号
+			call.setString(7,gunNo);//气枪编号
+			call.setString(8,carNo);//车牌号
+			call.setInt(9,appType);//应用类型
+			call.setInt(10, fillState);//充装状态
+			call.setDate(11, startsTime);
+			call.setDate(12, endsTime);
+			call.setInt(13, cylinderType);
+			call.setInt(14, -1);
+			call.registerOutParameter(15,Types.INTEGER);//总行数
+			call.registerOutParameter(16, OracleTypes.CURSOR);//结果集
+			call.execute();
+			int total = ((Integer) call.getObject(15)).intValue();
+			HttpServletRequest req = ServletActionContext.getRequest();
+			User user = new User();
+			user.setFillingSum(total);
+			req.getSession().setAttribute(Constant.fillingSum+"123", user);
+			rs = (ResultSet) call.getObject(16);
+			while(rs.next()){
+				CngFillLogs log = new CngFillLogs();
+//				log.setStationNo(rs.getString("cngstationno"));
+				log.setStationNo(rs.getString("cngstationname"));
+//				log.setMachineNo(rs.getString("cngmachineno"));
+				log.setMachineNo(rs.getString("cngmachinename"));
+				log.setGunNo(rs.getInt("cnggunno"));
+				log.setMedia(rs.getInt("BENEFITTYPE"));
+//				log.setOperator(rs.getString("cngoperatorno"));
+				log.setOperator(rs.getString("cngoperatorname"));
+				log.setFillState(rs.getString("fillstate"));
+				log.setFillTime(rs.getTimestamp("filltime"));
+				log.setEndTime(rs.getTimestamp("endtime"));
+				log.setFillCheckName1(rs.getString("FILLCHECKNNAME1"));
+				log.setFillCheckName2(rs.getString("FILLCHECKNAME2"));
+				log.setCarNo(rs.getString("carno"));
+				log.setAppType(rs.getString("apptype"));
+				log.setPlateType(rs.getString("platetypename"));
+				log.setCylinderNum(rs.getInt("cylindernum"));
+				log.setRegNo(rs.getString("regno"));
+				log.setNowNumber(rs.getInt("nownumber"));
+				log.setLowPress(rs.getFloat("lowpress"));
+				log.setHighPress(rs.getFloat("highpress"));
+				log.setFlux(rs.getFloat("flux"));
+				log.setMoney(rs.getFloat("money"));
+				
+				list.add(log);
+				log=null;
+				
+				
+				
+			}	
+			reValues.put(1, list);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		finally{
+			JDBCUtils.release(conn, call, rs);
+		}
+		return (List<CngFillLogs>) reValues.get(1);
+	}
+	
+	/**
+	 * 充装数据查询存储函数
+	 * @param un
+	 * @param ps
+	 * @return
+	 */
+	@SuppressWarnings("unchecked")
+	public List<CNGFillLog> fillingDataQuery(int pagesize, int pageno,String operatorNo, String stationNo, String machineNo,String gunNo, String carNo, int appType, int fillState,Date startsTime, Date endsTime,int cylinderType,int fillCheck2){
+		List<CNGFillLog> list=new ArrayList<CNGFillLog>();
+		Map<Integer, Object> reValues = new HashMap<Integer, Object>();
+//		String sql = "{?=call PA_CNGSTATION_NEW.GetFillLog(?,?,?,?,?,?,?,?,?,?,?,?,?,?)}";
+		String sql = "{?=call PA_CNGSTATION_NEW.GetFillLog(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)}";
+		Connection conn =null;
+		
+		CallableStatement call = null;
+		
+		ResultSet rs = null;
+		try {
+			conn = JDBCUtils.getConnection();
+			
+			call = (CallableStatement) conn.prepareCall(sql);
+			call.registerOutParameter(1, Types.INTEGER);//返回值
+			
+			call.setInt(2 ,pagesize);//每次取的行数
+			call.setInt(3, pageno);//第几页
+			call.setString(4,operatorNo);//操作员编号
+			call.setString(5,stationNo);//充装点编号
+			call.setString(6,machineNo);//设备编号
+			call.setString(7,gunNo);//气枪编号
+			call.setString(8,carNo);//车牌号
+			call.setInt(9,appType);//应用类型
+			call.setInt(10, fillState);//充装状态
+			call.setDate(11, startsTime);
+			call.setDate(12, endsTime);
+			call.setInt(13, cylinderType);
+			call.setInt(14, fillCheck2);//充后检查人员  -1全部  0无  1有
+			call.registerOutParameter(15,Types.INTEGER);//总行数
+			call.registerOutParameter(16, OracleTypes.CURSOR);//结果集
+			call.execute();
+			
+			int total = ((Integer) call.getObject(15)).intValue();
+			HttpServletRequest req = ServletActionContext.getRequest();
+			User user = new User();
+			user.setFillingSum(total);
+			req.getSession().setAttribute(Constant.fillingSum, user);
+			
+			rs = (ResultSet) call.getObject(16);
+//			Tool.printRsDetail(rs);
+			while(rs.next()){
+				CNGFillLog obj=new CNGFillLog();
+				obj.setAppType(rs.getString("apptype"));
+				obj.setCarNo(rs.getString("carno"));
+				obj.setFixCarNo(fixCarNo(rs.getString("carno")));
+				obj.setCylinderNum(rs.getInt("cylindernum"));
+				obj.setEndTime(rs.getTimestamp("endtime"));
+				obj.setEndTime1(Util.jiequString(rs.getString("endtime"), 19));
+				obj.setFillState(rs.getString("fillstate"));
+				obj.setFillTime(rs.getTimestamp("filltime"));
+				obj.setFillTime1(Util.jiequString(rs.getString("filltime"), 19));
+				obj.setGunNo(rs.getInt("cnggunno"));
+				obj.setMachineNo(rs.getString("cngmachineno"));
+				obj.setMachineName(rs.getString("cngmachinename"));
+				
+				obj.setOperatorName(rs.getString("cngoperatorname"));
+				obj.setOperatorNo(rs.getString("cngoperatorno"));
+				
+				obj.setRegNo(rs.getString("regno"));
+				obj.setStationNo(rs.getString("cngstationno"));
+				obj.setStationName(rs.getString("cngstationname"));
+				
+				obj.setTagNo(rs.getString("tagno"));
+				obj.setTagType(rs.getInt("tagtype"));
+				obj.setTagUid(rs.getString("taguid"));
+				obj.setTac(rs.getString("tac"));
+				obj.setLeftNumber(rs.getString("leftnumber"));
+				obj.setNowNumber(rs.getInt("nownumber"));
+				obj.setLowPress(rs.getFloat("lowpress"));
+				obj.setHighPress(rs.getFloat("highpress"));
+				obj.setFlux(rs.getFloat("flux"));
+				obj.setMoney(rs.getFloat("money"));
+				obj.setPlateType(rs.getInt("platetype"));
+				obj.setPlateTypeName(rs.getString("platetypename"));
+				obj.setMedia(rs.getInt("BENEFITTYPE"));
+				obj.setFillStateNum(rs.getInt("fillstatenum"));
+				obj.setFillcheck(rs.getInt("FILLCHECK"));
+				obj.setFillcheckstr(Util.toBinary(rs.getInt("FILLCHECK"), 8));
+				
+				obj.setFILLCHECKNName1(rs.getString("FILLCHECKNNAME1"));
+				obj.setFILLCHECKNName2(rs.getString("FILLCHECKNAME2"));
+				obj.setFillMonitorName(rs.getString("FillMonitorName"));
+				
+				obj.setFILLCHECKNNo1(rs.getString("FILLCHECKNO1"));
+				obj.setFILLCHECKNNo2(rs.getString("FILLCHECKNO2"));
+				obj.setFillMonitorNo(rs.getString("FillMonitorNo"));
+				list.add(obj);
+				obj=null;
+				
+				
+				
+			}	
+			reValues.put(1, list);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		finally{
+			JDBCUtils.release(conn, call, rs);
+		}
+		return (List<CNGFillLog>) reValues.get(1);
+	}
+	
+	
+	private String fixCarNo(String carNo) {
+	    StringBuilder result = new StringBuilder();
+	    if (carNo!=null && !carNo.equals("")) {
+		byte[] t;
+		try {
+		    t = carNo.getBytes("utf-8");
+		    for (int i = 0;i < t.length; ++i) {
+			result.append(String.format("%02X", t[i]));
+		    }
+		} catch (UnsupportedEncodingException e) {
+		    // TODO Auto-generated catch block
+		    e.printStackTrace();
+		}
+		
+	    }
+	    return result.toString();
+	}
+
+	public List<CNGFillLog> latelyFill(String day1, String day2,
+			String carGuid, String cylinderGuid) {
+		List<CNGFillLog> list=new ArrayList<CNGFillLog>();
+		Map<Integer, Object> reValues = new HashMap<Integer, Object>();
+		String sql = "{?=call PA_CNGSTATION_NEW.GetFillLogByDay(?,?,?,?,?)}";
+		
+		Connection conn =null;
+		
+		CallableStatement call = null;
+		
+		ResultSet rs = null;
+		try {
+			conn = JDBCUtils.getConnection();
+			
+			call = (CallableStatement) conn.prepareCall(sql);
+			int index=1;
+			call.registerOutParameter(index, Types.INTEGER);index++;
+			call.setString(index,carGuid);index++;
+			call.setString(index,cylinderGuid);index++;
+			call.setInt(index ,Integer.parseInt(day1));index++;
+			call.setInt(index, Integer.parseInt(day2));index++;
+			call.registerOutParameter(index, OracleTypes.CURSOR);
+			call.execute();
+			
+			
+			rs = (ResultSet) call.getObject(index);
+			while(rs.next()){
+				CNGFillLog obj=new CNGFillLog();
+				obj.setAppType(rs.getString("apptype"));
+				obj.setCarNo(rs.getString("carno"));
+				obj.setFixCarNo(fixCarNo(rs.getString("carno")));
+				obj.setCylinderNum(rs.getInt("cylindernum"));
+//				obj.setEndTime(rs.getTimestamp("endtime"));
+				obj.setEndTime1(Util.jiequString(rs.getString("endtime"), 19));
+				obj.setFillState(rs.getString("fillstate"));
+//				obj.setFillTime(rs.getTimestamp("filltime"));
+				obj.setFillTime1(Util.jiequString(rs.getString("filltime"), 19));
+				obj.setGunNo(rs.getInt("cnggunno"));
+				obj.setMachineNo(rs.getString("cngmachineno"));
+				obj.setOperatorName(rs.getString("cngoperatorno"));
+				obj.setRegNo(rs.getString("regno"));
+				obj.setStationNo(rs.getString("cngstationno"));
+				obj.setTagNo(rs.getString("tagno"));
+				obj.setTagType(rs.getInt("tagtype"));
+				obj.setTagUid(rs.getString("taguid"));
+				obj.setLeftNumber(rs.getString("leftnumber"));
+				obj.setNowNumber(rs.getInt("nownumber"));
+				obj.setLowPress(rs.getFloat("lowpress"));
+				obj.setHighPress(rs.getFloat("highpress"));
+				obj.setFlux(rs.getFloat("flux"));
+				obj.setMoney(rs.getFloat("money"));
+				obj.setPlateType(rs.getInt("platetype"));
+				obj.setPlateTypeName(rs.getString("platetypename"));
+				obj.setMedia(rs.getInt("BENEFITTYPE"));
+				obj.setFillStateNum(rs.getInt("fillstatenum"));
+				obj.setFillcheck(rs.getInt("FILLCHECK"));
+				obj.setFillcheckstr(Util.toBinary(rs.getInt("FILLCHECK"), 8));
+				list.add(obj);
+				obj=null;
+				
+				
+				
+			}	
+			reValues.put(1, list);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		finally{
+			JDBCUtils.release(conn, call, rs);
+		}
+		return (List<CNGFillLog>) reValues.get(1);
+	}
+	public List<CNGFillLog1> latelyFill123(String day1, String day2,
+			String carGuid, String cylinderGuid) {
+		List<CNGFillLog1> list=new ArrayList<CNGFillLog1>();
+		Map<Integer, Object> reValues = new HashMap<Integer, Object>();
+		String sql = "{?=call PA_CNGSTATION_NEW.GetFillLogByDay(?,?,?,?,?)}";
+		Connection conn =null;
+		
+		CallableStatement call = null;
+		
+		ResultSet rs = null;
+		try {
+			conn = JDBCUtils.getConnection();
+			
+			call = (CallableStatement) conn.prepareCall(sql);
+			int index=1;
+			call.registerOutParameter(index, Types.INTEGER);index++;
+			call.setString(index,carGuid);index++;
+			call.setString(index,cylinderGuid);index++;
+			call.setInt(index ,Integer.parseInt(day1));index++;
+			call.setInt(index, Integer.parseInt(day2));index++;
+			call.registerOutParameter(index, OracleTypes.CURSOR);
+			call.execute();
+			
+			
+			rs = (ResultSet) call.getObject(index);
+			while(rs.next()){
+				CNGFillLog1 obj = new CNGFillLog1();
+				obj.setAppType(rs.getString("apptype"));
+				obj.setCarNo(rs.getString("carno"));
+				obj.setFixCarNo(fixCarNo(rs.getString("carno")));
+				obj.setCylinderNum(rs.getInt("cylindernum"));
+				obj.setEndTime(Util.jiequString(rs.getString("endtime"), 19));
+				obj.setFillState(rs.getString("fillstate"));
+				obj.setFillTime(Util.jiequString(rs.getString("filltime"), 19));
+				obj.setGunNo(rs.getInt("cnggunno"));
+				obj.setMachineNo(rs.getString("cngmachineno"));
+				obj.setOperatorName(rs.getString("cngoperatorno"));
+				obj.setRegNo(rs.getString("regno"));
+				obj.setStationNo(rs.getString("cngstationno"));
+				obj.setTagNo(rs.getString("tagno"));
+				obj.setTagType(rs.getInt("tagtype"));
+				obj.setTagUid(rs.getString("taguid"));
+				obj.setLeftNumber(rs.getString("leftnumber"));
+				obj.setNowNumber(rs.getInt("nownumber"));
+				obj.setLowPress(rs.getFloat("lowpress"));
+				obj.setHighPress(rs.getFloat("highpress"));
+				obj.setFlux(rs.getFloat("flux"));
+				obj.setMoney(rs.getFloat("money"));
+				obj.setPlateType(rs.getInt("platetype"));
+				obj.setPlateTypeName(rs.getString("platetypename"));
+				obj.setMedia(rs.getInt("BENEFITTYPE"));
+				obj.setFillStateNum(rs.getInt("fillstatenum"));
+				obj.setFillcheck(rs.getInt("FILLCHECK"));
+				obj.setFillcheckstr(Util.toBinary(rs.getInt("FILLCHECK"), 8));
+				list.add(obj);
+				obj=null;
+				
+				
+				
+			}	
+			reValues.put(1, list);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		finally{
+			JDBCUtils.release(conn, call, rs);
+		}
+		return (List<CNGFillLog1>) reValues.get(1);
+	}
+
+}

+ 419 - 418
src/com/runzhixing/servlet/LoginServlet.java

@@ -1,418 +1,419 @@
-package com.runzhixing.servlet;
-
-
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
-
-import org.apache.log4j.Logger;
-
-import com.runzhixing.bean.AuthorityRegionPlace;
-import com.runzhixing.bean.CityPlace;
-import com.runzhixing.bean.CountryPlace;
-import com.runzhixing.bean.PreferEntry;
-import com.runzhixing.bean.User;
-import com.runzhixing.constant.Constant;
-import com.runzhixing.dao.QueryDao;
-import com.runzhixing.dao.ThirdInterfaceDao;
-import com.runzhixing.filter.MyFilter;
-import com.runzhixing.packageProcedure.GetWarningparaProcedure;
-import com.runzhixing.packageProcedure.LoginProcedure;
-import com.runzhixing.packageProcedure.UserAuthProcedure;
-import com.runzhixing.service.AuthorityRegionService;
-import com.runzhixing.tool.Aes;
-import com.runzhixing.tool.Security;
-import com.runzhixing.tool.Tool;
-import com.runzhixing.tool.Util;
-import com.runzhixing.tool.ValidateDate;
-import com.runzhixing.util.bean.QueryParamImpl;
-import com.runzhixing.util.interf.PlaceLoader;
-/**
- * 
- *和登陆相关的servlet
- *
- */
-@SuppressWarnings("serial")
-public class LoginServlet extends HttpServlet {
-	private static Logger log= Logger.getLogger(LoginServlet.class);
-	private PlaceLoader placeLoader=null;
-	public void setPlaceLoader(PlaceLoader placeLoader) {
-		this.placeLoader = placeLoader;
-	} 
-	@Override
-	public void service(HttpServletRequest req, HttpServletResponse res)
-			throws ServletException, IOException {
-		
-		
-		
-		int hiddencarInput = 0;
-		int hiddencarAuth = 0;
-		int fillAuth = 0;
-		String errinfo ="用户名或密码错误";
-		HttpSession session = req.getSession();
-		User user = new User();
-		String result = "";
-		//设置请求编码
-		req.setCharacterEncoding("UTF-8");
-		//获取页面数据
-		String u = req.getParameter("un");
-		
-		String p = req.getParameter("ps");
-		String modal = req.getParameter("modal");
-		
-		
-		
-	
-		
-		if(!checkLock(session, u)) {
-			session.setAttribute("failMess", "你已登录失败次数过多,将锁定3分钟。");
-			req.getRequestDispatcher("jsp/fail/loginfail.jsp").forward(req, res);
-			return;
-    	}
-		
-		
-		
-		//System.out.println("u="+u+"   p="+p+"  modal="+modal);
-		if(!Util.isNumeric(modal)){
-			req.getRequestDispatcher("jsp/fail/loginfail.jsp").forward(req, res);
-			return;
-		}
-		String ua= req.getHeader("User-Agent");
-//		Boolean isMobile = StringUtil.checkAgentIsMobile(ua);
-		String validatecode = req.getParameter("validatecode");
-		String rcode =(String)session.getAttribute("rCode");
-		String rCodess =(String)session.getAttribute("rCodess");
-		
-		ValidateDate vd = new ValidateDate();
-		//判断是否登陆成功
-//		if(isMobile||(vd.validateNull(u)&&vd.validateNull(p)&&vd.validateNull(validatecode)&&vd.validateNull(rcode))){
-//			if(isMobile||(validatecode.replace(" ", "").equals(rcode))){
-		if((vd.validateNull(u)&&vd.validateNull(p)&&vd.validateNull(validatecode)&&vd.validateNull(rcode))){
-			if((validatecode.replace(" ", "").equals(rcode))){
-				session.removeAttribute("rCode");
-				
-				try {
-//					p = AesUtil.aesDecrypt(p);
-					p = Aes.aesDecrypt(p);
-				} catch (Exception e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
-				if(p.contains("hzb"+rCodess)){
-					p = p.substring(0,p.indexOf("hzb"+rCodess));
-				}else{
-					session.setAttribute("failMess", "未获取到随机码");
-					req.getRequestDispatcher("jsp/fail/loginfail.jsp").forward(req, res);
-					return;
-				}
-				
-				
-				
-				
-				user = new LoginProcedure().login(u, Security.md5(p), modal);
-				result = user.getLoginInfo().trim();
-				if(result.equals(Constant.loginResult)&&user.isValidUser()){
-					int hiddenphone=new UserAuthProcedure().getUserAuth(user.getUserOperatorNo(), 1, 1, 1, 9);
-					
-					String stationNo = new QueryDao().getStationNo(user.getUserOperatorNo());
-					req.getSession().setAttribute("stationNo", stationNo);
-					req.getSession().setAttribute("modal", modal);
-					req.getSession().setAttribute("hiddenphone", hiddenphone+"");
-					req.getSession().setAttribute("sOperatorNo", user.getUserOperatorNo()+"");
-					req.getSession().setAttribute("PrivilegeCode", user.getPrivilegeCode()+"");
-					req.getSession().setAttribute("PrivilegeCode1", user.getPrivilegeCode()+"");
-					try{
-						hiddencarInput=new UserAuthProcedure().getUserAuth(user.getUserOperatorNo(), 1, 1, 1, 11);//网上车辆数据录入
-					}catch(Exception e){
-						e.printStackTrace();
-						hiddencarInput = 0;
-					}
-					
-					req.getSession().setAttribute("hiddencarInput", hiddencarInput+"");
-					try{
-						hiddencarAuth=new UserAuthProcedure().getUserAuth(user.getUserOperatorNo(), 1, 1, 1, 12);//网上车辆数据审核
-					}catch(Exception e){
-						e.printStackTrace();
-						hiddencarAuth = 0;
-					}
-					
-					
-					req.getSession().setAttribute("hiddencarAuth", hiddencarAuth+"");
-					
-					try{
-						fillAuth=new UserAuthProcedure().getUserAuth(user.getUserOperatorNo(), 1, 1, 2, 21);//充装站  补录  权限
-					}catch(Exception e){
-						e.printStackTrace();
-						fillAuth = 0;
-					}
-					
-					
-					req.getSession().setAttribute("fillAuth", fillAuth+"");
-				}
-				
-			}else{
-				session.removeAttribute("rCode");
-				session.setAttribute("failMess", "验证码有误");
-				req.getRequestDispatcher("jsp/fail/loginfail.jsp").forward(req, res);
-				return;
-			}
-		}else if(!vd.validateNull(u)){
-			session.removeAttribute("rCode");
-			session.setAttribute("failMess", "用户名不能为空");
-			req.getRequestDispatcher("jsp/fail/loginfail.jsp").forward(req, res);
-			return;
-		}else if(!vd.validateNull(p)){
-			session.removeAttribute("rCode");
-			session.setAttribute("failMess", "密码不能为空");
-			req.getRequestDispatcher("jsp/fail/loginfail.jsp").forward(req, res);
-			return;
-		}else if(!vd.validateNull(validatecode)){
-			session.removeAttribute("rCode");
-			session.setAttribute("failMess", "验证码不能为空");
-			req.getRequestDispatcher("jsp/fail/loginfail.jsp").forward(req, res);
-			return;
-		}else{
-			session.removeAttribute("rCode");
-			session.setAttribute("failMess", "出现异常");
-			req.getRequestDispatcher("jsp/fail/loginfail.jsp").forward(req, res);
-			return;
-		}
-		//登录成功,账号正常
-		if(result.equals(Constant.loginResult)&&user.isValidUser()){
-			cleanFailNum(session,u);
-			session.setAttribute(Constant.userName, u);
-			if(Tool.pwdRules(p)<4){//密码强度弱
-				session.setAttribute(Constant.moudel, modal);// 保存用户到session
-	
-				req.getRequestDispatcher("jsp/rzx/alterPWD.jsp").forward(req, res);
-				return;
-			}
-			Constant.storageSession = u;
-			Constant.sessionId = session.getId();
-			session.setAttribute(Constant.Privilege, user.getPrivilegeCode());
-			//得到账号权限玛,由此计算出改账号的可操作的地域
-			if(!Tool.isNullOrEmpty(user.getPriCode())){
-				String auth = user.getPriCode();
-				if(auth.length()>6){
-					auth = auth.substring(0,6);
-				}
-				String authRegionName = ThirdInterfaceDao.getAuthRegionName(auth);
-				session.setAttribute("authRegionName", authRegionName);// 保存用户到session
-			}
-			
-			List<AuthorityRegionPlace> authorityRegionPlacelist = new AuthorityRegionService().authorityRegion(user.getPriCode());
-			user.setPrivilegePlaces1(authorityRegionPlacelist);
-			
-			for( AuthorityRegionPlace a:authorityRegionPlacelist){
-				List<CityPlace> clist = new ArrayList<CityPlace>();	
-				clist = a.getCityPlace();
-				for(CityPlace c:clist){
-					//System.out.println(c.getId()+":"+c.getName());
-					List<CountryPlace> sList = new ArrayList<CountryPlace>();
-					sList =c.getSubPlaceList();
-					for(CountryPlace cp:sList){
-						System.out.println(c.getId()+":"+c.getName()+"-------"+cp.getId()+":"+cp.getName());
-					}
-				}
-			}
-			
-			
-			int module=user.getModule();
-			String privilegeCode=user.getPriCode();
-			QueryParamImpl param = new QueryParamImpl();
-			GetWarningparaProcedure getWarningparaProcedure= new GetWarningparaProcedure();
-			param.prepareQueryParam(module,privilegeCode, "");
-			param.set("paramNo", Constant.CarFillTimesWarning);
-			
-			PreferEntry entry = getWarningparaProcedure.getwarningparaProcedure1(1, 1, module, privilegeCode, "", Constant.CarFillTimesWarning);
-			
-			user.setPrefer(Constant.CarFillTimesWarning, entry);
-			
-			param.set("paramNo", Constant.CylinderPreWarningTime);
-			
-			PreferEntry entry1 = getWarningparaProcedure.getwarningparaProcedure1(1, 1, module, privilegeCode, "", Constant.CylinderPreWarningTime);
-			
-			user.setPrefer(Constant.CylinderPreWarningTime, entry1);
-			
-			param.set("paramNo", Constant.NetworkDisconnectedTimeWarning);
-			
-			
-			PreferEntry entry2 = getWarningparaProcedure.getwarningparaProcedure1(1, 1, module, privilegeCode, "", Constant.NetworkDisconnectedTimeWarning);
-			
-			user.setPrefer(Constant.NetworkDisconnectedTimeWarning, entry2);
-			
-			param.set("paramNo", Constant.ForeignCarFillWarning);
-			
-			PreferEntry entry3 = getWarningparaProcedure.getwarningparaProcedure1(1, 1, module, privilegeCode, "", Constant.ForeignCarFillWarning);
-			
-			user.setPrefer(Constant.ForeignCarFillWarning, entry3);
-			
-			session.setAttribute(Constant.userMark, user);// 保存用户到session
-			session.setAttribute(Constant.moudel, modal);// 保存用户到session
-			session.setAttribute("userOperatorNo", user.getUserOperatorNo());
-			session.setAttribute("selectProvice", privilegeCode.length()>2?privilegeCode.substring(0, 2):privilegeCode);
-			Constant.loginint=1;
-			Constant.loginint1=1;
-//			SimpleDateFormat df = new SimpleDateFormat("yyyy年MM月dd日 HH时mm分ss秒");//设置日期格式
-//			log.debug("---------------------------------------------------------------------------------当前登陆时间:"+df.format(new java.util.Date())+"     登陆类型moudel:"+modal+"(1为监管部门,2为检验站,3为改装厂,4为充装站)---------------------------------------------------------------------------------");
-			String pc = privilegeCode;
-			String place = "权限空,未查询到权限区域";
-			if(pc!=null&&!pc.equals("")){
-				switch(pc.length()){
-					case 2: place = authorityRegionPlacelist.get(0).getName();break;
-					case 4: place = authorityRegionPlacelist.get(0).getCityPlace().get(0).getName();break;
-					case 6: place = authorityRegionPlacelist.get(0).getCityPlace().get(0).getSubPlaceList().get(0).getName();break;
-					default:place = "未知权限区域";break;
-				}
-				
-			}
-			session.setAttribute("place", place);
-			Util uu=new Util();
-			Collections.sort((List<CityPlace>)authorityRegionPlacelist.get(0).getCityPlace(), uu);
-			if(Integer.parseInt(authorityRegionPlacelist.get(0).getCityPlace().get(0).getId())==0){
-				authorityRegionPlacelist.get(0).getCityPlace().get(0).setName("全部");
-			}
-			log.debug("---------------------------------------------------------------------------------登陆成功  类型moudel:"+modal+"(1为监管部门,2为检验站,3为改装厂,4为充装站)---------------------------------------------------------------------------------");
-//			if(isMobile){
-//				Map map=new HashMap();
-//				map.put("ret", "0");
-//				map.put("errcode", "0");
-//				map.put("msg", "登录成功");
-//				map.put("nickname", "erom");
-//				map.put("userhead", "/img/users/head/avatar.png");
-//				map.put("userid", "11653");
-//				map.put("email", "123456789@qq.com");
-//				map.put("role", "0");
-//				String rs = new JSONObject().fromObject(map).toString();
-//				res.setContentType("text/html;charset=utf-8");
-//				PrintWriter out = res.getWriter();
-//				out.write(rs);
-//				return;
-//			}
-			if(MyFilter.specialUser!=null&&!MyFilter.specialUser.trim().equals("")){
-				String[] s = MyFilter.specialUser.split(";");
-				for(int i=0;i<s.length;i++){
-					if(s[i]!=null&&!s[i].trim().equals("")&&s[i].equals(user.getUserOperatorNo())){
-						req.getRequestDispatcher("jsp/rzx/specialuserman.jsp").forward(req, res);
-						session.setAttribute("specialUser", "1");
-						return;
-					}
-				}
-			}
-			
-			if(modal.equals("1")){//监管部门管理
-				if(hiddencarAuth!=2&&hiddencarInput==2){
-					req.getRequestDispatcher("jsp/rzx/bgman_carinput.jsp").forward(req, res);
-				}else if(hiddencarAuth==2&&hiddencarInput!=2){
-					req.getRequestDispatcher("jsp/rzx/bgman_carauth.jsp").forward(req, res);
-				}else if(hiddencarAuth==2&&hiddencarInput==2){
-					req.getRequestDispatcher("jsp/rzx/bgman_carinputauth.jsp").forward(req, res);
-				}else{
-					req.getRequestDispatcher("jsp/rzx/bgman.jsp").forward(req, res);
-				}
-				return;
-				
-			}else if(modal.equals("4")){//充装站
-				req.getRequestDispatcher("jsp/rzx/fillingbgman.jsp").forward(req, res);
-				return;
-			}else if(modal.equals("2")){//检验站
-				req.getRequestDispatcher("jsp/rzx/testingbgman.jsp").forward(req, res);
-				return;
-			}else if(modal.equals("3")){//改装厂
-				req.getRequestDispatcher("jsp/rzx/modifybgman.jsp").forward(req, res);
-				return;
-			}
-			
-		}
-//		if(isMobile){
-//			Map map=new HashMap();
-//			map.put("ret", "1");
-//			map.put("errcode", "1");
-//			map.put("msg", "登录失败!");
-//			map.put("nickname", "erom");
-//			map.put("userhead", "/img/users/head/avatar.png");
-//			map.put("userid", "11653");
-//			map.put("email", "123456789@qq.com");
-//			map.put("role", "0");
-//			String rs = new JSONObject().fromObject(map).toString();
-//			res.setContentType("text/html;charset=utf-8");
-//			PrintWriter out = res.getWriter();
-//			out.write(rs);
-//			return;
-//		}
-		
-		addFailNum(session, u);
-		session.setAttribute("failMess", errinfo);
-		req.getRequestDispatcher("jsp/fail/loginfail.jsp").forward(req, res);
-		return;
-		
-	}
-	
-	
-	int errorCount = 5;
-	int minutes = 3;
-	/**
-	 * 校验用户登录失败次数
-	 * @param session
-	 * @param username
-	 * @return
-	 */
-	public boolean checkLock(HttpSession session,String username) {
-		
-		Object o = session.getAttribute(username);
-		if(o==null) {
-			return true;
-		}
-		HashMap<String,Object> map  = (HashMap<String, Object>) o;
-		int num  = (Integer) map.get("num");
-		Date date = (Date) map.get("lastDate");
-		long timeDifference = ((new Date().getTime()-date.getTime())/60/1000);
-		if(num>=errorCount&&timeDifference<minutes) {
-			return false;
-		}
-		return true;
-	}
-	/**
-	 * 新增用户登录失败次数
-	 * @param session
-	 * @param username
-	 */
-	public void addFailNum(HttpSession session, String username) {
-		Object o = session.getAttribute(username);
-		HashMap<String,Object> map = null;
-		int num= 0;
-		if(o==null) {
-			map = new HashMap<String,Object>();
-		}else {
-			map  = (HashMap<String, Object>) o;
-			 num  = (Integer) map.get("num");
-			 Date date = (Date) map.get("lastDate");
-			 long timeDifference = ((new Date().getTime()-date.getTime())/60/1000);
-			 if(timeDifference>=minutes) {
-				 num=0;
-			 }
-		}
-		map.put("num", num+1);
-		map.put("lastDate", new Date());
-		session.setAttribute(username, map);
-	}
-	/**
-	 * 清理用户登录失败的记录
-	 * @param session
-	 * @param username
-	 */
-	public void cleanFailNum(HttpSession session, String username) {
-		session.removeAttribute(username);
-	}
-}
+package com.runzhixing.servlet;
+
+
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+
+import org.apache.log4j.Logger;
+
+import com.runzhixing.bean.AuthorityRegionPlace;
+import com.runzhixing.bean.CityPlace;
+import com.runzhixing.bean.CountryPlace;
+import com.runzhixing.bean.PreferEntry;
+import com.runzhixing.bean.User;
+import com.runzhixing.constant.Constant;
+import com.runzhixing.dao.QueryDao;
+import com.runzhixing.dao.ThirdInterfaceDao;
+import com.runzhixing.filter.MyFilter;
+import com.runzhixing.packageProcedure.GetWarningparaProcedure;
+import com.runzhixing.packageProcedure.LoginProcedure;
+import com.runzhixing.packageProcedure.UserAuthProcedure;
+import com.runzhixing.service.AuthorityRegionService;
+import com.runzhixing.tool.Aes;
+import com.runzhixing.tool.Security;
+import com.runzhixing.tool.Tool;
+import com.runzhixing.tool.Util;
+import com.runzhixing.tool.ValidateDate;
+import com.runzhixing.util.bean.QueryParamImpl;
+import com.runzhixing.util.interf.PlaceLoader;
+/**
+ * 
+ *和登陆相关的servlet
+ *
+ */
+@SuppressWarnings("serial")
+public class LoginServlet extends HttpServlet {
+	private static Logger log= Logger.getLogger(LoginServlet.class);
+	private PlaceLoader placeLoader=null;
+	public void setPlaceLoader(PlaceLoader placeLoader) {
+		this.placeLoader = placeLoader;
+	} 
+	@Override
+	public void service(HttpServletRequest req, HttpServletResponse res)
+			throws ServletException, IOException {
+		
+		
+		
+		int hiddencarInput = 0;
+		int hiddencarAuth = 0;
+		int fillAuth = 0;
+		String errinfo ="用户名或密码错误";
+		HttpSession session = req.getSession();
+		User user = new User();
+		String result = "";
+		//设置请求编码
+		req.setCharacterEncoding("UTF-8");
+		//获取页面数据
+		String u = req.getParameter("un");
+		
+		String p = req.getParameter("ps");
+		String modal = req.getParameter("modal");
+		
+		
+		
+	
+		
+		if(!checkLock(session, u)) {
+			session.setAttribute("failMess", "你已登录失败次数过多,将锁定3分钟。");
+			req.getRequestDispatcher("jsp/fail/loginfail.jsp").forward(req, res);
+			return;
+    	}
+		
+		
+		
+		//System.out.println("u="+u+"   p="+p+"  modal="+modal);
+		if(!Util.isNumeric(modal)){
+			req.getRequestDispatcher("jsp/fail/loginfail.jsp").forward(req, res);
+			return;
+		}
+		String ua= req.getHeader("User-Agent");
+//		Boolean isMobile = StringUtil.checkAgentIsMobile(ua);
+		String validatecode = req.getParameter("validatecode");
+		String rcode =(String)session.getAttribute("rCode");
+		String rCodess =(String)session.getAttribute("rCodess");
+		
+		ValidateDate vd = new ValidateDate();
+		//判断是否登陆成功
+//		if(isMobile||(vd.validateNull(u)&&vd.validateNull(p)&&vd.validateNull(validatecode)&&vd.validateNull(rcode))){
+//			if(isMobile||(validatecode.replace(" ", "").equals(rcode))){
+		if((vd.validateNull(u)&&vd.validateNull(p)&&vd.validateNull(validatecode)&&vd.validateNull(rcode))){
+			if((validatecode.replace(" ", "").equals(rcode))){
+				session.removeAttribute("rCode");
+				
+				try {
+//					p = AesUtil.aesDecrypt(p);
+					p = Aes.aesDecrypt(p);
+				} catch (Exception e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+//				if(p.contains("hzb"+rCodess)){
+//					p = p.substring(0,p.indexOf("hzb"+rCodess));
+//				}else{
+//					session.setAttribute("failMess", "未获取到随机码");
+//					req.getRequestDispatcher("jsp/fail/loginfail.jsp").forward(req, res);
+//					return;
+//				}
+					p = p.substring(0,p.indexOf("hzb"));
+				
+				
+				
+				
+				user = new LoginProcedure().login(u, Security.md5(p), modal);
+				result = user.getLoginInfo().trim();
+				if(result.equals(Constant.loginResult)&&user.isValidUser()){
+					int hiddenphone=new UserAuthProcedure().getUserAuth(user.getUserOperatorNo(), 1, 1, 1, 9);
+					
+					String stationNo = new QueryDao().getStationNo(user.getUserOperatorNo());
+					req.getSession().setAttribute("stationNo", stationNo);
+					req.getSession().setAttribute("modal", modal);
+					req.getSession().setAttribute("hiddenphone", hiddenphone+"");
+					req.getSession().setAttribute("sOperatorNo", user.getUserOperatorNo()+"");
+					req.getSession().setAttribute("PrivilegeCode", user.getPrivilegeCode()+"");
+					req.getSession().setAttribute("PrivilegeCode1", user.getPrivilegeCode()+"");
+					try{
+						hiddencarInput=new UserAuthProcedure().getUserAuth(user.getUserOperatorNo(), 1, 1, 1, 11);//网上车辆数据录入
+					}catch(Exception e){
+						e.printStackTrace();
+						hiddencarInput = 0;
+					}
+					
+					req.getSession().setAttribute("hiddencarInput", hiddencarInput+"");
+					try{
+						hiddencarAuth=new UserAuthProcedure().getUserAuth(user.getUserOperatorNo(), 1, 1, 1, 12);//网上车辆数据审核
+					}catch(Exception e){
+						e.printStackTrace();
+						hiddencarAuth = 0;
+					}
+					
+					
+					req.getSession().setAttribute("hiddencarAuth", hiddencarAuth+"");
+					
+					try{
+						fillAuth=new UserAuthProcedure().getUserAuth(user.getUserOperatorNo(), 1, 1, 2, 21);//充装站  补录  权限
+					}catch(Exception e){
+						e.printStackTrace();
+						fillAuth = 0;
+					}
+					
+					
+					req.getSession().setAttribute("fillAuth", fillAuth+"");
+				}
+				
+			}else{
+				session.removeAttribute("rCode");
+				session.setAttribute("failMess", "验证码有误");
+				req.getRequestDispatcher("jsp/fail/loginfail.jsp").forward(req, res);
+				return;
+			}
+		}else if(!vd.validateNull(u)){
+			session.removeAttribute("rCode");
+			session.setAttribute("failMess", "用户名不能为空");
+			req.getRequestDispatcher("jsp/fail/loginfail.jsp").forward(req, res);
+			return;
+		}else if(!vd.validateNull(p)){
+			session.removeAttribute("rCode");
+			session.setAttribute("failMess", "密码不能为空");
+			req.getRequestDispatcher("jsp/fail/loginfail.jsp").forward(req, res);
+			return;
+		}else if(!vd.validateNull(validatecode)){
+			session.removeAttribute("rCode");
+			session.setAttribute("failMess", "验证码不能为空");
+			req.getRequestDispatcher("jsp/fail/loginfail.jsp").forward(req, res);
+			return;
+		}else{
+			session.removeAttribute("rCode");
+			session.setAttribute("failMess", "出现异常");
+			req.getRequestDispatcher("jsp/fail/loginfail.jsp").forward(req, res);
+			return;
+		}
+		//登录成功,账号正常
+		if(result.equals(Constant.loginResult)&&user.isValidUser()){
+			cleanFailNum(session,u);
+			session.setAttribute(Constant.userName, u);
+			if(Tool.pwdRules(p)<4){//密码强度弱
+				session.setAttribute(Constant.moudel, modal);// 保存用户到session
+	
+				req.getRequestDispatcher("jsp/rzx/alterPWD.jsp").forward(req, res);
+				return;
+			}
+			Constant.storageSession = u;
+			Constant.sessionId = session.getId();
+			session.setAttribute(Constant.Privilege, user.getPrivilegeCode());
+			//得到账号权限玛,由此计算出改账号的可操作的地域
+			if(!Tool.isNullOrEmpty(user.getPriCode())){
+				String auth = user.getPriCode();
+				if(auth.length()>6){
+					auth = auth.substring(0,6);
+				}
+				String authRegionName = ThirdInterfaceDao.getAuthRegionName(auth);
+				session.setAttribute("authRegionName", authRegionName);// 保存用户到session
+			}
+			
+			List<AuthorityRegionPlace> authorityRegionPlacelist = new AuthorityRegionService().authorityRegion(user.getPriCode());
+			user.setPrivilegePlaces1(authorityRegionPlacelist);
+			
+			for( AuthorityRegionPlace a:authorityRegionPlacelist){
+				List<CityPlace> clist = new ArrayList<CityPlace>();	
+				clist = a.getCityPlace();
+				for(CityPlace c:clist){
+					//System.out.println(c.getId()+":"+c.getName());
+					List<CountryPlace> sList = new ArrayList<CountryPlace>();
+					sList =c.getSubPlaceList();
+					for(CountryPlace cp:sList){
+						System.out.println(c.getId()+":"+c.getName()+"-------"+cp.getId()+":"+cp.getName());
+					}
+				}
+			}
+			
+			
+			int module=user.getModule();
+			String privilegeCode=user.getPriCode();
+			QueryParamImpl param = new QueryParamImpl();
+			GetWarningparaProcedure getWarningparaProcedure= new GetWarningparaProcedure();
+			param.prepareQueryParam(module,privilegeCode, "");
+			param.set("paramNo", Constant.CarFillTimesWarning);
+			
+			PreferEntry entry = getWarningparaProcedure.getwarningparaProcedure1(1, 1, module, privilegeCode, "", Constant.CarFillTimesWarning);
+			
+			user.setPrefer(Constant.CarFillTimesWarning, entry);
+			
+			param.set("paramNo", Constant.CylinderPreWarningTime);
+			
+			PreferEntry entry1 = getWarningparaProcedure.getwarningparaProcedure1(1, 1, module, privilegeCode, "", Constant.CylinderPreWarningTime);
+			
+			user.setPrefer(Constant.CylinderPreWarningTime, entry1);
+			
+			param.set("paramNo", Constant.NetworkDisconnectedTimeWarning);
+			
+			
+			PreferEntry entry2 = getWarningparaProcedure.getwarningparaProcedure1(1, 1, module, privilegeCode, "", Constant.NetworkDisconnectedTimeWarning);
+			
+			user.setPrefer(Constant.NetworkDisconnectedTimeWarning, entry2);
+			
+			param.set("paramNo", Constant.ForeignCarFillWarning);
+			
+			PreferEntry entry3 = getWarningparaProcedure.getwarningparaProcedure1(1, 1, module, privilegeCode, "", Constant.ForeignCarFillWarning);
+			
+			user.setPrefer(Constant.ForeignCarFillWarning, entry3);
+			
+			session.setAttribute(Constant.userMark, user);// 保存用户到session
+			session.setAttribute(Constant.moudel, modal);// 保存用户到session
+			session.setAttribute("userOperatorNo", user.getUserOperatorNo());
+			session.setAttribute("selectProvice", privilegeCode.length()>2?privilegeCode.substring(0, 2):privilegeCode);
+			Constant.loginint=1;
+			Constant.loginint1=1;
+//			SimpleDateFormat df = new SimpleDateFormat("yyyy年MM月dd日 HH时mm分ss秒");//设置日期格式
+//			log.debug("---------------------------------------------------------------------------------当前登陆时间:"+df.format(new java.util.Date())+"     登陆类型moudel:"+modal+"(1为监管部门,2为检验站,3为改装厂,4为充装站)---------------------------------------------------------------------------------");
+			String pc = privilegeCode;
+			String place = "权限空,未查询到权限区域";
+			if(pc!=null&&!pc.equals("")){
+				switch(pc.length()){
+					case 2: place = authorityRegionPlacelist.get(0).getName();break;
+					case 4: place = authorityRegionPlacelist.get(0).getCityPlace().get(0).getName();break;
+					case 6: place = authorityRegionPlacelist.get(0).getCityPlace().get(0).getSubPlaceList().get(0).getName();break;
+					default:place = "未知权限区域";break;
+				}
+				
+			}
+			session.setAttribute("place", place);
+			Util uu=new Util();
+			Collections.sort((List<CityPlace>)authorityRegionPlacelist.get(0).getCityPlace(), uu);
+			if(Integer.parseInt(authorityRegionPlacelist.get(0).getCityPlace().get(0).getId())==0){
+				authorityRegionPlacelist.get(0).getCityPlace().get(0).setName("全部");
+			}
+			log.debug("---------------------------------------------------------------------------------登陆成功  类型moudel:"+modal+"(1为监管部门,2为检验站,3为改装厂,4为充装站)---------------------------------------------------------------------------------");
+//			if(isMobile){
+//				Map map=new HashMap();
+//				map.put("ret", "0");
+//				map.put("errcode", "0");
+//				map.put("msg", "登录成功");
+//				map.put("nickname", "erom");
+//				map.put("userhead", "/img/users/head/avatar.png");
+//				map.put("userid", "11653");
+//				map.put("email", "123456789@qq.com");
+//				map.put("role", "0");
+//				String rs = new JSONObject().fromObject(map).toString();
+//				res.setContentType("text/html;charset=utf-8");
+//				PrintWriter out = res.getWriter();
+//				out.write(rs);
+//				return;
+//			}
+			if(MyFilter.specialUser!=null&&!MyFilter.specialUser.trim().equals("")){
+				String[] s = MyFilter.specialUser.split(";");
+				for(int i=0;i<s.length;i++){
+					if(s[i]!=null&&!s[i].trim().equals("")&&s[i].equals(user.getUserOperatorNo())){
+						req.getRequestDispatcher("jsp/rzx/specialuserman.jsp").forward(req, res);
+						session.setAttribute("specialUser", "1");
+						return;
+					}
+				}
+			}
+			
+			if(modal.equals("1")){//监管部门管理
+				if(hiddencarAuth!=2&&hiddencarInput==2){
+					req.getRequestDispatcher("jsp/rzx/bgman_carinput.jsp").forward(req, res);
+				}else if(hiddencarAuth==2&&hiddencarInput!=2){
+					req.getRequestDispatcher("jsp/rzx/bgman_carauth.jsp").forward(req, res);
+				}else if(hiddencarAuth==2&&hiddencarInput==2){
+					req.getRequestDispatcher("jsp/rzx/bgman_carinputauth.jsp").forward(req, res);
+				}else{
+					req.getRequestDispatcher("jsp/rzx/bgman.jsp").forward(req, res);
+				}
+				return;
+				
+			}else if(modal.equals("4")){//充装站
+				req.getRequestDispatcher("jsp/rzx/fillingbgman.jsp").forward(req, res);
+				return;
+			}else if(modal.equals("2")){//检验站
+				req.getRequestDispatcher("jsp/rzx/testingbgman.jsp").forward(req, res);
+				return;
+			}else if(modal.equals("3")){//改装厂
+				req.getRequestDispatcher("jsp/rzx/modifybgman.jsp").forward(req, res);
+				return;
+			}
+			
+		}
+//		if(isMobile){
+//			Map map=new HashMap();
+//			map.put("ret", "1");
+//			map.put("errcode", "1");
+//			map.put("msg", "登录失败!");
+//			map.put("nickname", "erom");
+//			map.put("userhead", "/img/users/head/avatar.png");
+//			map.put("userid", "11653");
+//			map.put("email", "123456789@qq.com");
+//			map.put("role", "0");
+//			String rs = new JSONObject().fromObject(map).toString();
+//			res.setContentType("text/html;charset=utf-8");
+//			PrintWriter out = res.getWriter();
+//			out.write(rs);
+//			return;
+//		}
+		
+		addFailNum(session, u);
+		session.setAttribute("failMess", errinfo);
+		req.getRequestDispatcher("jsp/fail/loginfail.jsp").forward(req, res);
+		return;
+		
+	}
+	
+	
+	int errorCount = 5;
+	int minutes = 3;
+	/**
+	 * 校验用户登录失败次数
+	 * @param session
+	 * @param username
+	 * @return
+	 */
+	public boolean checkLock(HttpSession session,String username) {
+		
+		Object o = session.getAttribute(username);
+		if(o==null) {
+			return true;
+		}
+		HashMap<String,Object> map  = (HashMap<String, Object>) o;
+		int num  = (Integer) map.get("num");
+		Date date = (Date) map.get("lastDate");
+		long timeDifference = ((new Date().getTime()-date.getTime())/60/1000);
+		if(num>=errorCount&&timeDifference<minutes) {
+			return false;
+		}
+		return true;
+	}
+	/**
+	 * 新增用户登录失败次数
+	 * @param session
+	 * @param username
+	 */
+	public void addFailNum(HttpSession session, String username) {
+		Object o = session.getAttribute(username);
+		HashMap<String,Object> map = null;
+		int num= 0;
+		if(o==null) {
+			map = new HashMap<String,Object>();
+		}else {
+			map  = (HashMap<String, Object>) o;
+			 num  = (Integer) map.get("num");
+			 Date date = (Date) map.get("lastDate");
+			 long timeDifference = ((new Date().getTime()-date.getTime())/60/1000);
+			 if(timeDifference>=minutes) {
+				 num=0;
+			 }
+		}
+		map.put("num", num+1);
+		map.put("lastDate", new Date());
+		session.setAttribute(username, map);
+	}
+	/**
+	 * 清理用户登录失败的记录
+	 * @param session
+	 * @param username
+	 */
+	public void cleanFailNum(HttpSession session, String username) {
+		session.removeAttribute(username);
+	}
+}