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

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

@@ -115,8 +115,6 @@ function clickbw(){
 					str+="<td>"+bw.szgkzw+"</td>";
 					str+="<td>"+bw.szgqzw+"</td>";
 					str+="<td>"+(bw.bwytzw==null?"":bw.bwytzw)+"</td>";
-					str+="<td>"+(bw.wxpbwzw==null?"":bw.wxpbwzw)+"</td>";
-					str+="<td>"+(bw.sfdwkfzw==null?"":bw.sfdwkfzw)+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"bwxxview('"+bw.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"bwxxedit('"+bw.id+"')\" title='编辑'> <i class='glyphicon glyphicon-pencil'></i> </a>";
@@ -147,8 +145,6 @@ function clickbw(){
 			<th width="10%">所在港区</th>
 			<!-- <th width="10%">泊位属性</th> -->
 			<th width="15%">泊位用途</th>
-			<th width="5%">是否<br>危险品泊位</th>
-			<th width="5%">是否<br>对外开放泊位</th>
 			<th width="20%">操作</th>
 		</tr>
 		<tbody id="bwxxdiv"></tbody>

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

@@ -116,8 +116,6 @@ function clickbw(){
 					str+="<td>"+bw.szgkzw+"</td>";
 					str+="<td>"+bw.szgqzw+"</td>";
 					str+="<td>"+(bw.bwytzw==null?"":bw.bwytzw)+"</td>";
-					str+="<td>"+(bw.wxpbwzw==null?"":bw.wxpbwzw)+"</td>";
-					str+="<td>"+(bw.sfdwkfzw==null?"":bw.sfdwkfzw)+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"bwxxview('"+bw.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"bwxxedit('"+bw.id+"')\" title='编辑'> <i class='glyphicon glyphicon-pencil'></i> </a>";
@@ -148,8 +146,6 @@ function clickbw(){
 			<th width="10%">所在港区</th>
 			<!-- <th width="10%">泊位属性</th> -->
 			<th width="15%">泊位用途</th>
-			<th width="5%">是否<br>危险品泊位</th>
-			<th width="5%">是否<br>对外开放泊位</th>
 			<th width="20%">操作</th>
 		</tr>
 		<tbody id="bwxxdiv"></tbody>

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

@@ -26,8 +26,6 @@
 					str+="<td>"+bw.szgkzw+"</td>";
 					str+="<td>"+bw.szgqzw+"</td>";
 					str+="<td>"+(bw.bwytzw==null?"":bw.bwytzw)+"</td>";
-					str+="<td>"+(bw.wxpbwzw==null?"":bw.wxpbwzw)+"</td>";
-					str+="<td>"+(bw.sfdwkfzw==null?"":bw.sfdwkfzw)+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"bwxxview('"+bw.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
@@ -55,8 +53,6 @@
 			<th width="10%">所在港区</th>
 			<!-- <th width="10%">泊位属性</th> -->
 			<th width="15%">泊位用途</th>
-			<th width="5%">是否<br>危险品泊位</th>
-			<th width="5%">是否<br>对外开放泊位</th>
 	        <th width="20%">操作</th>
 		</tr>
 		<tbody id="bwxxdiv"></tbody>

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

@@ -1022,7 +1022,7 @@
 											<td>${xkzfz.wxhwpm }</td>
 											<td>${xkzfz.yxqkssjfmt }</td>
 											<td>${xkzfz.yxqjssjfmt }</td>
-											<td><c:if test="${xkzfz.recordStatus==1}">有效</c:if></td>
+											<td><c:if test="${xkzfz.recordStatus==0}">有效</c:if></td>
 											<td><a class="btn btn-default btn-xs" href="#"
 												onclick="parent.main.menuClick('xkzfz','危货作业附证','/xkzfz/view?id=${xkzfz.id}')" title='查看'>
 													<i class="glyphicon glyphicon-search"></i>

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

@@ -889,7 +889,7 @@
 											<td>${xkzfz.wxhwpm }</td>
 											<%-- <td>${xkzfz.yxqkssjfmt }</td> --%>
 											<td>${xkzfz.yxqjssjfmt }</td>
-											<td><c:if test="${xkzfz.recordStatus==1}">有效</c:if></td>
+											<td><c:if test="${xkzfz.recordStatus==10}">有效</c:if></td>
 											<td><a class="btn btn-default btn-xs" href="#"
 												onclick="parent.main.menuClick('xkzfz','危货作业附证','/xkzfz/view?id=${xkzfz.id}')" title='查看'>
 													<i class="glyphicon glyphicon-search"></i>

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

@@ -717,8 +717,6 @@
 						    	<th width="5%">序号</th>
 						    	<th width="12%">许可证编号</th>
 				        		<th width="12%">港口经营人</th>
-				        		<th width="8%">所在港口</th>
-				        		<th width="8%">所在港区</th>
 				    			<th width="10%">法定代表人</th>
 								<th width="8%">有效期至</th>
 								<th width="12%">发证机关</th>
@@ -731,8 +729,6 @@
 					    	<td >${status.count }</td>
 					    	<td >${xkzxx.gkjyxkzh }</td>
 					        <td >${xkzxx.gkjyrzw }</td>
-					        <td >${xkzxx.szgkzw }</td>
-					        <td >${xkzxx.ssgqzw }</td>
 							<td >${xkzxx.fddbr }</td>
 							<td ><fmt:formatDate value='${xkzxx.yxqz }' pattern="yyyy-MM-dd" type="date" dateStyle="long" /></td>
 							<td >${xkzxx.fzjg }</td>
@@ -771,7 +767,7 @@
 							<td >${xkzfz.wxhwpm }</td>
 							<%-- <td >${xkzfz.yxqkssjfmt }</td> --%>
 							<td >${xkzfz.yxqjssjfmt }</td>
-							<td ><c:if test="${xkzfz.recordStatus==1}">有效</c:if></td>
+							<td ><c:if test="${xkzfz.recordStatus==10}">有效</c:if></td>
 					        <td>
 						        <a class="btn btn-default btn-xs" href="#" onclick="xkzbg.detail.viewXkzfz('${xkzfz.id}')" title='查看'>
 						            <i class="glyphicon glyphicon-search"></i>

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

@@ -114,8 +114,6 @@ function clickbw(){
 					str+="<td>"+bw.szgkzw+"</td>";
 					str+="<td>"+bw.szgqzw+"</td>";
 					str+="<td>"+(bw.bwytzw==null?"":bw.bwytzw)+"</td>";
-					str+="<td>"+(bw.wxpbwzw==null?"":bw.wxpbwzw)+"</td>";
-					str+="<td>"+(bw.sfdwkfzw==null?"":bw.sfdwkfzw)+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"bwxxview('"+bw.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i></a>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"bwxxedit('"+bw.id+"')\" title='编辑'> <i class='glyphicon glyphicon-pencil'></i></a>";
@@ -146,8 +144,6 @@ function clickbw(){
 			<th width="10%">所在港区</th>
 			<!-- <th width="10%">泊位属性</th> -->
 			<th width="15%">泊位用途</th>
-			<th width="5%">是否<br>危险品泊位</th>
-			<th width="5%">是否<br>对外开放泊位</th>
 			<th width="20%">操作</th>
 		</tr>
 		<tbody id="bwxxdiv"></tbody>

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

@@ -116,8 +116,6 @@ function clickbw(){
 					str+="<td>"+bw.szgkzw+"</td>";
 					str+="<td>"+bw.szgqzw+"</td>";
 					str+="<td>"+(bw.bwytzw==null?"":bw.bwytzw)+"</td>";
-					str+="<td>"+(bw.wxpbwzw==null?"":bw.wxpbwzw)+"</td>";
-					str+="<td>"+(bw.sfdwkfzw==null?"":bw.sfdwkfzw)+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"bwxxview('"+bw.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i></a>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"bwxxedit('"+bw.id+"')\" title='编辑'> <i class='glyphicon glyphicon-pencil'></i></a>";
@@ -148,8 +146,6 @@ function clickbw(){
 			<th width="10%">所在港区</th>
 			<!-- <th width="10%">泊位属性</th> -->
 			<th width="15%">泊位用途</th>
-			<th width="5%">是否<br>危险品泊位</th>
-			<th width="5%">是否<br>对外开放泊位</th>
 			<th width="20%">操作</th>
 		</tr>
 		<tbody id="bwxxdiv"></tbody>

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

@@ -25,8 +25,6 @@
 					str+="<td>"+bw.szgkzw+"</td>";
 					str+="<td>"+bw.szgqzw+"</td>";
 					str+="<td>"+(bw.bwytzw==null?"":bw.bwytzw)+"</td>";
-					str+="<td>"+(bw.wxpbwzw==null?"":bw.wxpbwzw)+"</td>";
-					str+="<td>"+(bw.sfdwkfzw==null?"":bw.sfdwkfzw)+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"bwxxview('"+bw.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i></a>";
 					str+="</td>";
@@ -54,8 +52,6 @@
 			<th width="10%">所在港区</th>
 			<!-- <th width="10%">泊位属性</th> -->
 			<th width="15%">泊位用途</th>
-			<th width="5%">是否<br>危险品泊位</th>
-			<th width="5%">是否<br>对外开放泊位</th>
 	        <th width="20%">操作</th>
 		</tr>
 		<tbody id="bwxxdiv"></tbody>

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

@@ -926,7 +926,7 @@
 											<td>${xkzfz.yxqjssjfmt }</td>
 											<td><c:if test="${xkzfz.recordStatus==1}">有效</c:if></td>
 											<td><a class="btn btn-default btn-xs" href="#"
-												onclick="xkzsq.detail.viewXkzfz('${xkzfz.id}')" title='查看'>
+												onclick="xkzsq.detail.addXkzfz('${xkzfz.id}')" title='查看'>
 													<i class="glyphicon glyphicon-search"></i>
 											</a></td>
 										</tr>

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

@@ -668,8 +668,6 @@
 						    	<th width="5%">序号</th>
 						    	<th width="12%">许可证编号</th>
 				        		<th width="12%">港口经营人</th>
-				        		<th width="8%">所在港口</th>
-				        		<th width="8%">所在港区</th>
 				    			<th width="10%">法定代表人</th>
 								<th width="8%">有效期至</th>
 								<th width="12%">发证机关</th>
@@ -682,8 +680,6 @@
 					    	<td >${status.count }</td>
 					    	<td >${xkzxx.gkjyxkzh }</td>
 					        <td >${xkzxx.gkjyrzw }</td>
-					        <td >${xkzxx.szgkzw }</td>
-					        <td >${xkzxx.ssgqzw }</td>
 							<td >${xkzxx.fddbr }</td>
 							<td ><fmt:formatDate value='${xkzxx.yxqz }' pattern="yyyy-MM-dd" type="date" dateStyle="long" /></td>
 							<td >${xkzxx.fzjg }</td>
@@ -724,7 +720,7 @@
 							<td >${xkzfz.yxqjssjfmt }</td>
 							<td ><c:if test="${xkzfz.recordStatus==1}">有效</c:if></td>
 					        <td>
-						        <a class="btn btn-default btn-xs" href="#" onclick="xkzsq.detail.viewXkz('${xkzfz.id}')" title='查看'>
+						        <a class="btn btn-default btn-xs" href="#" onclick="xkzsq.detail.viewXkzfz('${xkzfz.id}')" title='查看'>
 						            <i class="glyphicon glyphicon-search"></i>
 						        </a>
 					        </td>

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

@@ -27,8 +27,6 @@
 					str+="<td>"+bw.szgkzw+"</td>";
 					str+="<td>"+bw.szgqzw+"</td>";
 					str+="<td>"+(bw.bwytzw==null?"":bw.bwytzw)+"</td>";
-					str+="<td>"+(bw.wxpbwzw==null?"":bw.wxpbwzw)+"</td>";
-					str+="<td>"+(bw.sfdwkfzw==null?"":bw.sfdwkfzw)+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"bwxxview('"+bw.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
@@ -54,8 +52,6 @@
 			<th width="10%">所在港区</th>
 			<!-- <th width="10%">泊位属性</th> -->
 			<th width="15%">泊位用途</th>
-			<th width="5%">是否<br>危险品泊位</th>
-			<th width="5%">是否<br>对外开放泊位</th>
 			<th width="20%">操作</th>
 		</tr>
 		<tbody id="bwxxdiv"></tbody>

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

@@ -27,8 +27,6 @@
 					str+="<td>"+bw.szgkzw+"</td>";
 					str+="<td>"+bw.szgqzw+"</td>";
 					str+="<td>"+(bw.bwytzw==null?"":bw.bwytzw)+"</td>";
-					str+="<td>"+(bw.wxpbwzw==null?"":bw.wxpbwzw)+"</td>";
-					str+="<td>"+(bw.sfdwkfzw==null?"":bw.sfdwkfzw)+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"bwxxview('"+bw.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
@@ -54,8 +52,6 @@
 			<th width="10%">所在港区</th>
 			<!-- <th width="10%">泊位属性</th> -->
 			<th width="15%">泊位用途</th>
-			<th width="5%">是否<br>危险品泊位</th>
-			<th width="5%">是否<br>对外开放泊位</th>
 			<th width="20%">操作</th>
 		</tr>
 		<tbody id="bwxxdiv"></tbody>

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

@@ -25,8 +25,6 @@
 					str+="<td>"+bw.szgkzw+"</td>";
 					str+="<td>"+bw.szgqzw+"</td>";
 					str+="<td>"+(bw.bwytzw==null?"":bw.bwytzw)+"</td>";
-					str+="<td>"+(bw.wxpbwzw==null?"":bw.wxpbwzw)+"</td>";
-					str+="<td>"+(bw.sfdwkfzw==null?"":bw.sfdwkfzw)+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"bwxxview('"+bw.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
@@ -54,8 +52,6 @@
 			<th width="10%">所在港区</th>
 			<!-- <th width="10%">泊位属性</th> -->
 			<th width="15%">泊位用途</th>
-			<th width="5%">是否<br>危险品泊位</th>
-			<th width="5%">是否<br>对外开放泊位</th>
 	        <th width="20%">操作</th>
 		</tr>
 		<tbody id="bwxxdiv"></tbody>

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

@@ -882,7 +882,7 @@
 											<td>${xkzfz.yxqjssjfmt }</td>
 											<td><c:if test="${xkzfz.recordStatus==1}">有效</c:if></td>
 											<td><a class="btn btn-default btn-xs" href="#"
-												onclick="xkzsq.detail.viewXkzfz('${xkzfz.id}')" title='查看'>
+												onclick="xkzyx.detail.addXkzfz('${xkzfz.id}')" title='查看'>
 													<i class="glyphicon glyphicon-search"></i>
 											</a></td>
 										</tr>

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

@@ -704,8 +704,6 @@
 						    	<th width="5%">序号</th>
 						    	<th width="12%">许可证编号</th>
 				        		<th width="12%">港口经营人</th>
-				        		<th width="8%">所在港口</th>
-				        		<th width="8%">所在港区</th>
 				    			<th width="10%">法定代表人</th>
 								<th width="8%">有效期至</th>
 								<th width="12%">发证机关</th>
@@ -718,8 +716,6 @@
 					    	<td >${status.count }</td>
 					    	<td >${xkzxx.gkjyxkzh }</td>
 					        <td >${xkzxx.gkjyrzw }</td>
-					        <td >${xkzxx.szgkzw }</td>
-					        <td >${xkzxx.ssgqzw }</td>
 							<td >${xkzxx.fddbr }</td>
 							<td ><fmt:formatDate value='${xkzxx.yxqz }' pattern="yyyy-MM-dd" type="date" dateStyle="long" /></td>
 							<td >${xkzxx.fzjg }</td>
@@ -760,7 +756,7 @@
 							<td >${xkzfz.yxqjssjfmt }</td>
 							<td ><c:if test="${xkzfz.recordStatus==1}">有效</c:if></td>
 					        <td>
-						        <a class="btn btn-default btn-xs" href="#" onclick="xkzyx.detail.viewXkz('${xkzfz.id}')" title='查看'>
+						        <a class="btn btn-default btn-xs" href="#" onclick="xkzyx.detail.viewXkzfz('${xkzfz.id}')" title='查看'>
 						            <i class="glyphicon glyphicon-search"></i>
 						        </a>
 					        </td>

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

@@ -28,8 +28,6 @@
 					str+="<td>"+bw.szgkzw+"</td>";
 					str+="<td>"+bw.szgqzw+"</td>";
 					str+="<td>"+(bw.bwytzw==null?"":bw.bwytzw)+"</td>";
-					str+="<td>"+(bw.wxpbwzw==null?"":bw.wxpbwzw)+"</td>";
-					str+="<td>"+(bw.sfdwkfzw==null?"":bw.sfdwkfzw)+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"bwxxview('"+bw.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
@@ -55,8 +53,6 @@
 			<th width="10%">所在港区</th>
 			<!-- <th width="10%">泊位属性</th> -->
 			<th width="15%">泊位用途</th>
-			<th width="5%">是否<br>危险品泊位</th>
-			<th width="5%">是否<br>对外开放泊位</th>
 			<th width="20%">操作</th>
 		</tr>
 		<tbody id="bwxxdiv"></tbody>

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

@@ -28,8 +28,6 @@
 					str+="<td>"+bw.szgkzw+"</td>";
 					str+="<td>"+bw.szgqzw+"</td>";
 					str+="<td>"+(bw.bwytzw==null?"":bw.bwytzw)+"</td>";
-					str+="<td>"+(bw.wxpbwzw==null?"":bw.wxpbwzw)+"</td>";
-					str+="<td>"+(bw.sfdwkfzw==null?"":bw.sfdwkfzw)+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"bwxxview('"+bw.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
@@ -55,8 +53,6 @@
 			<th width="10%">所在港区</th>
 			<!-- <th width="10%">泊位属性</th> -->
 			<th width="15%">泊位用途</th>
-			<th width="5%">是否<br>危险品泊位</th>
-			<th width="5%">是否<br>对外开放泊位</th>
 			<th width="20%">操作</th>
 		</tr>
 		<tbody id="bwxxdiv"></tbody>

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

@@ -26,8 +26,6 @@
 					str+="<td>"+bw.szgkzw+"</td>";
 					str+="<td>"+bw.szgqzw+"</td>";
 					str+="<td>"+(bw.bwytzw==null?"":bw.bwytzw)+"</td>";
-					str+="<td>"+(bw.wxpbwzw==null?"":bw.wxpbwzw)+"</td>";
-					str+="<td>"+(bw.sfdwkfzw==null?"":bw.sfdwkfzw)+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"bwxxview('"+bw.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
@@ -55,8 +53,6 @@
 			<th width="10%">所在港区</th>
 			<!-- <th width="10%">泊位属性</th> -->
 			<th width="15%">泊位用途</th>
-			<th width="5%">是否<br>危险品泊位</th>
-			<th width="5%">是否<br>对外开放泊位</th>
 	        <th width="20%">操作</th>
 		</tr>
 		<tbody id="bwxxdiv"></tbody>

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

@@ -843,7 +843,7 @@
 											<td><c:if test="${xkzxx.sfyx=='1'}">有效</c:if> <c:if
 													test="${xkzxx.sfyx!='1'}">无效</c:if></td>
 											<td><a class="btn btn-default btn-xs" href="#"
-												onclick="xkzsq.detail.addXkz('${xkzxx.id}')" title='查看'>
+												onclick="xkzzx.detail.addXkz('${xkzxx.id}')" title='查看'>
 													<i class="glyphicon glyphicon-search"></i>
 											</a></td>
 										</tr>
@@ -871,9 +871,9 @@
 											<td>${xkzfz.wxhwpm }</td>
 											<%-- <td>${xkzfz.yxqkssjfmt }</td> --%>
 											<td>${xkzfz.yxqjssjfmt }</td>
-											<td><c:if test="${xkzfz.recordStatus==1}">有效</c:if></td>
+											<td><c:if test="${xkzfz.recordStatus==0}">有效</c:if></td>
 											<td><a class="btn btn-default btn-xs" href="#"
-												onclick="xkzsq.detail.viewXkzfz('${xkzfz.id}')" title='查看'>
+												onclick="xkzzx.detail.addXkzfz('${xkzfz.id}')" title='查看'>
 													<i class="glyphicon glyphicon-search"></i>
 											</a></td>
 										</tr>

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

@@ -724,9 +724,9 @@
 											<td>${xkzfz.wxhwpm }</td>
 											<%-- <td>${xkzfz.yxqkssjfmt }</td> --%>
 											<td>${xkzfz.yxqjssjfmt }</td>
-											<td><c:if test="${xkzfz.recordStatus==1}">有效</c:if></td>
+											<td><c:if test="${xkzfz.recordStatus==0}">有效</c:if></td>
 											<td><a class="btn btn-default btn-xs" href="#"
-												onclick="xkzzx.detail.editXkzfz('${xkzfz.id}')" title='查看'>
+												onclick="xkzzx.detail.viewXkzfz('${xkzfz.id}')" title='查看'>
 													<i class="glyphicon glyphicon-search"></i>
 											</a></td>
 										</tr>

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

@@ -694,8 +694,6 @@
 						    	<th width="5%">序号</th>
 						    	<th width="12%">许可证编号</th>
 				        		<th width="12%">港口经营人</th>
-				        		<th width="8%">所在港口</th>
-				        		<th width="8%">所在港区</th>
 				    			<th width="10%">法定代表人</th>
 								<th width="8%">有效期至</th>
 								<th width="12%">发证机关</th>
@@ -708,8 +706,6 @@
 					    	<td >${status.count }</td>
 					    	<td >${xkzxx.gkjyxkzh }</td>
 					        <td >${xkzxx.gkjyrzw }</td>
-					        <td >${xkzxx.szgkzw }</td>
-					        <td >${xkzxx.ssgqzw }</td>
 							<td >${xkzxx.fddbr }</td>
 							<td ><fmt:formatDate value='${xkzxx.yxqz }' pattern="yyyy-MM-dd" type="date" dateStyle="long" /></td>
 							<td >${xkzxx.fzjg }</td>
@@ -748,9 +744,9 @@
 							<td >${xkzfz.wxhwpm }</td>
 							<%-- <td >${xkzfz.yxqkssjfmt }</td> --%>
 							<td >${xkzfz.yxqjssjfmt }</td>
-							<td ><c:if test="${xkzfz.recordStatus==1}">有效</c:if></td>
+							<td ><c:if test="${xkzfz.recordStatus==0}">有效</c:if></td>
 					        <td>
-						        <a class="btn btn-default btn-xs" href="#" onclick="xkzzx.detail.viewXkz('${xkzfz.id}')" title='查看'>
+						        <a class="btn btn-default btn-xs" href="#" onclick="xkzzx.detail.viewXkzfz('${xkzfz.id}')" title='查看'>
 						            <i class="glyphicon glyphicon-search"></i>
 						        </a>
 					        </td>

gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gkjyxkgl/gkjyzkbg/xkzbgdetail.js

@@ -103,6 +103,12 @@ function showgk() {
 function showgq() {
 	initgqSelect('gqsel', '', xkzbg.detail.szdData, $('.gkselectpicker').val(), null, 300);
 }
+
+xkzbg.detail.viewXkzfz = function(xkzid){
+	var path="/xkzbg/viewmain?path=2:id="+$('#id').val()+":flag="+$('#flag').val();
+	location.href=$.app+'/xkzfz/view?id='+xkzid+'&path='+path;
+}
+
 xkzbg.detail.viewXkz = function(xkzid){
 	var path="/xkzbg/viewmain?path=1:id="+$('#id').val()+":flag="+$('#flag').val();
 	location.href=$.app+'/xkzxx/view?id='+xkzid+'&path='+path;

gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gkjyxkgl/gkjyzksq/xkzsqdetail.js

@@ -110,6 +110,16 @@ xkzsq.detail.viewXkz = function(xkzid){
 	location.href=$.app+'/xkzxx/view?id='+xkzid+'&path='+path;
 }
 
+xkzsq.detail.viewXkzfz = function(xkzid){
+	var path="/xkzsq/viewmain?path=2:id="+$('#id').val()+":flag="+$('#flag').val();
+	location.href=$.app+'/xkzfz/view?id='+xkzid+'&path='+path;
+}
+
+xkzsq.detail.addXkzfz = function(xkzid){
+	var path="/xkzsq/addmain?path=2:id="+$('#jyrid').val()+":flag="+$('#flag').val();
+	location.href=$.app+'/xkzfz/view?id='+xkzid+'&path='+path;
+}
+
 xkzsq.detail.addXkz = function(xkzid){
 	var path="/xkzsq/addmain?path=1:id="+$('#id').val()+"";
 	location.href=$.app+'/xkzxx/view?id='+xkzid+'&path='+path;

gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gkjyxkgl/gkjyzkyx/xkzyxdetail.js

@@ -16,13 +16,23 @@ xkzyx.detail.init = function() {
 	initmtSelect('mtsel', '', '', '', 300)
 }
 
+xkzyx.detail.addXkzfz = function(xkzid){
+	var path="/xkzyx/addmain?path=2:id="+$('#jyrid').val()+":flag="+$('#flag').val();
+	location.href=$.app+'/xkzfz/view?id='+xkzid+'&path='+path;
+}
+
+xkzyx.detail.viewXkzfz = function(xkzid){
+	var path="/xkzyx/viewmain?path=2:id="+$('#id').val()+":flag="+$('#flag').val();
+	location.href=$.app+'/xkzfz/view?id='+xkzid+'&path='+path;
+}
+
 xkzyx.detail.viewXkz = function(xkzid){
 	var path="/xkzyx/viewmain?path=1:id="+$('#id').val()+":flag="+$('#flag').val();
 	location.href=$.app+'/xkzxx/view?id='+xkzid+'&path='+path;
 }
 
 xkzyx.detail.addXkz = function(xkzid){
-	var path="/xkzyx/addmain?path=1:id="+$('#jyr').val()+"";
+	var path="/xkzyx/addmain?path=1:id="+$('#jyrid').val()+"";
 	location.href=$.app+'/xkzxx/view?id='+xkzid+'&path='+path;
 }
 

gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gkjyxkgl/gkjyzkzx/xkzzxdetail.js

@@ -60,13 +60,23 @@ function showgq() {
 			.val(), null, 300);
 }
 
+xkzzx.detail.viewXkzfz = function(xkzid){
+	var path="/xkzzx/viewmain?path=2:id="+$('#id').val()+":flag="+$('#flag').val();
+	location.href=$.app+'/xkzfz/view?id='+xkzid+'&path='+path;
+}
+
+xkzzx.detail.addXkzfz = function(xkzid){
+	var path="/xkzzx/addmain?path=2:id="+$('#jyrid').val()+":flag="+$('#flag').val();
+	location.href=$.app+'/xkzfz/view?id='+xkzid+'&path='+path;
+}
+
 xkzzx.detail.viewXkz = function(xkzid){
 	var path="/xkzzx/viewmain?path=1:id="+$('#id').val()+":flag="+$('#flag').val();
 	location.href=$.app+'/xkzxx/view?id='+xkzid+'&path='+path;
 }
 
 xkzzx.detail.addXkz = function(xkzid){
-	var path="/xkzzx/addmain?path=1:id="+$('#id').val()+"";
+	var path="/xkzzx/addmain?path=1:id="+$('#jyrid').val()+"";
 	location.href=$.app+'/xkzxx/view?id='+xkzid+'&path='+path;
 }
 

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

@@ -402,8 +402,7 @@ 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));
 					return cb.and(list.toArray(new Predicate[] {}));
 				}
 			};
@@ -444,6 +443,9 @@ 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));
+					Date date = new Date();
+					list.add(cb.greaterThanOrEqualTo(root.get("yxqjssj").as(Date.class), date));
+					list.add(cb.lessThanOrEqualTo(root.get("yxqkssj").as(Date.class), date));
 					return cb.and(list.toArray(new Predicate[] {}));
 				}
 			};
@@ -1160,7 +1162,11 @@ public class XkzbgCtl extends BaseWebCtl {
 					List<Predicate> list = new ArrayList<Predicate>();
 					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.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[] {}));
 				}
 			};
