git-svn-id: https://192.168.57.71/svn/jsgkj@1817 931142cf-59ea-a443-aa0e-51397b428577

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/ckxxadd.jsp

@@ -115,7 +115,6 @@ function clickck(){
 					str+="<td>"+ck.ssmtzw+"</td>";
 					str+="<td>"+ck.szgkzw+"</td>";
 					str+="<td>"+ck.szgqzw+"</td>";
-					str+="<td>"+ck.wxpckzw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ckxxview('"+ck.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ckxxedit('"+ck.id+"')\" title='编辑'> <i class='glyphicon glyphicon-pencil'></i> </a>";
@@ -142,7 +141,6 @@ function clickck(){
 			<th width="15%">前沿码头名称</th>
 			<th width="15%">所在港口</th>
 			<th width="10%">所在港区</th>
-       		<th width="10%">是否危险品仓库</th>
 	        <th width="20%">操作</th>
 		</tr>
 		<tbody id="ckxxdiv"></tbody>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/ckxxedit.jsp

@@ -116,7 +116,6 @@ function clickck(){
 					str+="<td>"+ck.ssmtzw+"</td>";
 					str+="<td>"+ck.szgkzw+"</td>";
 					str+="<td>"+ck.szgqzw+"</td>";
-					str+="<td>"+ck.wxpckzw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ckxxview('"+ck.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ckxxedit('"+ck.id+"')\" title='编辑'> <i class='glyphicon glyphicon-pencil'></i> </a>";
@@ -143,7 +142,6 @@ function clickck(){
 			<th width="15%">前沿码头名称</th>
 			<th width="15%">所在港口</th>
 			<th width="10%">所在港区</th>
-       		<th width="10%">是否危险品仓库</th>
 	        <th width="20%">操作</th>
 		</tr>
 		<tbody id="ckxxdiv"></tbody>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/ckxxview.jsp

@@ -25,7 +25,6 @@
 					str+="<td>"+ck.ssmtzw+"</td>";
 					str+="<td>"+ck.szgkzw+"</td>";
 					str+="<td>"+ck.szgqzw+"</td>";
-					str+="<td>"+ck.wxpckzw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ckxxview('"+ck.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
@@ -49,7 +48,6 @@
 			<th width="15%">前沿码头名称</th>
 			<th width="15%">所在港口</th>
 			<th width="10%">所在港区</th>
-       		<th width="10%">是否危险品仓库</th>
 	        <th width="20%">操作</th>
 		</tr>
 		<tbody id="ckxxdiv"></tbody>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/dcxxadd.jsp

@@ -117,7 +117,6 @@ function clickdc(){
 					str+="<td>"+dc.zwdcyt+"</td>";
 					str+="<td>"+dc.dczmj+"</td>";
 					str+="<td>"+(dc.dczrl==null ? "":dc.dczrl)+"</td>";
-					str+="<td>"+dc.wxpdczw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"dcxxview('"+dc.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"dcxxedit('"+dc.id+"')\" title='编辑'> <i class='glyphicon glyphicon-pencil'></i> </a>";
@@ -147,7 +146,6 @@ function clickdc(){
 			<th width="10%">堆场用途</th>
 			<th width="10%">堆场总面积<br>（平方米）</th>
 			<th width="10%">堆场总容量<br>（吨）</th>
-			<th width="10%">是否危险品堆场</th>
 			<th width="20%">操作</th>
 		</tr>
 		<tbody id="dcxxdiv"></tbody>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/dcxxedit.jsp

@@ -118,7 +118,6 @@ function clickdc(){
 					str+="<td>"+dc.zwdcyt+"</td>";
 					str+="<td>"+dc.dczmj+"</td>";
 					str+="<td>"+(dc.dczrl==null ? "":dc.dczrl)+"</td>";
-					str+="<td>"+dc.wxpdczw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"dcxxview('"+dc.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"dcxxedit('"+dc.id+"')\" title='编辑'> <i class='glyphicon glyphicon-pencil'></i> </a>";
@@ -148,7 +147,6 @@ function clickdc(){
 			<th width="10%">堆场用途</th>
 			<th width="10%">堆场总面积<br>（平方米）</th>
 			<th width="10%">堆场总容量<br>（吨）</th>
-			<th width="10%">是否危险品堆场</th>
 			<th width="20%">操作</th>
 		</tr>
 		<tbody id="dcxxdiv"></tbody>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/dcxxview.jsp

@@ -29,7 +29,6 @@
 					str+="<td>"+dc.zwdcyt+"</td>";
 					str+="<td>"+dc.dczmj+"</td>";
 					str+="<td>"+(dc.dczrl==null ? "":dc.dczrl)+"</td>";
-					str+="<td>"+dc.wxpdczw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"dcxxview('"+dc.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
@@ -57,7 +56,6 @@
 			<th width="10%">堆场用途</th>
 			<th width="10%">堆场总面积<br>（平方米）</th>
 			<th width="10%">堆场总容量<br>（吨）</th>
-			<th width="10%">是否危险品堆场</th>
 	        <th width="20%">操作</th>
 		</tr>
 		<tbody id="dcxxdiv"></tbody>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/ckxxadd.jsp

@@ -114,7 +114,6 @@ function clickck(){
 					str+="<td>"+ck.ssmtzw+"</td>";
 					str+="<td>"+ck.szgkzw+"</td>";
 					str+="<td>"+ck.szgqzw+"</td>";
-					str+="<td>"+ck.wxpckzw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ckxxview('"+ck.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i></a>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ckxxedit('"+ck.id+"')\" title='编辑'> <i class='glyphicon glyphicon-pencil'></i></a>";
@@ -141,7 +140,6 @@ function clickck(){
 			<th width="15%">前沿码头名称</th>
 			<th width="15%">所在港口</th>
 			<th width="10%">所在港区</th>
-       		<th width="10%">是否危险品仓库</th>
 	        <th width="20%">操作</th>
 		</tr>
 		<tbody id="ckxxdiv"></tbody>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/ckxxedit.jsp

@@ -115,7 +115,6 @@ function clickck(){
 					str+="<td>"+ck.ssmtzw+"</td>";
 					str+="<td>"+ck.szgkzw+"</td>";
 					str+="<td>"+ck.szgqzw+"</td>";
-					str+="<td>"+ck.wxpckzw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ckxxview('"+ck.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i></a>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ckxxedit('"+ck.id+"')\" title='编辑'> <i class='glyphicon glyphicon-pencil'></i></a>";
@@ -142,7 +141,6 @@ function clickck(){
 			<th width="15%">前沿码头名称</th>
 			<th width="15%">所在港口</th>
 			<th width="10%">所在港区</th>
-       		<th width="10%">是否危险品仓库</th>
 	        <th width="20%">操作</th>
 		</tr>
 		<tbody id="ckxxdiv"></tbody>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/ckxxview.jsp

@@ -24,7 +24,6 @@
 					str+="<td>"+ck.ssmtzw+"</td>";
 					str+="<td>"+ck.szgkzw+"</td>";
 					str+="<td>"+ck.szgqzw+"</td>";
-					str+="<td>"+ck.wxpckzw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ckxxview('"+ck.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i></a>";
 					str+="</td>";
@@ -46,7 +45,6 @@
 			<th width="15%">前沿码头名称</th>
 			<th width="15%">所在港口</th>
 			<th width="10%">所在港区</th>
-       		<th width="10%">是否危险品仓库</th>
 	        <th width="20%">操作</th>
 		</tr>
 		<tbody id="ckxxdiv"></tbody>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/dcxxadd.jsp

@@ -116,7 +116,6 @@ function clickdc(){
 					str+="<td>"+dc.zwdcyt+"</td>";
 					str+="<td>"+dc.dczmj+"</td>";
 					str+="<td>"+(dc.dczrl==null ? "":dc.dczrl)+"</td>";
-					str+="<td>"+dc.wxpdczw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"dcxxview('"+dc.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"dcxxedit('"+dc.id+"')\" title='编辑'> <i class='glyphicon glyphicon-pencil'></i> </a>";
@@ -146,7 +145,6 @@ function clickdc(){
 			<th width="10%">堆场用途</th>
 			<th width="10%">堆场总面积<br>（平方米）</th>
 			<th width="10%">堆场总容量<br>（吨）</th>
-			<th width="10%">是否危险品堆场</th>
 			<th width="20%">操作</th>
 		</tr>
 		<tbody id="dcxxdiv"></tbody>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/dcxxedit.jsp

@@ -117,7 +117,6 @@ function clickdc(){
 					str+="<td>"+dc.zwdcyt+"</td>";
 					str+="<td>"+dc.dczmj+"</td>";
 					str+="<td>"+(dc.dczrl==null ? "":dc.dczrl)+"</td>";
-					str+="<td>"+dc.wxpdczw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"dcxxview('"+dc.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"dcxxedit('"+dc.id+"')\" title='编辑'> <i class='glyphicon glyphicon-pencil'></i> </a>";
@@ -147,7 +146,6 @@ function clickdc(){
 			<th width="10%">堆场用途</th>
 			<th width="10%">堆场总面积<br>（平方米）</th>
 			<th width="10%">堆场总容量<br>（吨）</th>
-			<th width="10%">是否危险品堆场</th>
 			<th width="20%">操作</th>
 		</tr>
 		<tbody id="dcxxdiv"></tbody>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/dcxxview.jsp

@@ -28,7 +28,6 @@
 					str+="<td>"+dc.zwdcyt+"</td>";
 					str+="<td>"+dc.dczmj+"</td>";
 					str+="<td>"+(dc.dczrl==null ? "":dc.dczrl)+"</td>";
-					str+="<td>"+dc.wxpdczw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"dcxxview('"+dc.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
@@ -56,7 +55,6 @@
 			<th width="10%">堆场用途</th>
 			<th width="10%">堆场总面积<br>（平方米）</th>
 			<th width="10%">堆场总容量<br>（吨）</th>
-			<th width="10%">是否危险品堆场</th>
 	        <th width="20%">操作</th>
 		</tr>
 		<tbody id="dcxxdiv"></tbody>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/ckxxadd.jsp

@@ -26,7 +26,6 @@
 					str+="<td>"+ck.ssmtzw+"</td>";
 					str+="<td>"+ck.szgkzw+"</td>";
 					str+="<td>"+ck.szgqzw+"</td>";
-					str+="<td>"+ck.wxpckzw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ckxxview('"+ck.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
@@ -46,7 +45,6 @@
 			<th width="15%">前沿码头名称</th>
 			<th width="15%">所在港口</th>
 			<th width="10%">所在港区</th>
-       		<th width="10%">是否危险品仓库</th>
 	        <th width="20%">操作</th>
 		</tr>
 		<tbody id="ckxxdiv"></tbody>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/ckxxedit.jsp

@@ -26,7 +26,6 @@
 					str+="<td>"+ck.ssmtzw+"</td>";
 					str+="<td>"+ck.szgkzw+"</td>";
 					str+="<td>"+ck.szgqzw+"</td>";
-					str+="<td>"+ck.wxpckzw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ckxxview('"+ck.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
@@ -46,7 +45,6 @@
 			<th width="15%">前沿码头名称</th>
 			<th width="15%">所在港口</th>
 			<th width="10%">所在港区</th>
-       		<th width="10%">是否危险品仓库</th>
 	        <th width="20%">操作</th>
 		</tr>
 		<tbody id="ckxxdiv"></tbody>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/ckxxview.jsp

@@ -24,7 +24,6 @@
 					str+="<td>"+ck.ssmtzw+"</td>";
 					str+="<td>"+ck.szgkzw+"</td>";
 					str+="<td>"+ck.szgqzw+"</td>";
-					str+="<td>"+ck.wxpckzw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ckxxview('"+ck.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i></a>";
 					str+="</td>";
@@ -46,7 +45,6 @@
 			<th width="15%">前沿码头名称</th>
 			<th width="15%">所在港口</th>
 			<th width="10%">所在港区</th>
-       		<th width="10%">是否危险品仓库</th>
 	        <th width="20%">操作</th>
 		</tr>
 		<tbody id="ckxxdiv"></tbody>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/dcxxadd.jsp

@@ -30,7 +30,6 @@
 					str+="<td>"+dc.zwdcyt+"</td>";
 					str+="<td>"+dc.dczmj+"</td>";
 					str+="<td>"+(dc.dczrl==null ? "":dc.dczrl)+"</td>";
-					str+="<td>"+dc.wxpdczw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"dcxxview('"+dc.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
@@ -56,7 +55,6 @@
 			<th width="10%">堆场用途</th>
 			<th width="10%">堆场总面积<br>（平方米）</th>
 			<th width="10%">堆场总容量<br>（吨）</th>
-			<th width="10%">是否危险品堆场</th>
 			<th width="20%">操作</th>
 		</tr>
 		<tbody id="dcxxdiv"></tbody>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/dcxxedit.jsp

@@ -30,7 +30,6 @@
 					str+="<td>"+dc.zwdcyt+"</td>";
 					str+="<td>"+dc.dczmj+"</td>";
 					str+="<td>"+(dc.dczrl==null ? "":dc.dczrl)+"</td>";
-					str+="<td>"+dc.wxpdczw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"dcxxview('"+dc.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
@@ -56,7 +55,6 @@
 			<th width="10%">堆场用途</th>
 			<th width="10%">堆场总面积<br>（平方米）</th>
 			<th width="10%">堆场总容量<br>（吨）</th>
-			<th width="10%">是否危险品堆场</th>
 			<th width="20%">操作</th>
 		</tr>
 		<tbody id="dcxxdiv"></tbody>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/dcxxview.jsp

@@ -28,7 +28,6 @@
 					str+="<td>"+dc.zwdcyt+"</td>";
 					str+="<td>"+dc.dczmj+"</td>";
 					str+="<td>"+(dc.dczrl==null ? "":dc.dczrl)+"</td>";
-					str+="<td>"+dc.wxpdczw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"dcxxview('"+dc.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
@@ -56,7 +55,6 @@
 			<th width="10%">堆场用途</th>
 			<th width="10%">堆场总面积<br>（平方米）</th>
 			<th width="10%">堆场总容量<br>（吨）</th>
-			<th width="10%">是否危险品堆场</th>
 	        <th width="20%">操作</th>
 		</tr>
 		<tbody id="dcxxdiv"></tbody>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/ckxxadd.jsp

@@ -27,7 +27,6 @@
 					str+="<td>"+ck.ssmtzw+"</td>";
 					str+="<td>"+ck.szgkzw+"</td>";
 					str+="<td>"+ck.szgqzw+"</td>";
-					str+="<td>"+ck.wxpckzw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ckxxview('"+ck.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
@@ -47,7 +46,6 @@
 			<th width="15%">前沿码头名称</th>
 			<th width="15%">所在港口</th>
 			<th width="10%">所在港区</th>
-       		<th width="10%">是否危险品仓库</th>
 	        <th width="20%">操作</th>
 		</tr>
 		<tbody id="ckxxdiv"></tbody>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/ckxxedit.jsp

@@ -27,7 +27,6 @@
 					str+="<td>"+ck.ssmtzw+"</td>";
 					str+="<td>"+ck.szgkzw+"</td>";
 					str+="<td>"+ck.szgqzw+"</td>";
-					str+="<td>"+ck.wxpckzw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ckxxview('"+ck.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
@@ -47,7 +46,6 @@
 			<th width="15%">前沿码头名称</th>
 			<th width="15%">所在港口</th>
 			<th width="10%">所在港区</th>
-       		<th width="10%">是否危险品仓库</th>
 	        <th width="20%">操作</th>
 		</tr>
 		<tbody id="ckxxdiv"></tbody>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/ckxxview.jsp

@@ -25,7 +25,6 @@
 					str+="<td>"+ck.ssmtzw+"</td>";
 					str+="<td>"+ck.szgkzw+"</td>";
 					str+="<td>"+ck.szgqzw+"</td>";
-					str+="<td>"+ck.wxpckzw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ckxxview('"+ck.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
@@ -47,7 +46,6 @@
 			<th width="15%">前沿码头名称</th>
 			<th width="15%">所在港口</th>
 			<th width="10%">所在港区</th>
-       		<th width="10%">是否危险品仓库</th>
 	        <th width="20%">操作</th>
 		</tr>
 		<tbody id="ckxxdiv"></tbody>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/dcxxadd.jsp

@@ -31,7 +31,6 @@
 					str+="<td>"+dc.zwdcyt+"</td>";
 					str+="<td>"+dc.dczmj+"</td>";
 					str+="<td>"+(dc.dczrl==null ? "":dc.dczrl)+"</td>";
-					str+="<td>"+dc.wxpdczw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"dcxxview('"+dc.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
@@ -57,7 +56,6 @@
 			<th width="10%">堆场用途</th>
 			<th width="10%">堆场总面积<br>（平方米）</th>
 			<th width="10%">堆场总容量<br>（吨）</th>
-			<th width="10%">是否危险品堆场</th>
 			<th width="20%">操作</th>
 		</tr>
 		<tbody id="dcxxdiv"></tbody>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/dcxxedit.jsp

@@ -31,7 +31,6 @@
 					str+="<td>"+dc.zwdcyt+"</td>";
 					str+="<td>"+dc.dczmj+"</td>";
 					str+="<td>"+(dc.dczrl==null ? "":dc.dczrl)+"</td>";
-					str+="<td>"+dc.wxpdczw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"dcxxview('"+dc.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
@@ -57,7 +56,6 @@
 			<th width="10%">堆场用途</th>
 			<th width="10%">堆场总面积<br>（平方米）</th>
 			<th width="10%">堆场总容量<br>（吨）</th>
-			<th width="10%">是否危险品堆场</th>
 			<th width="20%">操作</th>
 		</tr>
 		<tbody id="dcxxdiv"></tbody>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/dcxxview.jsp

@@ -29,7 +29,6 @@
 					str+="<td>"+dc.zwdcyt+"</td>";
 					str+="<td>"+dc.dczmj+"</td>";
 					str+="<td>"+(dc.dczrl==null ? "":dc.dczrl)+"</td>";
-					str+="<td>"+dc.wxpdczw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"dcxxview('"+dc.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
@@ -57,7 +56,6 @@
 			<th width="10%">堆场用途</th>
 			<th width="10%">堆场总面积<br>（平方米）</th>
 			<th width="10%">堆场总容量<br>（吨）</th>
-			<th width="10%">是否危险品堆场</th>
 	        <th width="20%">操作</th>
 		</tr>
 		<tbody id="dcxxdiv"></tbody>

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkbg/ctl/XkzbgCtl.java

@@ -402,7 +402,10 @@ public class XkzbgCtl extends BaseWebCtl {
 					// list.add(cb.notEqual(root.get("recordStatus").as(Integer.class),
 					// BaseEntity.RECORD_STATE_DELETE));
 					list.add(cb.equal(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
-					//list.add(cb.equal(root.get("sfyx").as(Integer.class),BaseEntity.RECORD_STATE_VALID));
+					list.add(cb.equal(root.get("sfyx").as(Integer.class),BaseEntity.RECORD_STATE_VALID));
+					Date date = new Date();
+					list.add(cb.greaterThanOrEqualTo(root.get("yxqz").as(Date.class), date));
+					list.add(cb.lessThanOrEqualTo(root.get("yxqq").as(Date.class), date));
 					return cb.and(list.toArray(new Predicate[] {}));
 				}
 			};
@@ -1163,7 +1166,7 @@ public class XkzbgCtl extends BaseWebCtl {
 					list.add(cb.like(root.get("gkjyr").as(String.class), "%" + jyrid + "%"));
 					list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
 					//list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
-					//list.add(cb.equal(root.get("sfyx").as(Integer.class),BaseEntity.RECORD_STATE_VALID));
+					list.add(cb.equal(root.get("sfyx").as(Integer.class),BaseEntity.RECORD_STATE_VALID));
 					Date date = new Date();
 					list.add(cb.greaterThanOrEqualTo(root.get("yxqz").as(Date.class), date));
 					list.add(cb.lessThanOrEqualTo(root.get("yxqq").as(Date.class), date));
@@ -1432,7 +1435,7 @@ public class XkzbgCtl extends BaseWebCtl {
 					list.add(cb.like(root.get("gkjyr").as(String.class), "%" + jyrid + "%"));
 					list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
 					//list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
-					//list.add(cb.equal(root.get("sfyx").as(Integer.class),BaseEntity.RECORD_STATE_VALID));
+					list.add(cb.equal(root.get("sfyx").as(Integer.class),BaseEntity.RECORD_STATE_VALID));
 					Date date = new Date();
 					list.add(cb.greaterThanOrEqualTo(root.get("yxqz").as(Date.class), date));
 					list.add(cb.lessThanOrEqualTo(root.get("yxqq").as(Date.class), date));

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxksq/ctl/XkzsqCtl.java

@@ -444,6 +444,10 @@ public class XkzsqCtl extends BaseWebCtl {
 					list.add(cb.like(root.get("gkjyr").as(String.class), "%" + jyrid + "%"));
 					list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
 					list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
+					list.add(cb.equal(root.get("sfyx").as(Integer.class),BaseEntity.RECORD_STATE_VALID));
+					Date date = new Date();
+					list.add(cb.greaterThanOrEqualTo(root.get("yxqz").as(Date.class), date));
+					list.add(cb.lessThanOrEqualTo(root.get("yxqq").as(Date.class), date));
 					return cb.and(list.toArray(new Predicate[] {}));
 				}
 			};
@@ -815,7 +819,10 @@ public class XkzsqCtl extends BaseWebCtl {
 					list.add(cb.like(root.get("gkjyr").as(String.class), "%" + jyrid + "%"));
 					list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
 					list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
-					list.add(cb.equal(root.get("sfyx").as(Integer.class), BaseEntity.RECORD_STATE_VALID));
+					list.add(cb.equal(root.get("sfyx").as(Integer.class),BaseEntity.RECORD_STATE_VALID));
+					Date date = new Date();
+					list.add(cb.greaterThanOrEqualTo(root.get("yxqz").as(Date.class), date));
+					list.add(cb.lessThanOrEqualTo(root.get("yxqq").as(Date.class), date));
 					return cb.and(list.toArray(new Predicate[] {}));
 				}
 			};
@@ -1043,6 +1050,10 @@ public class XkzsqCtl extends BaseWebCtl {
 					list.add(cb.like(root.get("gkjyr").as(String.class), "%" + jyrid + "%"));
 					list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
 					list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
+					list.add(cb.equal(root.get("sfyx").as(Integer.class),BaseEntity.RECORD_STATE_VALID));
+					Date date = new Date();
+					list.add(cb.greaterThanOrEqualTo(root.get("yxqz").as(Date.class), date));
+					list.add(cb.lessThanOrEqualTo(root.get("yxqq").as(Date.class), date));
 					return cb.and(list.toArray(new Predicate[] {}));
 				}
 			};

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkzx/ctl/XkzzxCtl.java

@@ -1116,6 +1116,7 @@ public class XkzzxCtl extends BaseWebCtl {
 					list.add(cb.like(root.get("gkjyr").as(String.class), "%" + jyrid + "%"));
 					list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
 					//list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
+					list.add(cb.equal(root.get("sfyx").as(Integer.class),BaseEntity.RECORD_STATE_VALID));
 					Date date = new Date();
 					list.add(cb.greaterThanOrEqualTo(root.get("yxqz").as(Date.class), date));
 					list.add(cb.lessThanOrEqualTo(root.get("yxqq").as(Date.class), date));
@@ -1330,6 +1331,7 @@ public class XkzzxCtl extends BaseWebCtl {
 					list.add(cb.like(root.get("gkjyr").as(String.class), "%" + jyrid + "%"));
 					list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
 					//list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
+					list.add(cb.equal(root.get("sfyx").as(Integer.class),BaseEntity.RECORD_STATE_VALID));
 					Date date = new Date();
 					list.add(cb.greaterThanOrEqualTo(root.get("yxqz").as(Date.class), date));
 					list.add(cb.lessThanOrEqualTo(root.get("yxqq").as(Date.class), date));