@@ -1199,6 +1205,9 @@ public class XkzbgCtl extends BaseWebCtl {
 					list.add(cb.like(root.get("ssjyr").get("id").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));
+					Date date = new Date();
+					list.add(cb.greaterThanOrEqualTo(root.get("yxqjssj").as(Date.class), date));
+					list.add(cb.lessThanOrEqualTo(root.get("yxqkssj").as(Date.class), date));
 					return cb.and(list.toArray(new Predicate[] {}));
 				}
 			};
@@ -1422,7 +1431,11 @@ public class XkzbgCtl extends BaseWebCtl {
 					List<Predicate> list = new ArrayList<Predicate>();
 					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.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[] {}));
 				}
 			};
@@ -1462,6 +1475,9 @@ public class XkzbgCtl extends BaseWebCtl {
 					list.add(cb.like(root.get("ssjyr").get("id").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));
+					Date date = new Date();
+					list.add(cb.greaterThanOrEqualTo(root.get("yxqjssj").as(Date.class), date));
+					list.add(cb.lessThanOrEqualTo(root.get("yxqkssj").as(Date.class), date));
 					return cb.and(list.toArray(new Predicate[] {}));
 				}
 			};

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

@@ -481,6 +481,9 @@ public class XkzsqCtl extends BaseWebCtl {
 					list.add(cb.like(root.get("ssjyr").get("id").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));
+					Date date = new Date();
+					list.add(cb.greaterThanOrEqualTo(root.get("yxqjssj").as(Date.class), date));
+					list.add(cb.lessThanOrEqualTo(root.get("yxqkssj").as(Date.class), date));
 					return cb.and(list.toArray(new Predicate[] {}));
 				}
 			};
@@ -857,6 +860,9 @@ public class XkzsqCtl extends BaseWebCtl {
 					list.add(cb.like(root.get("ssjyr").get("id").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));
+					Date date = new Date();
+					list.add(cb.greaterThanOrEqualTo(root.get("yxqjssj").as(Date.class), date));
+					list.add(cb.lessThanOrEqualTo(root.get("yxqkssj").as(Date.class), date));
 					return cb.and(list.toArray(new Predicate[] {}));
 				}
 			};
@@ -1076,6 +1082,9 @@ public class XkzsqCtl extends BaseWebCtl {
 					list.add(cb.like(root.get("ssjyr").get("id").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));
+					Date date = new Date();
+					list.add(cb.greaterThanOrEqualTo(root.get("yxqjssj").as(Date.class), date));
+					list.add(cb.lessThanOrEqualTo(root.get("yxqkssj").as(Date.class), date));
 					return cb.and(list.toArray(new Predicate[] {}));
 				}
 			};

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkyx/ctl/XkzyxCtl.java

@@ -334,6 +334,9 @@ public class XkzyxCtl extends BaseWebCtl {
 					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[] {}));
 				}
 			};
@@ -373,6 +376,9 @@ public class XkzyxCtl extends BaseWebCtl {
 					list.add(cb.like(root.get("ssjyr").get("id").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));
+					Date date = new Date();
+					list.add(cb.greaterThanOrEqualTo(root.get("yxqjssj").as(Date.class), date));
+					list.add(cb.lessThanOrEqualTo(root.get("yxqkssj").as(Date.class), date));
 					return cb.and(list.toArray(new Predicate[] {}));
 				}
 			};
@@ -852,6 +858,10 @@ public class XkzyxCtl 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[] {}));
 				}
 			};
@@ -891,6 +901,9 @@ public class XkzyxCtl extends BaseWebCtl {
 					list.add(cb.like(root.get("ssjyr").get("id").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));
+					Date date = new Date();
+					list.add(cb.greaterThanOrEqualTo(root.get("yxqjssj").as(Date.class), date));
+					list.add(cb.lessThanOrEqualTo(root.get("yxqkssj").as(Date.class), date));
 					return cb.and(list.toArray(new Predicate[] {}));
 				}
 			};
@@ -1125,6 +1138,10 @@ public class XkzyxCtl 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[] {}));
 				}
 			};
@@ -1164,6 +1181,9 @@ public class XkzyxCtl extends BaseWebCtl {
 					list.add(cb.like(root.get("ssjyr").get("id").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));
+					Date date = new Date();
+					list.add(cb.greaterThanOrEqualTo(root.get("yxqjssj").as(Date.class), date));
+					list.add(cb.lessThanOrEqualTo(root.get("yxqkssj").as(Date.class), date));
 					return cb.and(list.toArray(new Predicate[] {}));
 				}
 			};

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

@@ -381,8 +381,7 @@ public class XkzzxCtl 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));
@@ -423,8 +422,11 @@ public class XkzzxCtl extends BaseWebCtl {
 				public Predicate toPredicate(Root<XkzfzEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
 					List<Predicate> list = new ArrayList<Predicate>();
 					list.add(cb.like(root.get("ssjyr").get("id").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.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));
+					Date date = new Date();
+					list.add(cb.greaterThanOrEqualTo(root.get("yxqjssj").as(Date.class), date));
+					list.add(cb.lessThanOrEqualTo(root.get("yxqkssj").as(Date.class), date));
 					return cb.and(list.toArray(new Predicate[] {}));
 				}
 			};
@@ -1113,7 +1115,10 @@ public class XkzzxCtl extends BaseWebCtl {
 					List<Predicate> list = new ArrayList<Predicate>();
 					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.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
+					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[] {}));
 				}
 			};
@@ -1153,6 +1158,9 @@ public class XkzzxCtl extends BaseWebCtl {
 					list.add(cb.like(root.get("ssjyr").get("id").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));
+					Date date = new Date();
+					list.add(cb.greaterThanOrEqualTo(root.get("yxqjssj").as(Date.class), date));
+					list.add(cb.lessThanOrEqualTo(root.get("yxqkssj").as(Date.class), date));
 					return cb.and(list.toArray(new Predicate[] {}));
 				}
 			};
@@ -1321,7 +1329,10 @@ public class XkzzxCtl extends BaseWebCtl {
 					List<Predicate> list = new ArrayList<Predicate>();
 					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.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
+					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[] {}));
 				}
 			};
@@ -1361,6 +1372,9 @@ public class XkzzxCtl extends BaseWebCtl {
 					list.add(cb.like(root.get("ssjyr").get("id").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));
+					Date date = new Date();
+					list.add(cb.greaterThanOrEqualTo(root.get("yxqjssj").as(Date.class), date));
+					list.add(cb.lessThanOrEqualTo(root.get("yxqkssj").as(Date.class), date));
 					return cb.and(list.toArray(new Predicate[] {}));
 				}
 			};