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

gkjsjy/trunk/WebContent/WEB-INF/pages/ggfwxxgl/hxgl/hxglmain.jsp

@@ -69,12 +69,16 @@
 	                	
 	                	</td>
 		               	<td class="right" colspan="2">
+		               		<authz:hasPermission name="${appName}:hxgl:main">
 		       	  			<a class="btn btn-default btn-sm" href="#" onclick="hxgl.main.search()">
 						   		<i class="glyphicon glyphicon-search"></i>查询
 						   	</a>
+						   	</authz:hasPermission>
+						   	<authz:hasPermission name="${appName}:hxgl:add">
 						    <a class="btn btn-default btn-sm" href="#"  onclick="hxgl.main.addmain()">
 						   		<i class="glyphicon glyphicon-plus"></i>新增
 						   	</a>
+						   	</authz:hasPermission>
 			                </td>
 		        	</tr>
 				</table>
@@ -98,9 +102,11 @@
 							<td >${hxhbgl.jyrmc }</td>
 							<td >${hxhbgl.hxsl }</td>
 					        <td class="operatetd">
+					        	<authz:hasPermission name="${appName}:hxgl:main">
 						        <a class="btn btn-default btn-xs" href="#" onclick="hxgl.main.view('${hxhbgl.rq}')" title="查看">
 						            <i class="glyphicon glyphicon-search"></i>
 						        </a>
+						        </authz:hasPermission>
 						        <%--  <a class="btn btn-default btn-xs" href="#" onclick="hxgl.detail.del('${hxhbgl.id}')">
 									   <i class="glyphicon glyphicon-trash"></i> 
 									         删除</a> --%>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgsq/jgsqdsmain.jsp

@@ -104,12 +104,16 @@
 							<td class="right"></td>
 							<td></td>
                      <td class="right" colspan="2">
+                     				 <authz:hasPermission name="${appName}:jgsqds:main">
                          			 <a class="btn btn-default btn-sm" href="#" onclick="jgsqds.main.search()">
 							   <i class="glyphicon glyphicon-search"></i> 
 							            查询</a>
+							            </authz:hasPermission>
+							           <authz:hasPermission name="${appName}:jgsqds:add">
 							         <a class="btn btn-default btn-sm" href="#"  onclick="jgsqds.main.add()">
 							   <i class="glyphicon glyphicon-plus"></i> 
 							            新增</a>
+							            </authz:hasPermission>
                      </td>
                          
                     </tr>
@@ -138,17 +142,23 @@
 						    <td>${jgsqds.xmlxzw }</td>
 						    <td>${jgsqds.currentname }</td>
 							<td class="operatetd">
+								<authz:hasPermission name="${appName}:jgsqds:main">
 								<a class="btn btn-default btn-xs" href="#" onclick="jgsqds.main.view('${jgsqds.id}')" title="查看">
 							            <i class="glyphicon glyphicon-search"></i> 
 							            </a>
+							            </authz:hasPermission>
 							             <c:if test="${jgsqds.recordStatus == 1  }">
+							             <authz:hasPermission name="${appName}:jgsqds:edit">
 								 <a class="btn btn-default btn-xs" href="#"  onclick="jgsqds.main.edit('${jgsqds.id}')" title="编辑">
 									   <i class="glyphicon glyphicon-pencil"></i> 
 									          </a>
-									            <c:if test="${ssFlag == 1 }"> 
+									          </authz:hasPermission>
+									            <c:if test="${ssFlag == 1 }">
+									            <authz:hasPermission name="${appName}:jgsqds:delete"> 
 									          <a class="btn btn-default btn-xs" href="#" onclick="jgsqds.main.del('${jgsqds.id}')" title="删除">
 									   <i class="glyphicon glyphicon-trash"></i> 
 									         </a>
+									         </authz:hasPermission>
 									         </c:if>
 									         </c:if>
 									     

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgsq/jgsqmain.jsp

@@ -104,12 +104,16 @@
 							<td class="right"></td>
 							<td></td>
                      <td class="right" colspan="2">
+                     				 <authz:hasPermission name="${appName}:jgsq:main">
                          			 <a class="btn btn-default btn-sm" href="#" onclick="jgsq.main.search()">
 							   <i class="glyphicon glyphicon-search"></i> 
 							            查询</a>
+							            </authz:hasPermission>
+							           <authz:hasPermission name="${appName}:jgsq:add">  
 							         <a class="btn btn-default btn-sm" href="#"  onclick="jgsq.main.add()">
 							   <i class="glyphicon glyphicon-plus"></i> 
 							            新增</a>
+							            </authz:hasPermission>
                      </td>
                          
                     </tr>
@@ -138,17 +142,23 @@
 						    <td>${jgsq.xmlxzw }</td>
 						    <td>${jgsq.currentname }</td>
 							<td class="operatetd">
+								 <authz:hasPermission name="${appName}:jgsq:main">
 								<a class="btn btn-default btn-xs" href="#" onclick="jgsq.main.view('${jgsq.id}')" title="查看">
 							            <i class="glyphicon glyphicon-search"></i> 
 							            </a>
+							            </authz:hasPermission>
 							             <c:if test="${jgsq.recordStatus == 1 }">
+							              <authz:hasPermission name="${appName}:jgsq:edit">
 								 <a class="btn btn-default btn-xs" href="#"  onclick="jgsq.main.edit('${jgsq.id}')" title="编辑">
 									   <i class="glyphicon glyphicon-pencil"></i> 
 									          </a>
-									            <c:if test="${ssFlag == 1 }"> 
+									          </authz:hasPermission>
+									            <c:if test="${ssFlag == 1 }">
+									             <authz:hasPermission name="${appName}:jgsq:delete"> 
 									          <a class="btn btn-default btn-xs" href="#" onclick="jgsq.main.del('${jgsq.id}')" title="删除">
 									   <i class="glyphicon glyphicon-trash"></i> 
 									         </a>
+									         </authz:hasPermission>
 									         </c:if>
 									         </c:if>
 									         <c:if test="${ssFlag == 0 }">

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdbg/jsjdbgdsmain.jsp

@@ -103,12 +103,17 @@
 							<td class="right"></td>
 							<td></td>
                      <td class="right" colspan="2">
+                     				 <authz:hasPermission name="${appName}:jsjdbgds:main">
                          			 <a class="btn btn-default btn-sm" href="#" onclick="jsjdbgds.main.search()">
 							   <i class="glyphicon glyphicon-search"></i> 
 							            查询</a>
+							            </authz:hasPermission>
+							            
+							             <authz:hasPermission name="${appName}:jsjdbgds:add">
 							         <a class="btn btn-default btn-sm" href="#"  onclick="jsjdbgds.main.add()">
 							   <i class="glyphicon glyphicon-plus"></i> 
 							            新增</a>
+							            </authz:hasPermission>
                      </td>
                          
                     </tr>
@@ -137,16 +142,22 @@
 						    <td>${jsjdbgds.xmlxzw }</td>
 						    <td>${jsjdbgds.currentname }</td>
 							<td class="operatetd">
+								<authz:hasPermission name="${appName}:jsjdbgds:main">
 								<a class="btn btn-default btn-xs" href="#" onclick="jsjdbgds.main.view('${jsjdbgds.id}')" title="查看">
 							            <i class="glyphicon glyphicon-search"></i> 
 							            </a>
+							            </authz:hasPermission>
 							             <c:if test="${jsjdbgds.recordStatus == 1 }">
+							       <authz:hasPermission name="${appName}:jsjdbgds:edit">
 								 <a class="btn btn-default btn-xs" href="#"  onclick="jsjdbgds.main.edit('${jsjdbgds.id}')" title="编辑">
 									   <i class="glyphicon glyphicon-pencil"></i> 
 									          </a>
+									          </authz:hasPermission>
+									 <authz:hasPermission name="${appName}:jsjdbgds:delete">
 									          <a class="btn btn-default btn-xs" href="#" onclick="jsjdbgds.main.del('${jsjdbgds.id}')" title="删除">
 									   <i class="glyphicon glyphicon-trash"></i> 
 									        </a>
+									        </authz:hasPermission>
 									         </c:if>
 									<c:if test="${ jsjdbgds.recordStatus  > 1 }">
 									<a class="btn btn-default btn-xs" href="#"

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdbg/jsjdbgmain.jsp

@@ -103,12 +103,16 @@
 							<td class="right"></td>
 							<td></td>
                      <td class="right" colspan="2">
+                     				 <authz:hasPermission name="${appName}:jsjdbg:main">
                          			 <a class="btn btn-default btn-sm" href="#" onclick="jsjdbg.main.search()">
 							   <i class="glyphicon glyphicon-search"></i> 
 							            查询</a>
+							            </authz:hasPermission>
+							     	<authz:hasPermission name="${appName}:jsjdbg:add">
 							         <a class="btn btn-default btn-sm" href="#"  onclick="jsjdbg.main.add()">
 							   <i class="glyphicon glyphicon-plus"></i> 
 							            新增</a>
+							            </authz:hasPermission>
                      </td>
                          
                     </tr>
@@ -137,13 +141,17 @@
 						    <td>${jsjdbg.xmlxzw }</td>
 						    <td>${jsjdbg.currentname }</td>
 							<td class="operatetd">
+							<authz:hasPermission name="${appName}:jsjdbg:main">
 								<a class="btn btn-default btn-xs" href="#" onclick="jsjdbg.main.view('${jsjdbg.id}')" title="查看">
 							            <i class="glyphicon glyphicon-search"></i> 
 							            </a>
+							            </authz:hasPermission>
 							             <c:if test="${jsjdbg.recordStatus == 1 }">
+							     <authz:hasPermission name="${appName}:jsjdbg:edit">
 								 <a class="btn btn-default btn-xs" href="#"  onclick="jsjdbg.main.edit('${jsjdbg.id}')" title="编辑">
 									   <i class="glyphicon glyphicon-pencil"></i> 
 									          </a>
+							 					</authz:hasPermission>
 									         <%--  <a class="btn btn-default btn-xs" href="#" onclick="jsjdbg.main.del('${jsjdbg.id}')" title="删除">
 									   <i class="glyphicon glyphicon-trash"></i> 
 									        </a> --%>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdcbsj/jsjdcbsjdsmain.jsp

@@ -104,12 +104,16 @@
 							<td class="right"></td>
 							<td></td>
                      <td class="right" colspan="2">
+                     				<authz:hasPermission name="${appName}:jsjdcbsjds:main">
                          			 <a class="btn btn-default btn-sm" href="#" onclick="jsjdcbsjds.main.search()">
 							   <i class="glyphicon glyphicon-search"></i> 
 							            查询</a>
+							            </authz:hasPermission>
+							         <authz:hasPermission name="${appName}:jsjdcbsjds:add">   
 							         <a class="btn btn-default btn-sm" href="#"  onclick="jsjdcbsjds.main.add()">
 							   <i class="glyphicon glyphicon-plus"></i> 
 							            新增</a>
+							           </authz:hasPermission>
                      </td>
                          
                     </tr>
@@ -140,19 +144,23 @@
 						    <td>${jsjdcbsjds.xmlxzw }</td>
 						    <td>${jsjdcbsjds.currentname }</td>
 							<td class="operatetd">
-								
+								<authz:hasPermission name="${appName}:jsjdcbsjds:main">
 								<a class="btn btn-default btn-xs" href="#" onclick="jsjdcbsjds.main.view('${jsjdcbsjds.id}')" title="查看">
 							            <i class="glyphicon glyphicon-search"></i> 
 							            </a>
+							            </authz:hasPermission>
 							             <c:if test="${jsjdcbsjds.recordStatus == 1 }">
-							              
+							      <authz:hasPermission name="${appName}:jsjdcbsjds:edit">        
 								 <a class="btn btn-default btn-xs" href="#"  onclick="jsjdcbsjds.main.edit('${jsjdcbsjds.id}')" title="编辑">
 									   <i class="glyphicon glyphicon-pencil"></i> 
 									          </a>
+									          </authz:hasPermission>
 									          <c:if test="${ssFlag == 1 }"> 
+									          <authz:hasPermission name="${appName}:jsjdcbsjds:delete">
 									          <a class="btn btn-default btn-xs" href="#" onclick="jsjdcbsjds.main.del('${jsjdcbsjds.id}')" title="删除">
 									   <i class="glyphicon glyphicon-trash"></i> 
 									         </a>
+									         </authz:hasPermission>
 									         </c:if>
 									         </c:if>
 									 <c:if test="${ssFlag == 0 }">        

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdcbsj/jsjdcbsjmain.jsp

@@ -104,12 +104,16 @@
 							<td class="right"></td>
 							<td></td>
                      <td class="right" colspan="2">
+                     				<authz:hasPermission name="${appName}:jsjdcbsj:main">
                          			 <a class="btn btn-default btn-sm" href="#" onclick="jsjdcbsj.main.search()">
 							   <i class="glyphicon glyphicon-search"></i> 
 							            查询</a>
+							            </authz:hasPermission>
+							            <authz:hasPermission name="${appName}:jsjdcbsj:add">
 							         <a class="btn btn-default btn-sm" href="#"  onclick="jsjdcbsj.main.add()">
 							   <i class="glyphicon glyphicon-plus"></i> 
 							            新增</a>
+							            </authz:hasPermission>
                      </td>
                          
                     </tr>
@@ -140,19 +144,23 @@
 						    <td>${jsjdcbsj.xmlxzw }</td>
 						    <td>${jsjdcbsj.currentname }</td>
 							<td class="operatetd">
-								
+								  <authz:hasPermission name="${appName}:jsjdcbsj:main">
 								<a class="btn btn-default btn-xs" href="#" onclick="jsjdcbsj.main.view('${jsjdcbsj.id}')" title="查看">
 							            <i class="glyphicon glyphicon-search"></i> 
 							            </a>
+							            </authz:hasPermission>
 							             <c:if test="${jsjdcbsj.recordStatus == 1 && jsjdcbsj.sftb == 'N'}">
-							              
+							         <authz:hasPermission name="${appName}:jsjdcbsj:edit">       
 								 <a class="btn btn-default btn-xs" href="#"  onclick="jsjdcbsj.main.edit('${jsjdcbsj.id}')" title="编辑">
 									   <i class="glyphicon glyphicon-pencil"></i> 
 									          </a>
+									          </authz:hasPermission>
 									          <c:if test="${ssFlag == 1 }"> 
+									            <authz:hasPermission name="${appName}:jsjdcbsj:delete">
 									          <a class="btn btn-default btn-xs" href="#" onclick="jsjdcbsj.main.del('${jsjdcbsj.id}')" title="删除">
 									   <i class="glyphicon glyphicon-trash"></i> 
 									         </a>
+									         </authz:hasPermission>
 									         </c:if>
 									         </c:if>
 									 <c:if test="${ssFlag == 0 }">        

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdgl/jsjdglmain.jsp

@@ -160,13 +160,17 @@
 							<td class="right"></td>
 							<td></td>
                          <td class="right" colspan="2">
+                         			<authz:hasPermission name="${appName}:jsjdgl:main">
                          			 <a class="btn btn-default btn-sm" href="#" onclick="jsjdgl.main.search()">
 							   <i class="glyphicon glyphicon-search"></i> 
 							            查询</a>
+							            </authz:hasPermission>
 							            <c:if test="${isjyr==1 }">
+							            <authz:hasPermission name="${appName}:jsjdgl:add">
 							             <a class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.main.add()">
 							   <i class="glyphicon glyphicon-plus"></i> 
 							            新增</a>
+							            </authz:hasPermission>
 							            </c:if>
                          </td>
                      </tr>
@@ -200,10 +204,12 @@
 								  <i class="glyphicon glyphicon-search"></i> 
 							           </a>
 							    <c:if test="${isjyr==1 }">
-							    <c:if test="${jsjdgl.dqzt=='未提交'}">  
+							    <c:if test="${jsjdgl.dqzt=='未提交'}">
+							    <authz:hasPermission name="${appName}:jsjdgl:edit">  
 							    <a class="btn btn-default btn-xs" href="#" onclick="jsjdgl.main.xiugai('${jsjdgl.id}')" title="编辑">
 							    <i class="glyphicon glyphicon-pencil"></i> 
-							           </a>  
+							           </a>
+							           </authz:hasPermission>
 							    </c:if> 
 							    <%-- <c:if test="${jsjdgl.taskkey=='axlysptb'}">  
 							    <a class="btn btn-default btn-xs" href="#" onclick="jsjdgl.main.del('${jsjdgl.id}')">

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdgl2/jsjdglmain.jsp

@@ -131,13 +131,17 @@
 							<td class="right"></td>
 							<td></td>
                          <td class="right" colspan="2">
+                         			 <authz:hasPermission name="${appName}:jsjdgl2:main">
                          			 <a class="btn btn-default btn-sm" href="#" onclick="jsjdgl.main.search()">
 							   <i class="glyphicon glyphicon-search"></i> 
 							            查询</a>
+							            </authz:hasPermission>
 							            <c:if test="${isjyr==1 }">
+							            <authz:hasPermission name="${appName}:jsjdgl2:add">
 							             <a class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.main.add()">
 							   <i class="glyphicon glyphicon-plus"></i> 
 							            新增</a>
+							            </authz:hasPermission>
 							            </c:if>
                          </td>
                      </tr>
@@ -192,8 +196,10 @@
 							<td class="operatetd">
 								<%-- <a class="btn btn-default btn-xs" href="#" onclick="jsjdgl.main.view('${jsjdgl.id}')">
 							           详细信息</a> --%>
+							           <authz:hasPermission name="${appName}:jsjdgl2:edit">
 							    <a class="btn btn-default btn-xs" href="#" onclick="jsjdgl.main.xiugai('${jsjdgl.id}')" title="编辑">
-							          <i class="glyphicon glyphicon-pencil"></i></a>  
+							          <i class="glyphicon glyphicon-pencil"></i></a> 
+							          </authz:hasPermission> 
 							    <%-- <c:if test="${jsjdgl.taskkey=='axlysptb'}">  
 							    <a class="btn btn-default btn-xs" href="#" onclick="jsjdgl.main.del('${jsjdgl.id}')">
 							           删除</a>  

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/tzjhgl/tzjhglmain.jsp

@@ -119,12 +119,16 @@
 							<td class="right"></td>
 							<td></td>
                     <td class="right" colspan="2">
+                    				<authz:hasPermission name="${appName}:tzjhgl:main">
                          			 <a class="btn btn-default btn-sm" href="#" onclick="tzjhgl.main.search()">
 							   <i class="glyphicon glyphicon-search"></i> 
 							            查询</a>
+							            </authz:hasPermission>
+							            <authz:hasPermission name="${appName}:tzjhgl:add">
 							             <a class="btn btn-default btn-sm" href="#"  onclick="tzjhgl.main.add()">
 							   <i class="glyphicon glyphicon-plus"></i> 
 							            新增</a>
+							            </authz:hasPermission>
                          </td>
                          </tr>
 				</table>
@@ -156,15 +160,21 @@
 							<td>${tzjhgl.ndjhtz }</td>
 							<td>${tzjhgl.sfyzjbzzw }</td>
 							<td class="operatetd">
+								<authz:hasPermission name="${appName}:tzjhgl:main">
 								<a class="btn btn-default btn-xs" href="#" onclick="tzjhgl.main.view('${tzjhgl.id}')" title="查看">
 							            <i class="glyphicon glyphicon-search"></i> 
 							            </a>
+							            </authz:hasPermission>
+							      <authz:hasPermission name="${appName}:tzjhgl:edit">
 								 <a class="btn btn-default btn-xs" href="#"  onclick="tzjhgl.main.edit('${tzjhgl.id}')" title="编辑">
 									   <i class="glyphicon glyphicon-pencil"></i> 
 									          </a>
+										</authz:hasPermission>
+										<authz:hasPermission name="${appName}:tzjhgl:delete">
 									          <a class="btn btn-default btn-xs" href="#" onclick="tzjhgl.main.del('${tzjhgl.id}')" title="删除">
 									   <i class="glyphicon glyphicon-trash"></i> 
 									        </a>
+									        </authz:hasPermission>
 									<input type="hidden" id="flag" value="${tzjhgl.flag}">	
 									<c:if test="${tzjhgl.flag==1 }">
 									          <a class="btn btn-default btn-xs" href="#"

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/xmxxgl/xmxxglmain.jsp

@@ -110,12 +110,16 @@
 							<td class="right"></td>
 							<td></td>
                      <td class="right" colspan="2">
+                     				<authz:hasPermission name="${appName}:xmxxgl:main">
                          			 <a class="btn btn-default btn-sm" href="#" onclick="xmxxgl.main.search()">
 							   <i class="glyphicon glyphicon-search"></i> 
 							            查询</a>
+							            </authz:hasPermission>
+							         <authz:hasPermission name="${appName}:xmxxgl:add">
 							         <a class="btn btn-default btn-sm" href="#"  onclick="xmxxgl.main.add()">
 							   <i class="glyphicon glyphicon-plus"></i> 
 							            新增</a>
+							            </authz:hasPermission>
 					            <a class="btn btn-default btn-sm" href="#"  onclick="exportExcelAll('${xmmc}','${xmfr}','${szd}','${szgk}','${szgq}','${xmhzjbid}','${sfyzjbz}')">
 							   		<i class="glyphicon glyphicon-download-alt"></i>导出
 							   	</a>
@@ -149,16 +153,22 @@
 						    <td>${xmxxgl.xmlxzw }</td>
 						    <td>${xmxxgl.ztz }</td>
 							<td class="operatetd">
+								<authz:hasPermission name="${appName}:xmxxgl:main">
 								<a class="btn btn-default btn-xs" href="#" onclick="xmxxgl.main.view('${xmxxgl.id}')" title="查看">
 							            <i class="glyphicon glyphicon-search"></i> 
 							            </a>
+							            </authz:hasPermission>
 							       <c:if test="${xmxxgl.recordStatus==1 }">
+							       	<authz:hasPermission name="${appName}:xmxxgl:edit">
 								 <a class="btn btn-default btn-xs" href="#"  onclick="xmxxgl.main.edit('${xmxxgl.id}')" title="编辑">
 									   <i class="glyphicon glyphicon-pencil"></i> 
 									          </a>
+									          </authz:hasPermission>
+									          <authz:hasPermission name="${appName}:xmxxgl:delete">
 									          <a class="btn btn-default btn-xs" href="#" onclick="xmxxgl.main.del('${xmxxgl.id}')" title="删除">
 									   <i class="glyphicon glyphicon-trash"></i> 
 									         </a>
+									         </authz:hasPermission>
 									         </c:if>
 									<input type="hidden" id="flag" value="${xmxxgl.flag}">	
 									<c:if test="${xmxxgl.showjsjd=='Y' }">        

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/gkjyrdetails.jsp

@@ -178,18 +178,18 @@
 										<td width="15%">${gkjyrxx.sfwhqyzw}</td>
 										
 									</tr>
+									
 									<tr>
 										<th>经营人名称：</th>
-										<td colspan="3">${gkjyrxx.gkjyr}
+										<td colspan="5">${gkjyrxx.gkjyr}
 										</td>
-										<th>行政区划：</th>
-										<td>${gkjyrxx.xzqh}</td>
 										<th>企业性质：</th>
 										<td>${gkjyrxx.qyxz}</td>
 										<!-- <th></th>
 										<td>
 										</td> -->
 									</tr>
+								
 									<tr>
 										<th>办公地址：</th>
 										<td colspan="5">${gkjyrxx.bgdz}
@@ -199,7 +199,7 @@
 										</td>
 										
 									</tr>
-									<%-- <tr>
+									<tr>
 									<th>经营许可证号<br>编号：</th>
 										<td colspan="2">${gkjyrxx.gkjyxkzh}
 										</td>
@@ -223,7 +223,7 @@
 										<th>主营货种：</th>
 										<td>${gkjyrxx.zyhz}
 										</td>
-									</tr> --%>
+									</tr>
 									<tr>
 										<th>法定代表人<br>姓名：</th>
 										<td colspan="2">${gkjyrxx.fddbr}

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/gkjyrmain.jsp

@@ -1,6 +1,6 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8"
 	pageEncoding="UTF-8"%>
-
+<% request.setCharacterEncoding("UTF-8"); %>
 <!DOCTYPE html>
 <html lang="en">
 <head>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhbg/lhbgmain.jsp

@@ -73,13 +73,16 @@
                        </tr>
 						<tr>
                         <td class="right" colspan="6">
+                        			<authz:hasPermission name="${appName}:lhbg:main">
                          			 <a class="btn btn-default btn-sm" href="#" onclick="lhbg.main.search()">
 							   <i class="glyphicon glyphicon-search"></i> 
 							            查询</a>
-							           
+							           </authz:hasPermission>
+							           <authz:hasPermission name="${appName}:lhbg:add">
 							             <a class="btn btn-default btn-sm" href="#"  onclick="lhbg.main.add()">
 							   <i class="glyphicon glyphicon-plus"></i> 
 							            新增</a>
+							            </authz:hasPermission>
                         </td>
                         
                     </tr>
@@ -110,23 +113,28 @@
 							</td> 
 							<td>${lhbg.currentname }</td>
 							<td class="operatetd">
+								<authz:hasPermission name="${appName}:lhbg:main">
 								<a class="btn btn-default btn-xs" href="#" onclick="lhbg.main.view('${lhbg.id}')" title=" 查看">
 							            <i class="glyphicon glyphicon-search"></i> 
 							           </a>
+							           </authz:hasPermission>
 							 <c:if test="${lhbg.recordStatus == 1 && lhbg.sftb == 'N' }">     
 							      <c:if test="${ssFlag == 1 }"> 
 							  <%--    <a class="btn btn-default btn-xs" href="#"  onclick="lhbg.main.submit('${lhbg.id}')" title="同步">
 						   <i class="glyphicon glyphicon-share"></i> --%>
 						            </a>
 						            </c:if>
-							  
+							  	<authz:hasPermission name="${appName}:lhbg:edit">
 								 <a class="btn btn-default btn-xs" href="#"  onclick="lhbg.main.edit('${lhbg.id}')" title="编辑">
 									   <i class="glyphicon glyphicon-pencil"></i> 
 									          </a>
-									     <c:if test="${ssFlag == 1 }">   
+									          </authz:hasPermission>
+									     <c:if test="${ssFlag == 1 }"> 
+									     		<authz:hasPermission name="${appName}:lhbg:delete">  
 									          <a class="btn btn-default btn-xs" href="#" onclick="lhbg.main.del('${lhbg.id}')" title="删除">
 									   <i class="glyphicon glyphicon-trash"></i> 
 									         </a>
+									         </authz:hasPermission>
 									   </c:if>    
 						 </c:if>
 						 		<c:if test="${ lhbg.recordStatus  > 1  && ssFlag ==0}">

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhsq/lhsqmain.jsp

@@ -77,12 +77,16 @@
 						<tr>
 					
                         <td class="right" colspan="6">
+                         <authz:hasPermission name="${appName}:lhsq:main">
                          			 <a class="btn btn-default btn-sm" href="#" onclick="lhsq.main.search()">
 							   <i class="glyphicon glyphicon-search"></i> 
 							            查询</a>
+							            </authz:hasPermission>
+							             <authz:hasPermission name="${appName}:lhsq:add">
 							             <a class="btn btn-default btn-sm" href="#"  onclick="lhsq.main.add()">
 							   <i class="glyphicon glyphicon-plus"></i> 
 							            新增</a>
+							            </authz:hasPermission>
                         </td>
                         
                     </tr>
@@ -108,10 +112,11 @@
 							<td>${lhsq.fddbr }</td>
 							<td>${lhsq.currentname }</td>
 							<td class="operatetd">
+								<authz:hasPermission name="${appName}:lhsq:main">
 								<a class="btn btn-default btn-xs" href="#" onclick="lhsq.main.view('${lhsq.id}')" title="查看">
 							            <i class="glyphicon glyphicon-search"></i> 
 							            </a>
-							
+								</authz:hasPermission>
 							 <c:if test="${lhsq.recordStatus == 1 && lhsq.sftb == 'N'}">
 							     
 							    
@@ -119,14 +124,17 @@
 						   <i class="glyphicon glyphicon-share"></i> 
 						            </a>--%>
 						          
-							     
+							     <authz:hasPermission name="${appName}:lhsq:edit">
 								 <a class="btn btn-default btn-xs" href="#"  onclick="lhsq.main.edit('${lhsq.id}')" title="编辑">
 									   <i class="glyphicon glyphicon-pencil"></i> 
 									          </a>
-							       <c:if test="${ssFlag == 1 && lhsq.flowstatus != 2 }">      
+									          </authz:hasPermission>
+							       <c:if test="${ssFlag == 1 && lhsq.flowstatus != 2 }"> 
+							       				<authz:hasPermission name="${appName}:lhsq:delete">     
 									          <a class="btn btn-default btn-xs" href="#" onclick="lhsq.main.del('${lhsq.id}')" title="删除">
 									   <i class="glyphicon glyphicon-trash"></i> 
 									          </a>
+									          </authz:hasPermission>
 									 </c:if>        
 						 </c:if>
 								<c:if test="${ lhsq.recordStatus  > 1  && ssFlag ==0 }">

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhyx/lhyxmain.jsp

@@ -75,14 +75,16 @@
 						<tr>
 				
                         <td class="right" colspan="6">
+                        			<authz:hasPermission name="${appName}:lhyx:main">
                          			 <a class="btn btn-default btn-sm" href="#" onclick="lhyx.main.search()">
 							   <i class="glyphicon glyphicon-search"></i> 
 							            查询</a>
-							           
+							           </authz:hasPermission>
+							           <authz:hasPermission name="${appName}:lhyx:add">
 							             <a class="btn btn-default btn-sm" href="#"  onclick="lhyx.main.add()">
 							   <i class="glyphicon glyphicon-plus"></i> 
 							            新增</a>
-							         
+							         </authz:hasPermission>
                         </td>
                         
                     </tr>
@@ -113,22 +115,28 @@
 							<%-- <td>${lhyx.lxr }</td>
 							<td>${lhyx.lxdh }</td> --%>
 							<td class="operatetd">
+								<authz:hasPermission name="${appName}:lhyx:main">
 								<a class="btn btn-default btn-xs" href="#" onclick="lhyx.main.view('${lhyx.id}')" title="查看">
 							            <i class="glyphicon glyphicon-search"></i> 
 							           </a>
+							           </authz:hasPermission>
 							 <c:if test="${lhyx.recordStatus == 1  && lhyx.sftb == 'N' }">     
 							      <c:if test="${ssFlag == 1  }"> 
 							    <%--  <a class="btn btn-default btn-xs" href="#"  onclick="lhyx.main.submit('${lhyx.id}')" title="同步">
 						  			 <i class="glyphicon glyphicon-share"></i>
 						            </a> --%>
 						            </c:if>
+						            <authz:hasPermission name="${appName}:lhyx:edit">
 								 <a class="btn btn-default btn-xs" href="#"  onclick="lhyx.main.edit('${lhyx.id}')" title="编辑">
 									   <i class="glyphicon glyphicon-pencil"></i> 
 									          </a>
-								<c:if test="${ssFlag == 1 }">    
+									          </authz:hasPermission>
+								<c:if test="${ssFlag == 1 }">
+												<authz:hasPermission name="${appName}:lhyx:delete">    
 									          <a class="btn btn-default btn-xs" href="#" onclick="lhyx.main.del('${lhyx.id}')" title="删除">
 									   <i class="glyphicon glyphicon-trash"></i> 
 									         </a>
+									         </authz:hasPermission>
 									       </c:if>
 						 </c:if>
 						 		<c:if test="${ lhyx.recordStatus  > 1 && ssFlag ==0}">

gkjsjy/trunk/WebContent/WEB-INF/pages/set/role/roleadd.jsp

@@ -102,6 +102,12 @@
 								<input type="text" class="form-control" name="sortno">
 							</td>
 						</tr>
+						<tr>
+						     <th>备注：&nbsp;</th>
+							 <td colspan="3">
+								<textarea rows="" cols="3" style="width: 92.5%;" name="bz" class="form-control"></textarea>
+							 </td>
+						</tr>
 					</table>
 </form>
 					<div  id="buttons">

gkjsjy/trunk/WebContent/WEB-INF/pages/set/role/roleedit.jsp

@@ -102,6 +102,12 @@
 								<input type="text" class="form-control" name="sortno" value="${record.sortno }">
 							</td>
 						</tr>
+						<tr>
+						     <th>备注：&nbsp;</th>
+							 <td colspan="3">
+								<textarea rows="" cols="3" style="width: 92.5%;" name="bz" class="form-control"></textarea>
+							 </td>
+						</tr>
 					</table>
 </form>
 					<div  id="buttons">

gkjsjy/trunk/WebContent/WEB-INF/pages/set/role/roleview.jsp

@@ -99,6 +99,12 @@
 								${record.sortno }
 							</td>
 						</tr>
+						<tr>
+						     <th>备注：&nbsp;</th>
+							 <td colspan="3">
+								<textarea rows="" cols="3" style="width: 99%;" name="bz" class="form-control"></textarea>
+							 </td>
+						</tr>
 					</table>
 </form>
 					<div  id="buttons">

gkjsjy/trunk/WebContent/static/biz/js/gkjsgl/jgsq/jgsqdetail.js

@@ -263,6 +263,19 @@ jgsq.detail.save=function(){
 	 if(van($('#addform input[name=bwdj]'),"泊位吨级 ")==false){return false;}
 	 if(van($('#addform input[name=tgnl]'),"通过能力")==false){return false;}
 	 
+	 if($("#tzlxid").val()=='1903'){
+		 var ztz = $('#addform input[name=ztz]').val();
+			var zftze = $('#addform input[name=zftze]').val();
+			if(isFDS(ztz) && isFDS(zftze)) {
+				var rate = (zftze/ztz)*100;
+				if(rate>100){
+					ts("总投资额必须不少于政府投资额",$('#addform input[name=ztz]'));
+					return false;
+				}
+			}
+	 }
+	 
+	 
 	 $(".btn").attr("disabled",true);
 	 $.ajax({
          url:$.app+"/jgsq/save",
@@ -310,6 +323,20 @@ jgsq.detail.submit=function(){
 			});
 			return false;
 		}
+	 
+	 if($("#tzlxid").val()=='1903'){
+		 var ztz = $('#addform input[name=ztz]').val();
+			var zftze = $('#addform input[name=zftze]').val();
+			if(isFDS(ztz) && isFDS(zftze)) {
+				var rate = (zftze/ztz)*100;
+				if(rate>100){
+					ts("总投资额必须不少于政府投资额",$('#addform input[name=ztz]'));
+					return false;
+				}
+			}
+	 }
+	 
+	 
 	 $(".btn").attr("disabled",true);
 	 $.ajax({
         url:$.app+"/jgsq/submit",

gkjsjy/trunk/WebContent/static/biz/js/gkjsgl/jgsq/jgsqdsdetail.js

@@ -268,6 +268,18 @@ jgsqds.detail.save=function(){
 	 if(van($('#addform input[name=bwdj]'),"泊位吨级 ")==false){return false;}
 	 if(van($('#addform input[name=tgnl]'),"通过能力")==false){return false;}
 	 
+	 if($("#tzlxid").val()=='1903'){
+		 var ztz = $('#addform input[name=ztz]').val();
+			var zftze = $('#addform input[name=zftze]').val();
+			if(isFDS(ztz) && isFDS(zftze)) {
+				var rate = (zftze/ztz)*100;
+				if(rate>100){
+					ts("总投资额必须不少于政府投资额",$('#addform input[name=ztz]'));
+					return false;
+				}
+			}
+	 }
+	 
 	 $(".btn").attr("disabled",true);
 	 $.ajax({
          url:$.app+"/jgsqds/save",
@@ -305,6 +317,18 @@ jgsqds.detail.submit=function(){
 	 if(van($('#addform input[name=bwdj]'),"泊位吨级 ")==false){return false;}
 	 if(van($('#addform input[name=tgnl]'),"通过能力")==false){return false;}
 	 
+	 if($("#tzlxid").val()=='1903'){
+		 var ztz = $('#addform input[name=ztz]').val();
+			var zftze = $('#addform input[name=zftze]').val();
+			if(isFDS(ztz) && isFDS(zftze)) {
+				var rate = (zftze/ztz)*100;
+				if(rate>100){
+					ts("总投资额必须不少于政府投资额",$('#addform input[name=ztz]'));
+					return false;
+				}
+			}
+	 }
+	 
 	 $(".btn").attr("disabled",true);
 	 $.ajax({
         url:$.app+"/jgsqds/submit",

gkjsjy/trunk/WebContent/static/biz/js/gkjsgl/jsjdbg/jsjdbgdetail.js

@@ -281,6 +281,18 @@ jsjdbg.detail.save=function(){
 	 if(van($('#addform input[name=axcd]'),"岸线长度 ")==false){return false;}
 	 if(van($('#addform input[name=bwdj]'),"泊位吨级 ")==false){return false;}
 	 if(van($('#addform input[name=tgnl]'),"通过能力")==false){return false;}
+	 if($("#tzlxid").val()=='1903'){
+		 var ztz = $('#addform input[name=ztz]').val();
+			var zftze = $('#addform input[name=zftze]').val();
+			if(isFDS(ztz) && isFDS(zftze)) {
+				var rate = (zftze/ztz)*100;
+				if(rate>100){
+					ts("总投资额必须不少于政府投资额",$('#addform input[name=ztz]'));
+					return false;
+				}
+			}
+	 }
+	 
 	 
 	 $(".btn").attr("disabled",true);
 	 $.ajax({
@@ -329,6 +341,17 @@ jsjdbg.detail.submit=function(){
 	 if(van($('#addform input[name=bwdj]'),"泊位吨级 ")==false){return false;}
 	 if(van($('#addform input[name=tgnl]'),"通过能力")==false){return false;}
 	 
+	 if($("#tzlxid").val()=='1903'){
+		 var ztz = $('#addform input[name=ztz]').val();
+			var zftze = $('#addform input[name=zftze]').val();
+			if(isFDS(ztz) && isFDS(zftze)) {
+				var rate = (zftze/ztz)*100;
+				if(rate>100){
+					ts("总投资额必须不少于政府投资额",$('#addform input[name=ztz]'));
+					return false;
+				}
+			}
+	 }
 	 $(".btn").attr("disabled",true);
 	 $.ajax({
         url:$.app+"/jsjdbg/submit",

gkjsjy/trunk/WebContent/static/biz/js/gkjsgl/jsjdbg/jsjdbgdsdetail.js

@@ -110,6 +110,18 @@ jsjdbgds.detail.save=function(){
 	 if(van($('#addform input[name=bwdj]'),"泊位吨级 ")==false){return false;}
 	 if(van($('#addform input[name=tgnl]'),"通过能力")==false){return false;}
 	 
+	 if($("#tzlxid").val()=='1903'){
+		 var ztz = $('#addform input[name=ztz]').val();
+			var zftze = $('#addform input[name=zftze]').val();
+			if(isFDS(ztz) && isFDS(zftze)) {
+				var rate = (zftze/ztz)*100;
+				if(rate>100){
+					ts("总投资额必须不少于政府投资额",$('#addform input[name=ztz]'));
+					return false;
+				}
+			}
+	 }
+	 
 	 $(".btn").attr("disabled",true);
 	 $.ajax({
          url:$.app+"/jsjdbgds/save",
@@ -148,6 +160,18 @@ jsjdbgds.detail.submit=function(){
 	 if(van($('#addform input[name=bwdj]'),"泊位吨级 ")==false){return false;}
 	 if(van($('#addform input[name=tgnl]'),"通过能力")==false){return false;}
 	 
+	 if($("#tzlxid").val()=='1903'){
+		 var ztz = $('#addform input[name=ztz]').val();
+			var zftze = $('#addform input[name=zftze]').val();
+			if(isFDS(ztz) && isFDS(zftze)) {
+				var rate = (zftze/ztz)*100;
+				if(rate>100){
+					ts("总投资额必须不少于政府投资额",$('#addform input[name=ztz]'));
+					return false;
+				}
+			}
+	 }
+	 
 	 $(".btn").attr("disabled",true);
 	 $.ajax({
         url:$.app+"/jsjdbgds/submit",

gkjsjy/trunk/WebContent/static/biz/js/gkjsgl/jsjdcbsj/jsjdcbsjdetail.js

@@ -275,7 +275,19 @@ jsjdcbsj.detail.save = function() {
 	if (van($('#addform input[name=tgnl]'), "通过能力") == false) {
 		return false;
 	}
-
+	
+	if($("#tzlxid").val()=='1903'){
+		 var ztz = $('#addform input[name=ztz]').val();
+			var zftze = $('#addform input[name=zftze]').val();
+			if(isFDS(ztz) && isFDS(zftze)) {
+				var rate = (zftze/ztz)*100;
+				if(rate>100){
+					ts("总投资额必须不少于政府投资额",$('#addform input[name=ztz]'));
+					return false;
+				}
+			}
+	 }
+	
 	$(".btn").attr("disabled", true);
 	$.ajax({
 		url : $.app + "/jsjdcbsj/save",
@@ -328,6 +340,21 @@ jsjdcbsj.detail.submit = function() {
 		});
 		return false;
 	}
+	
+	if($("#tzlxid").val()=='1903'){
+		 var ztz = $('#addform input[name=ztz]').val();
+			var zftze = $('#addform input[name=zftze]').val();
+			if(isFDS(ztz) && isFDS(zftze)) {
+				var rate = (zftze/ztz)*100;
+				if(rate>100){
+					ts("总投资额必须不少于政府投资额",$('#addform input[name=ztz]'));
+					return false;
+				}
+			}
+	 }
+	
+	
+	
 	$(".btn").attr("disabled", true);
 	$.ajax({
 		url : $.app + "/jsjdcbsj/submit",

gkjsjy/trunk/WebContent/static/biz/js/gkjsgl/jsjdcbsj/jsjdcbsjdsdetail.js

@@ -275,7 +275,20 @@ jsjdcbsjds.detail.save = function() {
 	if (van($('#addform input[name=tgnl]'), "通过能力") == false) {
 		return false;
 	}
-
+	
+	if($("#tzlxid").val()=='1903'){
+		 var ztz = $('#addform input[name=ztz]').val();
+			var zftze = $('#addform input[name=zftze]').val();
+			if(isFDS(ztz) && isFDS(zftze)) {
+				var rate = (zftze/ztz)*100;
+				if(rate>100){
+					ts("总投资额必须不低于政府投资额",$('#addform input[name=ztz]'));
+					return false;
+				}
+			}
+	 }
+	
+	
 	$(".btn").attr("disabled", true);
 	$.ajax({
 		url : $.app + "/jsjdcbsjds/save",
@@ -318,6 +331,19 @@ jsjdcbsjds.detail.submit = function() {
 	if (van($('#addform input[name=tgnl]'), "通过能力") == false) {
 		return false;
 	}
+	
+	if($("#tzlxid").val()=='1903'){
+		 var ztz = $('#addform input[name=ztz]').val();
+			var zftze = $('#addform input[name=zftze]').val();
+			if(isFDS(ztz) && isFDS(zftze)) {
+				var rate = (zftze/ztz)*100;
+				if(rate>100){
+					ts("总投资额必须不低于政府投资额",$('#addform input[name=ztz]'));
+					return false;
+				}
+			}
+	 }
+	
 	$(".btn").attr("disabled", true);
 	$.ajax({
 		url : $.app + "/jsjdcbsjds/submit",

gkjsjy/trunk/WebContent/static/biz/js/gkjsgl/xmxxgl/xmxxgldetail.js

@@ -30,6 +30,19 @@ xmxxgl.detail.save=function(){
 	 //if(van($('#addform input[name=sddy]'),"码头前沿位置_上端点Y")==false){return false;}
 	 //if(van($('#addform input[name=xddx]'),"码头前沿位置_下端点X")==false){return false;}
 	 //if(van($('#addform input[name=xddy]'),"码头前沿位置_下端点Y")==false){return false;}
+	 if($("#tzlxid").val()=='1903'){
+		 var ztz = $('#addform input[name=ztz]').val();
+			var zftze = $('#addform input[name=zftze]').val();
+			if(isFDS(ztz) && isFDS(zftze)) {
+				var rate = (zftze/ztz)*100;
+				if(rate>100){
+					ts("总投资额必须不低于政府投资额",$('#addform input[name=ztz]'));
+					return false;
+				}
+			}
+	 }
+	
+	 
 	 
 	 $(".btn").attr("disabled",true);
 	 $.ajax({

gkjsjy/trunk/WebContent/static/sql/oracle/table/2.5.OtherTableCreate.sql

@@ -1131,7 +1131,7 @@ tablespace GK_SHARE
 comment on table GK_SHARE_JSJY_XKZNSXX
   is '许可证年审信息表';
   
-  create table GK_OPERATION_JSJY_LHBG
+  create table GK.GK_OPERATION_JSJY_LHBG
 (
   id               VARCHAR2(40),
   jyrid            VARCHAR2(40),
@@ -1172,65 +1172,65 @@ tablespace GK_OPERATION
     minextents 1
     maxextents unlimited
   );
-comment on table GK_OPERATION_JSJY_LHBG
+comment on table GK.GK_OPERATION_JSJY_LHBG
   is '理货变更';
-comment on column GK_OPERATION_JSJY_LHBG.id
+comment on column GK.GK_OPERATION_JSJY_LHBG.id
   is '主健ID';
-comment on column GK_OPERATION_JSJY_LHBG.jyrid
+comment on column GK.GK_OPERATION_JSJY_LHBG.jyrid
   is '经营人ID';
-comment on column GK_OPERATION_JSJY_LHBG.jyrmc
+comment on column GK.GK_OPERATION_JSJY_LHBG.jyrmc
   is '经营人名称';
-comment on column GK_OPERATION_JSJY_LHBG.xkzbh
+comment on column GK.GK_OPERATION_JSJY_LHBG.xkzbh
   is '许可证号';
-comment on column GK_OPERATION_JSJY_LHBG.lxr
+comment on column GK.GK_OPERATION_JSJY_LHBG.lxr
   is '联系人';
-comment on column GK_OPERATION_JSJY_LHBG.dh
+comment on column GK.GK_OPERATION_JSJY_LHBG.dh
   is '电话';
-comment on column GK_OPERATION_JSJY_LHBG.sqrq
+comment on column GK.GK_OPERATION_JSJY_LHBG.sqrq
   is '申请日期';
-comment on column GK_OPERATION_JSJY_LHBG.cz
+comment on column GK.GK_OPERATION_JSJY_LHBG.cz
   is '传真';
-comment on column GK_OPERATION_JSJY_LHBG.ybgdz
+comment on column GK.GK_OPERATION_JSJY_LHBG.ybgdz
   is '原办公地址';
-comment on column GK_OPERATION_JSJY_LHBG.xbgdz
+comment on column GK.GK_OPERATION_JSJY_LHBG.xbgdz
   is '现办公地址';
-comment on column GK_OPERATION_JSJY_LHBG.yfddbr
+comment on column GK.GK_OPERATION_JSJY_LHBG.yfddbr
   is '原法定代表人';
-comment on column GK_OPERATION_JSJY_LHBG.xfddbr
+comment on column GK.GK_OPERATION_JSJY_LHBG.xfddbr
   is '现法定代表人';
-comment on column GK_OPERATION_JSJY_LHBG.tyxyyy
+comment on column GK.GK_OPERATION_JSJY_LHBG.tyxyyy
   is '停业歇业原因';
-comment on column GK_OPERATION_JSJY_LHBG.gkjshyj
+comment on column GK.GK_OPERATION_JSJY_LHBG.gkjshyj
   is '港口局意见';
-comment on column GK_OPERATION_JSJY_LHBG.gkjshrq
+comment on column GK.GK_OPERATION_JSJY_LHBG.gkjshrq
   is '港口局审核时间';
-comment on column GK_OPERATION_JSJY_LHBG.jttshyj
+comment on column GK.GK_OPERATION_JSJY_LHBG.jttshyj
   is '交通厅意见';
-comment on column GK_OPERATION_JSJY_LHBG.jttshrq
+comment on column GK.GK_OPERATION_JSJY_LHBG.jttshrq
   is '交通厅审核时间';
-comment on column GK_OPERATION_JSJY_LHBG.szd
+comment on column GK.GK_OPERATION_JSJY_LHBG.szd
   is '所在地';
-comment on column GK_OPERATION_JSJY_LHBG.create_user
+comment on column GK.GK_OPERATION_JSJY_LHBG.create_user
   is '创建人';
-comment on column GK_OPERATION_JSJY_LHBG.create_date_time
+comment on column GK.GK_OPERATION_JSJY_LHBG.create_date_time
   is '创建时间';
-comment on column GK_OPERATION_JSJY_LHBG.update_user
+comment on column GK.GK_OPERATION_JSJY_LHBG.update_user
   is '修改人';
-comment on column GK_OPERATION_JSJY_LHBG.update_date_time
+comment on column GK.GK_OPERATION_JSJY_LHBG.update_date_time
   is '修改时间';
-comment on column GK_OPERATION_JSJY_LHBG.record_status
+comment on column GK.GK_OPERATION_JSJY_LHBG.record_status
   is '状态';
-comment on column GK_OPERATION_JSJY_LHBG.szgk
+comment on column GK.GK_OPERATION_JSJY_LHBG.szgk
   is '所在港口';
-comment on column GK_OPERATION_JSJY_LHBG.szgq
+comment on column GK.GK_OPERATION_JSJY_LHBG.szgq
   is '所在港区';
-comment on column GK_OPERATION_JSJY_LHBG.tbzt
+comment on column GK.GK_OPERATION_JSJY_LHBG.tbzt
   is '同步状态';
-comment on column GK_OPERATION_JSJY_LHBG.sftb
+comment on column GK.GK_OPERATION_JSJY_LHBG.sftb
   is '是否同步';
 
 
-create table GK_OPERATION_JSJY_LHBGFJ
+create table GK.GK_OPERATION_JSJY_LHBGFJ
 (
   id               VARCHAR2(40),
   bgid             VARCHAR2(40),
@@ -1256,11 +1256,11 @@ tablespace GK_OPERATION
     minextents 1
     maxextents unlimited
   );
-comment on table GK_OPERATION_JSJY_LHBGFJ
+comment on table GK.GK_OPERATION_JSJY_LHBGFJ
   is '理货变更附件';
 
 
-create table GK_OPERATION_JSJY_LHSQ
+create table GK.GK_OPERATION_JSJY_LHSQ
 (
   id               VARCHAR2(40) not null,
   sqr              NVARCHAR2(100),
@@ -1317,57 +1317,57 @@ tablespace GK_OPERATION
     minextents 1
     maxextents unlimited
   );
-comment on column GK_OPERATION_JSJY_LHSQ.id
+comment on column GK.GK_OPERATION_JSJY_LHSQ.id
   is '主键';
-comment on column GK_OPERATION_JSJY_LHSQ.sqr
+comment on column GK.GK_OPERATION_JSJY_LHSQ.sqr
   is '申请人';
-comment on column GK_OPERATION_JSJY_LHSQ.sqrlxfs
+comment on column GK.GK_OPERATION_JSJY_LHSQ.sqrlxfs
   is '申请人联系方式';
-comment on column GK_OPERATION_JSJY_LHSQ.sqrdz
+comment on column GK.GK_OPERATION_JSJY_LHSQ.sqrdz
   is '申请人地址';
-comment on column GK_OPERATION_JSJY_LHSQ.sqryzbm
+comment on column GK.GK_OPERATION_JSJY_LHSQ.sqryzbm
   is '申请人邮政编码';
-comment on column GK_OPERATION_JSJY_LHSQ.wtdlrxm
+comment on column GK.GK_OPERATION_JSJY_LHSQ.wtdlrxm
   is '委托代理人姓名';
-comment on column GK_OPERATION_JSJY_LHSQ.wtdlrlxfs
+comment on column GK.GK_OPERATION_JSJY_LHSQ.wtdlrlxfs
   is '委托代理人联系方式';
-comment on column GK_OPERATION_JSJY_LHSQ.sqrq
+comment on column GK.GK_OPERATION_JSJY_LHSQ.sqrq
   is '申请时间';
-comment on column GK_OPERATION_JSJY_LHSQ.sftb
+comment on column GK.GK_OPERATION_JSJY_LHSQ.sftb
   is '是否同步';
-comment on column GK_OPERATION_JSJY_LHSQ.tbzt
+comment on column GK.GK_OPERATION_JSJY_LHSQ.tbzt
   is '同步状态';
-comment on column GK_OPERATION_JSJY_LHSQ.jyrid
+comment on column GK.GK_OPERATION_JSJY_LHSQ.jyrid
   is '经营人id';
-comment on column GK_OPERATION_JSJY_LHSQ.jyrmc
+comment on column GK.GK_OPERATION_JSJY_LHSQ.jyrmc
   is '经营人名称';
-comment on column GK_OPERATION_JSJY_LHSQ.szd
+comment on column GK.GK_OPERATION_JSJY_LHSQ.szd
   is '所在地';
-comment on column GK_OPERATION_JSJY_LHSQ.szgk
+comment on column GK.GK_OPERATION_JSJY_LHSQ.szgk
   is '所在港口';
-comment on column GK_OPERATION_JSJY_LHSQ.szgq
+comment on column GK.GK_OPERATION_JSJY_LHSQ.szgq
   is '所在港区';
-comment on column GK_OPERATION_JSJY_LHSQ.gsmc
+comment on column GK.GK_OPERATION_JSJY_LHSQ.gsmc
   is '公司名称';
-comment on column GK_OPERATION_JSJY_LHSQ.zcdz
+comment on column GK.GK_OPERATION_JSJY_LHSQ.zcdz
   is '注册地址';
-comment on column GK_OPERATION_JSJY_LHSQ.fddbr
+comment on column GK.GK_OPERATION_JSJY_LHSQ.fddbr
   is '法定代表人';
-comment on column GK_OPERATION_JSJY_LHSQ.lxr
+comment on column GK.GK_OPERATION_JSJY_LHSQ.lxr
   is '联系人';
-comment on column GK_OPERATION_JSJY_LHSQ.lxdh
+comment on column GK.GK_OPERATION_JSJY_LHSQ.lxdh
   is '联系人电话';
-comment on column GK_OPERATION_JSJY_LHSQ.gsyyzzbh
+comment on column GK.GK_OPERATION_JSJY_LHSQ.gsyyzzbh
   is '工商营业执照编号';
-comment on column GK_OPERATION_JSJY_LHSQ.jydy
+comment on column GK.GK_OPERATION_JSJY_LHSQ.jydy
   is '经营地域';
-comment on column GK_OPERATION_JSJY_LHSQ.ygzs
+comment on column GK.GK_OPERATION_JSJY_LHSQ.ygzs
   is '员工总数';
-comment on column GK_OPERATION_JSJY_LHSQ.lhys
+comment on column GK.GK_OPERATION_JSJY_LHSQ.lhys
   is '理货员数';
-comment on column GK_OPERATION_JSJY_LHSQ.zczb
+comment on column GK.GK_OPERATION_JSJY_LHSQ.zczb
   is '注册资本';
-alter table GK_OPERATION_JSJY_LHSQ
+alter table GK.GK_OPERATION_JSJY_LHSQ
   add primary key (ID)
   using index 
   tablespace USERS
@@ -1388,7 +1388,7 @@ prompt Creating table GK_OPERATION_JSJY_LHSQFJ
 prompt =======================================
 prompt
 
-create table GK_OPERATION_JSJY_LHSQFJ
+create table GK.GK_OPERATION_JSJY_LHSQFJ
 (
   id               VARCHAR2(40) not null,
   sqid             VARCHAR2(40),
@@ -1414,31 +1414,31 @@ tablespace GK_OPERATION
     minextents 1
     maxextents unlimited
   );
-comment on column GK_OPERATION_JSJY_LHSQFJ.id
+comment on column GK.GK_OPERATION_JSJY_LHSQFJ.id
   is '主键';
-comment on column GK_OPERATION_JSJY_LHSQFJ.sqid
+comment on column GK.GK_OPERATION_JSJY_LHSQFJ.sqid
   is '申请ID';
-comment on column GK_OPERATION_JSJY_LHSQFJ.fjid
+comment on column GK.GK_OPERATION_JSJY_LHSQFJ.fjid
   is '附件ID';
-comment on column GK_OPERATION_JSJY_LHSQFJ.fjmc
+comment on column GK.GK_OPERATION_JSJY_LHSQFJ.fjmc
   is '附件名称';
-comment on column GK_OPERATION_JSJY_LHSQFJ.create_user
+comment on column GK.GK_OPERATION_JSJY_LHSQFJ.create_user
   is '创建人';
-comment on column GK_OPERATION_JSJY_LHSQFJ.update_user
+comment on column GK.GK_OPERATION_JSJY_LHSQFJ.update_user
   is '修改人';
-comment on column GK_OPERATION_JSJY_LHSQFJ.create_date_time
+comment on column GK.GK_OPERATION_JSJY_LHSQFJ.create_date_time
   is '创建时间';
-comment on column GK_OPERATION_JSJY_LHSQFJ.update_date_time
+comment on column GK.GK_OPERATION_JSJY_LHSQFJ.update_date_time
   is '修改时间';
-comment on column GK_OPERATION_JSJY_LHSQFJ.record_status
+comment on column GK.GK_OPERATION_JSJY_LHSQFJ.record_status
   is '状态';
-comment on column GK_OPERATION_JSJY_LHSQFJ.szd
+comment on column GK.GK_OPERATION_JSJY_LHSQFJ.szd
   is '所在地';
-comment on column GK_OPERATION_JSJY_LHSQFJ.sftb
+comment on column GK.GK_OPERATION_JSJY_LHSQFJ.sftb
   is '是否同步';
-comment on column GK_OPERATION_JSJY_LHSQFJ.tbzt
+comment on column GK.GK_OPERATION_JSJY_LHSQFJ.tbzt
   is '同步状态';
-alter table GK_OPERATION_JSJY_LHSQFJ
+alter table GK.GK_OPERATION_JSJY_LHSQFJ
   add primary key (ID)
   using index 
   tablespace USERS
@@ -1454,7 +1454,7 @@ alter table GK_OPERATION_JSJY_LHSQFJ
   );
 
 
-create table GK_OPERATION_JSJY_LHYX
+create table GK.GK_OPERATION_JSJY_LHYX
 (
   id               VARCHAR2(40),
   jyrid            VARCHAR2(40),
@@ -1500,11 +1500,11 @@ tablespace GK_OPERATION
     minextents 1
     maxextents unlimited
   );
-comment on table GK_OPERATION_JSJY_LHYX
+comment on table GK.GK_OPERATION_JSJY_LHYX
   is '理货延续';
 
 
-create table GK_OPERATION_JSJY_LHYXFJ
+create table GK.GK_OPERATION_JSJY_LHYXFJ
 (
   id               VARCHAR2(40),
   yxid             VARCHAR2(40),
@@ -1530,7 +1530,7 @@ tablespace GK_OPERATION
     minextents 1
     maxextents unlimited
   );
-comment on table GK_OPERATION_JSJY_LHYXFJ
+comment on table GK.GK_OPERATION_JSJY_LHYXFJ
   is '理货延续附件';
 
 

gkjsjy/trunk/WebContent/static/sql/oracle/table/update.sql

@@ -1680,7 +1680,3 @@ alter table GK_OPERATION_JSJY_JGBG add xmgk NVARCHAR2(200);
 comment on column GK_OPERATION_JSJY_JGBG.xmgk
   is '项目概况';
 
-alter table GK_OPERATION_JSJY_JGSQ add xmgk NVARCHAR2(200);
-alter table GK_OPERATION_JSJY_JGSQ add xmid VARCHAR2(40);
-alter table GK_OPERATION_JSJY_JSJDCBSJ add xmid VARCHAR2(40);
-

gkjsjy/trunk/src/com/xt/jygl/common/ExportUtil.java

@@ -57,6 +57,9 @@ public class ExportUtil {
      */  
     public XSSFCellStyle getHeadStyle()  
     {  
+    	sheet.setColumnWidth(0, 5000);
+    	
+    	
         // 创建单元格样式  
         XSSFCellStyle cellStyle = wb.createCellStyle();  
         // 设置单元格的背景颜色为淡蓝色  
@@ -90,8 +93,20 @@ public class ExportUtil {
      */  
     public XSSFCellStyle getBodyStyle()  
     {  
+    	sheet.setColumnWidth(0, 5000);
+    	sheet.setColumnWidth(1, 5000);
+    	sheet.setColumnWidth(2, 5000);
+    	sheet.setColumnWidth(3, 5000);
+    	sheet.setColumnWidth(4, 5000);
+    	sheet.setColumnWidth(5, 5000);
+    	sheet.setColumnWidth(6, 5000);
+    	
+    	
         // 创建单元格样式  
         XSSFCellStyle cellStyle = wb.createCellStyle();  
+     // 设置单元格的背景颜色为淡蓝色  
+        cellStyle.setFillForegroundColor(HSSFColor.PALE_BLUE.index);  
+        cellStyle.setFillPattern(XSSFCellStyle.SOLID_FOREGROUND); 
         // 设置单元格居中对齐  
         cellStyle.setAlignment(XSSFCellStyle.ALIGN_CENTER);  
         // 设置单元格垂直居中对齐  
@@ -111,5 +126,41 @@ public class ExportUtil {
         cellStyle.setBorderRight(XSSFCellStyle.BORDER_THIN);  
         cellStyle.setBorderTop(XSSFCellStyle.BORDER_THIN);  
         return cellStyle;  
-    }  
+    } 
+    
+    public XSSFCellStyle getBodyStyle1()  
+    {  
+    	
+    	sheet.setColumnWidth(0, 5000);
+    	sheet.setColumnWidth(1, 5000);
+    	sheet.setColumnWidth(2, 5000);
+    	sheet.setColumnWidth(3, 5000);
+    	sheet.setColumnWidth(4, 5000);
+    	sheet.setColumnWidth(5, 5000);
+    	sheet.setColumnWidth(6, 5000);
+    	
+    	
+        // 创建单元格样式  
+        XSSFCellStyle cellStyle = wb.createCellStyle();  
+     
+        // 设置单元格居中对齐  
+        cellStyle.setAlignment(XSSFCellStyle.ALIGN_CENTER);  
+        // 设置单元格垂直居中对齐  
+        cellStyle.setVerticalAlignment(XSSFCellStyle.VERTICAL_CENTER);  
+        // 创建单元格内容显示不下时自动换行  
+        cellStyle.setWrapText(true);  
+        // 设置单元格字体样式  
+        XSSFFont font = wb.createFont();  
+        // 设置字体加粗  
+        //font.setBoldweight(XSSFFont.BOLDWEIGHT_BOLD);  
+        font.setFontName("宋体");  
+        font.setFontHeight((short) 200);  
+        cellStyle.setFont(font);  
+        // 设置单元格边框为细线条  
+        cellStyle.setBorderLeft(XSSFCellStyle.BORDER_THIN);  
+        cellStyle.setBorderBottom(XSSFCellStyle.BORDER_THIN);  
+        cellStyle.setBorderRight(XSSFCellStyle.BORDER_THIN);  
+        cellStyle.setBorderTop(XSSFCellStyle.BORDER_THIN);  
+        return cellStyle;  
+    } 
 }

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/ctl/JgsqdsCtl.java

@@ -62,6 +62,7 @@ import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.vo.BwVo;
 import com.xt.jygl.workflow.entity.TaskInfoEntity;
 import com.xt.jygl.workflow.service.TaskInfoService;
 import com.xt.jygl.workflow.vo.TaskInfoVo;
+import com.xtframe.core.anon.auth.RequiresPermissions;
 import com.xtframe.core.base.ctl.WebJsonResult;
 import com.xtframe.core.support.SecurityMgr;
 import com.xtframe.sec.code.entity.CodeEntity;
@@ -101,6 +102,7 @@ public class JgsqdsCtl extends BaseWebCtl {
 	private BwService bwService;
 
 	@RequestMapping(value = "/main")
+	@RequiresPermissions("jgsqds:main")
 	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String xmmc, final String szgkid, final String szgqid, String menuid, final String xmhzjbid, final String xmfr, final String szdid, final String sfyzjbzid) throws JsonProcessingException {
 
 		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request, "xmxxgl");
@@ -281,6 +283,7 @@ public class JgsqdsCtl extends BaseWebCtl {
 	}
 
 	@RequestMapping(value = "/delete")
+	@RequiresPermissions("jgsqds:delete")
 	@ResponseBody
 	public WebJsonResult logicdelete(Model model, String id) {
 		WebJsonResult wr = success();
@@ -745,6 +748,7 @@ public class JgsqdsCtl extends BaseWebCtl {
 	}
 
 	@RequestMapping(value = "/edit")
+	@RequiresPermissions("jgsqds:edit")
 	public String edit(Model model, String id, String flag) {
 		model.addAttribute("flag", flag);
 		JgsqEntity entity = jgsqdsService.findOne(id);
@@ -1125,6 +1129,7 @@ public class JgsqdsCtl extends BaseWebCtl {
 	}
 
 	@RequestMapping(value = "/add")
+	@RequiresPermissions("jgsqds:add")
 	public String add(Model model) {
 		UserEntity user = securityMgr.getCurrUser();
 		GkjyrEntity jyr = new GkjyrEntity();

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdbg/ctl/JsjdbgdsCtl.java

@@ -61,6 +61,7 @@ import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.vo.BwVo;
 import com.xt.jygl.workflow.entity.TaskInfoEntity;
 import com.xt.jygl.workflow.service.TaskInfoService;
 import com.xt.jygl.workflow.vo.TaskInfoVo;
+import com.xtframe.core.anon.auth.RequiresPermissions;
 import com.xtframe.core.base.ctl.WebJsonResult;
 import com.xtframe.core.support.SecurityMgr;
 import com.xtframe.sec.code.entity.CodeEntity;
@@ -100,6 +101,7 @@ public class JsjdbgdsCtl extends BaseWebCtl {
 	private BwService bwService;
 
 	@RequestMapping(value = "/main")
+	@RequiresPermissions("jsjdbgds:main")
 	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String xmmc, final String szgkid, final String szgqid, String menuid, final String xmhzjbid, final String xmfr, final String szdid, final String sfyzjbzid) throws JsonProcessingException {
 
 		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request, "xmxxgl");
@@ -271,6 +273,7 @@ public class JsjdbgdsCtl extends BaseWebCtl {
 	}
 
 	@RequestMapping(value = "/delete")
+	@RequiresPermissions("jsjdbgds:delete")
 	@ResponseBody
 	public WebJsonResult logicdelete(Model model, String id) {
 		WebJsonResult wr = success();
@@ -749,6 +752,7 @@ public class JsjdbgdsCtl extends BaseWebCtl {
 	}
 
 	@RequestMapping(value = "/edit")
+	@RequiresPermissions("jsjdbgds:edit")
 	public String edit(Model model, String id, String flag) {
 		model.addAttribute("flag", flag);
 		JsjdbgEntity entity = jsjdbgdsService.findOne(id);
@@ -1069,6 +1073,7 @@ public class JsjdbgdsCtl extends BaseWebCtl {
 	}
 
 	@RequestMapping(value = "/add")
+	@RequiresPermissions("jsjdbgds:add")
 	public String add(Model model) {
 		UserEntity user = securityMgr.getCurrUser();
 		GkjyrEntity jyr = new GkjyrEntity();

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdcbsj/ctl/JsjdcbsjdsCtl.java

@@ -62,6 +62,7 @@ import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.vo.BwVo;
 import com.xt.jygl.workflow.entity.TaskInfoEntity;
 import com.xt.jygl.workflow.service.TaskInfoService;
 import com.xt.jygl.workflow.vo.TaskInfoVo;
+import com.xtframe.core.anon.auth.RequiresPermissions;
 import com.xtframe.core.base.ctl.WebJsonResult;
 import com.xtframe.core.support.SecurityMgr;
 import com.xtframe.sec.code.entity.CodeEntity;
@@ -101,6 +102,7 @@ public class JsjdcbsjdsCtl extends BaseWebCtl {
 	private XmxxglService xmxxglService;
 
 	@RequestMapping(value = "/main")
+	@RequiresPermissions("jsjdcbsjds:main")
 	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String xmmc, final String szgkid, final String szgqid, String menuid, final String xmhzjbid, final String xmfr, final String szdid, final String sfyzjbzid) throws JsonProcessingException {
 
 		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request, "xmxxgl");
@@ -283,6 +285,7 @@ public class JsjdcbsjdsCtl extends BaseWebCtl {
 	}
 
 	@RequestMapping(value = "/delete")
+	@RequiresPermissions("jsjdcbsjds:delete")
 	@ResponseBody
 	public WebJsonResult logicdelete(Model model, String id) {
 		WebJsonResult wr = success();
@@ -409,7 +412,6 @@ public class JsjdcbsjdsCtl extends BaseWebCtl {
 				} else {
 					jsjdcbsj.setAxspjb(null);
 				}
-				jsjdcbsj.setSftb(Constants.NO);
 				jsjdcbsj = jsjdcbsjdsService.submit(jsjdcbsj, userids);
 			} else {
 				if (!StringUtils.isEmpty(ssjyrid)) {
@@ -458,7 +460,6 @@ public class JsjdcbsjdsCtl extends BaseWebCtl {
 					axspjbdx.setId(axspjbid);
 					code.setAxspjb(axspjbdx);
 				}
-				code.setSftb(Constants.NO);
 				jsjdcbsj = jsjdcbsjdsService.submit(code, userids);
 			}
 			// 关联附件
@@ -766,6 +767,7 @@ public class JsjdcbsjdsCtl extends BaseWebCtl {
 	 */
 
 	@RequestMapping(value = "/edit")
+	@RequiresPermissions("jsjdcbsjds:edit")
 	public String edit(Model model, String id, String flag) {
 		model.addAttribute("flag", flag);
 		JsjdcbsjEntity entity = jsjdcbsjdsService.findOne(id);
@@ -1206,6 +1208,7 @@ public class JsjdcbsjdsCtl extends BaseWebCtl {
 	}
 
 	@RequestMapping(value = "/add")
+	@RequiresPermissions("jsjdcbsjds:add")
 	public String add(Model model) {
 		UserEntity user = securityMgr.getCurrUser();
 		GkjyrEntity jyr = new GkjyrEntity();

gkjsjy/trunk/src/com/xt/jygl/gkjygl/cghzyxxgl/dcsb/ctl/DcsbCtl.java

@@ -40,6 +40,7 @@ import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.service.GkjyrService;
 import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.entity.XkzsqEntity;
 import com.xt.jygl.workflow.entity.TaskInfoEntity;
 import com.xt.jygl.workflow.service.TaskInfoService;
+import com.xtframe.core.anon.auth.RequiresPermissions;
 import com.xtframe.core.base.ctl.WebJsonResult;
 import com.xtframe.core.support.SecurityMgr;
 import com.xtframe.sec.code.entity.CodeEntity;
@@ -65,6 +66,7 @@ public class DcsbCtl extends BaseWebCtl {
 	private TaskInfoService taskInfoService;
 
 	@RequestMapping(value = "/main")
+	//@RequiresPermissions("dcsb:main")
 	public String main(SimplePageRequest page, Model model, final String gkjyr, final String szdid, final String szgkid, final String szgqid, final String zypmc, final String bh, final String hwzl, final String shzt, final String menuid, final Date zysjq, final String dydlid, final Date zysjz, final HttpServletRequest request) throws JsonProcessingException {
 		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request, "dcsb");
 		final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -387,6 +389,7 @@ public class DcsbCtl extends BaseWebCtl {
 
 	// 新增
 	@RequestMapping(value = "/add")
+	//@RequiresPermissions("dcsb:add")
 	public String add(Model model) {
 		/*
 		 * SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd");
@@ -454,6 +457,7 @@ public class DcsbCtl extends BaseWebCtl {
 
 	// 修改
 	@RequestMapping(value = "/edit")
+	//@RequiresPermissions("dcsb:edit")
 	public String edit(Model model, String id, String flag, String path, String type) {
 		model.addAttribute("flag", flag);
 		model.addAttribute("path", path);
@@ -901,6 +905,7 @@ public class DcsbCtl extends BaseWebCtl {
 	// 删除
 	@RequestMapping(value = "/delete")
 	@ResponseBody
+	//@RequiresPermissions("dcsb:delete")
 	public WebJsonResult delete(Model model, String id) {
 		WebJsonResult wr = success();
 		try {

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrjbxx/service/impl/GkjyrServiceImpl.java

@@ -4,6 +4,11 @@ import java.io.IOException;
 import java.net.URL;
 import java.util.List;
 import javax.servlet.ServletOutputStream;
+
+
+
+
+import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.xssf.usermodel.XSSFCell;
 import org.apache.poi.xssf.usermodel.XSSFCellStyle;
 import org.apache.poi.xssf.usermodel.XSSFRow;
@@ -143,6 +148,7 @@ public class GkjyrServiceImpl extends JyglBaseService<GkjyrEntity, String> imple
 		// 创建一个workbook 对应一个excel应用文件
 		XSSFWorkbook workBook = new XSSFWorkbook();
 		setSheet(voList, outputStream, workBook);
+		//setSheet1(voList.get(0), outputStream, workBook);
 		try {
 			workBook.write(outputStream);
 			outputStream.flush();
@@ -424,13 +430,1333 @@ public class GkjyrServiceImpl extends JyglBaseService<GkjyrEntity, String> imple
 		}
 	}
 
+	/**
+	 * @param voList
+	 * @param outputStream
+	 * @param workBook
+	 */
+	/**
+	 * @param voList
+	 * @param outputStream
+	 * @param workBook
+	 */
+	/**
+	 * @param voList
+	 * @param outputStream
+	 * @param workBook
+	 */
+	public  void setSheet1(GkjyrVo voList, ServletOutputStream outputStream, XSSFWorkbook workBook) {
+		/*String[] titles = {  "所在地", "所在港口", "所在港区", "是否危货企业", "经营人名称", "企业性质", "办公地址", "邮政编码", "经营许可证号编号", "发证日期", "发证机关", 
+				"经营范围", "经营区域", "主营货种", "法定代表人姓名", "联系电话", "传真", "工商营业执照编号", "投资总额", "注册资本", "危险货物作业附证编号", "设施保安符合证书编号", 
+				"从业人员数量", "现场管理人员（人）", "专业技术人员（人）", "现场作业人员（人）", "房建设施总面积（平方米）", "有无产权证明", "办公用房（平方米）", 
+				"岸线长度（米）", "码头前沿河底高程（米）", "码头泊位总数（平方米）", "生产性泊位（个）", "非生产性泊位（个）", "最大靠泊能力（万吨）", "万吨级以上泊位数量（个）", "码头结构型式", 
+				"泊位总长度（米）", "有无竣工验收证明", "设计年通过能力（万吨）", "上年度总吞量（万吨）", "其中外贸总吞量（万吨）", "陆域总面积（平方米）", "仓库总面积（平方米）", "堆场总面积（平方米）", 
+				"装卸设备（台）", "其中门座吊机（台）", "轮胎起重机（台）", "固定吊机（台）", "汽车起重机（台）", "输送设备（台）", "其他机械（台）", "港作船舶（艘）", "船舶总载重量（万吨）", 
+				"工艺管线长度（米）", "铁路专用长度（米）", "储罐数量（个）", "储罐总容量（立方米）" };*/
+		// 在workbook中添加一个sheet,对应Excel文件中的sheet
+		XSSFSheet jyrSheet = workBook.createSheet("港口经营人信息");
+		ExportUtil exportUtil = new ExportUtil(workBook, jyrSheet);
+		//XSSFCellStyle headStyle = exportUtil.getHeadStyle();
+		XSSFCellStyle bodyStyle = exportUtil.getBodyStyle();
+		XSSFCellStyle bodyStyle1 = exportUtil.getBodyStyle1();
+		// 构建表头
+		//XSSFRow headRow = jyrSheet.createRow(0);
+		XSSFCell cell = null;
+		/*for (int i = 0; i < titles.length; i++) {
+			cell = headRow.createCell(i);
+			cell.setCellStyle(headStyle);
+			cell.setCellValue(titles[i]);
+		}*/
+		// 构建表体数据
+		/*XSSFRow bodyRow0 = jyrSheet.createRow(0);
+				cell = bodyRow0.createCell(1);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getSzdzw());
+				
+				cell = bodyRow0.createCell(0);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("所在地");
+				
+				cell = bodyRow0.createCell(2);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("所在港口");
+				
+				cell = bodyRow0.createCell(3);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getSzgkzw());
+				
+				cell = bodyRow0.createCell(4);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("所在港区");
+				
+				cell = bodyRow0.createCell(5);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getSzgqzw());
+				// 序号
+				
+				cell = bodyRow0.createCell(6);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("港口经营人名称");
+				
+				cell = bodyRow0.createCell(7);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getGkjyr());
+				
+				cell = bodyRow0.createCell(8);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("企业性质");
+				
+				cell = bodyRow0.createCell(9);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getQyxzzw());
+				
+				cell = bodyRow0.createCell(10);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("是否危货企业");
+				
+				cell = bodyRow0.createCell(11);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getSfwhqyzw());
+				
+				//CellRangeAddress region = new CellRangeAddress(0,0,0,1);
+				
+				//jyrSheet.addMergedRegion(region);
+				
+				
+				
+		XSSFRow bodyRow1 = jyrSheet.createRow(1);
+				cell = bodyRow1.createCell(0);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("办公地址");
+				
+				cell = bodyRow1.createCell(1);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getBgdz());
+				
+				cell = bodyRow1.createCell(2);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("邮政编码");
+				
+				
+				cell = bodyRow1.createCell(3);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getYzbm());
+				
+				cell = bodyRow1.createCell(4);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("设计年通过能力（万吨）");
+				
+				cell = bodyRow1.createCell(5);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getSjntgnl());
+			
+				cell = bodyRow1.createCell(6);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("港口经营证许可编号");
+				
+				cell = bodyRow1.createCell(7);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getGkjyxkzh());
+				
+				cell = bodyRow1.createCell(8);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("发证日期");
+				
+				cell = bodyRow1.createCell(9);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getFzrqstr());
+				
+				cell = bodyRow1.createCell(10);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("发证机关");
+				
+				cell = bodyRow1.createCell(11);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getFzjg());
+				
+				
+		XSSFRow bodyRow2 = jyrSheet.createRow(2);	
+				
+				cell = bodyRow2.createCell(0);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("经营范围");
+				
+				cell = bodyRow2.createCell(1);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getJyfw());
+				
+				cell = bodyRow2.createCell(2);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("经营区域");
+				
+				cell = bodyRow2.createCell(3);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getJyqy());
+				
+				cell = bodyRow2.createCell(4);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("主营货种");
+				
+				cell = bodyRow2.createCell(5);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getZyhz());
+				
+				cell = bodyRow2.createCell(6);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("法定代表人姓名");
+				
+				cell = bodyRow2.createCell(7);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getFddbr());
+				
+				cell = bodyRow2.createCell(8);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("联系电话");
+				
+				cell = bodyRow2.createCell(9);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getLxdh());
+				
+				cell = bodyRow2.createCell(10);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("传真");
+				
+				cell = bodyRow2.createCell(11);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getCz());
+			
+		XSSFRow bodyRow3 = jyrSheet.createRow(3);
+				cell = bodyRow3.createCell(0);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("工商营业执照编号");
+				cell = bodyRow3.createCell(1);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getGsyyzzbh());
+				
+				cell = bodyRow3.createCell(2);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("投资总额");
+				
+				cell = bodyRow3.createCell(3);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getTzze());
+				
+				cell = bodyRow3.createCell(4);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("注册资本");
+				
+				cell = bodyRow3.createCell(5);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getZczb());
+				
+				
+				cell = bodyRow3.createCell(6);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("港口货物危险作业认可证号编号");
+				
+				cell = bodyRow3.createCell(7);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getGkwxhwzyfzbh());
+				
+				cell = bodyRow3.createCell(8);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("港口设施保安符合证书编号");
+				
+				cell = bodyRow3.createCell(9);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getGkssbafhzsbh());
+				
+				cell = bodyRow3.createCell(10);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("从业人员数量（人）");
+				
+				cell = bodyRow3.createCell(11);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getCyrysl());
+				
+		XSSFRow bodyRow4 = jyrSheet.createRow(4);
+				cell = bodyRow4.createCell(0);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("现场管理人员（人）");
+				
+				cell = bodyRow4.createCell(1);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getXcglrysl());
+				
+				cell = bodyRow4.createCell(2);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("专业技术人员（人）");
+				
+				cell = bodyRow4.createCell(3);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getZyjsrysl());
+				
+				cell = bodyRow4.createCell(4);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("现场作业人员（人）");
+				
+				cell = bodyRow4.createCell(5);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getXczyrysl());
+				
+				cell = bodyRow4.createCell(6);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("房建设施总面积（平米）");
+			
+				cell = bodyRow4.createCell(7);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getFjsszmj());
+				
+				cell = bodyRow4.createCell(8);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("有无产权证明");
+				
+				cell = bodyRow4.createCell(9);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getYwcqzmzw());
+				
+				cell = bodyRow4.createCell(10);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("办公用房（平米）");
+				
+				cell = bodyRow4.createCell(11);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getBgyfmj());
+				
+		XSSFRow bodyRow5 = jyrSheet.createRow(5);
+				cell = bodyRow5.createCell(0);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("岸线长度（米）");
+				
+				cell = bodyRow5.createCell(1);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getAxcd());
+				
+				cell = bodyRow5.createCell(2);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("码头前沿河底高程（米）");
+				
+				cell = bodyRow5.createCell(3);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getMtqyhdgc());
+			
+				cell = bodyRow5.createCell(4);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("码头泊位总数（个）");
+				
+				cell = bodyRow5.createCell(5);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getMtbwzs());
+				
+				cell = bodyRow5.createCell(6);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("生产性泊位（个）");
+				
+				cell = bodyRow5.createCell(7);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getScxbw());
+				
+				cell = bodyRow5.createCell(8);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("非生产泊位（个）");
+				
+				cell = bodyRow5.createCell(9);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getFscxbw());
+			
+				cell = bodyRow5.createCell(10);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("最大靠泊能力（万吨）");
+				
+				cell = bodyRow5.createCell(11);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getZdkbnl());
+			
+		XSSFRow bodyRow6 = jyrSheet.createRow(6);	
+				cell = bodyRow6.createCell(0);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("万吨以上泊位数量（个）");
+				
+				cell = bodyRow6.createCell(1);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getWdjysbwsl());
+			
+				cell = bodyRow6.createCell(2);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("码头结构形式");
+				
+				cell = bodyRow6.createCell(3);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getMtjgxszw());
+				
+				cell = bodyRow6.createCell(4);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("泊位总长度（米）");
+				
+				cell = bodyRow6.createCell(5);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getBwzcd());
+					
+				cell = bodyRow6.createCell(6);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("有无竣工验收（证明）");
+				
+				cell = bodyRow6.createCell(7);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getYwjgyszw());
+			
+				cell = bodyRow6.createCell(8);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("上年度总吞吐量（万吨）");
+				
+				cell = bodyRow6.createCell(9);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getSndzttl());
+			
+				cell = bodyRow6.createCell(10);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("其中外贸吞吐量（万吨）");
+				
+				cell = bodyRow6.createCell(11);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getSndwmttl());
+			
+		XSSFRow bodyRow7 = jyrSheet.createRow(7);
+				cell = bodyRow7.createCell(0);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("陆域总面积（平米）");
+				
+				cell = bodyRow7.createCell(1);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getLymj());
+				
+				cell = bodyRow7.createCell(2);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("仓库总面积（平米）");
+				
+				cell = bodyRow7.createCell(3);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getCkzmj());
+				
+				cell = bodyRow7.createCell(4);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("堆场总面积（平米）");
+				
+				cell = bodyRow7.createCell(5);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getTczmj());
+			
+				cell = bodyRow7.createCell(6);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("装卸设备（台）");
+				
+				cell = bodyRow7.createCell(7);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getZxsbgs());
+				
+				cell = bodyRow7.createCell(8);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("其中，门做吊机（台）");
+				
+				cell = bodyRow7.createCell(9);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getMzdjgs());
+				
+				cell = bodyRow7.createCell(10);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("轮胎起重机（台）");
+				
+				cell = bodyRow7.createCell(11);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getLtqzjgs());
+				
+		XSSFRow bodyRow8 = jyrSheet.createRow(8);
+				cell = bodyRow8.createCell(0);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("固定吊机（台）");
+				
+				cell = bodyRow8.createCell(1);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getGddjgs());
+		
+				cell = bodyRow8.createCell(2);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("汽车起重机（台）");
+				
+				cell = bodyRow8.createCell(3);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getQcqzjgs());
+				
+				cell = bodyRow8.createCell(4);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("输送设备（台）");
+				
+				cell = bodyRow8.createCell(5);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getSssbgs());
+				
+				cell = bodyRow8.createCell(6);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("其他机械（台）");
+				
+				cell = bodyRow8.createCell(7);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getQtjxgs());
+			
+				cell = bodyRow8.createCell(8);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("港作船舶（艘）");
+				
+				cell = bodyRow8.createCell(9);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getGzcbgs());
+				
+				cell = bodyRow8.createCell(10);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("船舶总载重量（万吨）");
+				
+				cell = bodyRow8.createCell(11);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getCbzzzl());
+			
+		XSSFRow bodyRow9 = jyrSheet.createRow(9);		
+				cell = bodyRow9.createCell(0);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("工艺管线长度（米）");
+				
+				cell = bodyRow9.createCell(1);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getGygxcd());
+				
+				cell = bodyRow9.createCell(2);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("铁路专用线长度（米）");
+				
+				cell = bodyRow9.createCell(3);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getTlzyxcd());
+		
+				cell = bodyRow9.createCell(4);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("储罐数量（个）");
+				
+				cell = bodyRow9.createCell(5);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getCgsl());
+				
+				cell = bodyRow9.createCell(6);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("储罐总容量（立方米）");
+				
+				cell = bodyRow9.createCell(7);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getCgzrl());
+				*/
+		
+			XSSFRow bodyRow0 = jyrSheet.createRow(0);
+				cell = bodyRow0.createCell(0);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("港口经营人名称");
+				
+				cell = bodyRow0.createCell(1);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getGkjyr());
+				
+				cell = bodyRow0.createCell(2);
+				cell.setCellStyle(bodyStyle1);
+				
+				cell = bodyRow0.createCell(3);
+				cell.setCellStyle(bodyStyle1);
+				
+				cell = bodyRow0.createCell(4);
+				cell.setCellStyle(bodyStyle1);
+				
+				cell = bodyRow0.createCell(5);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("企业性质");
+				
+				cell = bodyRow0.createCell(6);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getQyxzzw());
+				
+				CellRangeAddress region = new CellRangeAddress(0,0,1,4);
+				jyrSheet.addMergedRegion(region);
+				
+			XSSFRow bodyRow1 = jyrSheet.createRow(1);
+				cell = bodyRow1.createCell(0);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("办公地址");
+				
+				cell = bodyRow1.createCell(1);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getBgdz());
+				
+				cell = bodyRow0.createCell(2);
+				cell.setCellStyle(bodyStyle1);
+				
+				cell = bodyRow0.createCell(3);
+				cell.setCellStyle(bodyStyle1);
+				
+				cell = bodyRow0.createCell(4);
+				cell.setCellStyle(bodyStyle1);
+				
+				cell = bodyRow1.createCell(5);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("邮政编码");
+				
+				
+				cell = bodyRow1.createCell(6);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getYzbm());
+				
+				CellRangeAddress region1 = new CellRangeAddress(1,1,1,4);
+				jyrSheet.addMergedRegion(region1);
+				
+			XSSFRow bodyRow2 = jyrSheet.createRow(2);
+				cell = bodyRow2.createCell(0);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("港口经营证许可编号");
+				
+				cell = bodyRow2.createCell(1);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getGkjyxkzh());
+				
+				cell = bodyRow2.createCell(2);
+				cell.setCellStyle(bodyStyle1);
+				
+				cell = bodyRow2.createCell(3);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("发证日期");
+				
+				cell = bodyRow2.createCell(4);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getFzrqstr());
+				
+				cell = bodyRow2.createCell(5);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("发证机关");
+				
+				cell = bodyRow2.createCell(6);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getFzjg());
+				
+				CellRangeAddress region2 = new CellRangeAddress(2,2,1,2);
+				jyrSheet.addMergedRegion(region2);
+				
+			XSSFRow bodyRow3 = jyrSheet.createRow(3);
+				
+				cell = bodyRow3.createCell(0);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("经营范围");
+				
+				cell = bodyRow3.createCell(1);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getJyfw());
+				
+				cell = bodyRow3.createCell(2);
+				cell.setCellStyle(bodyStyle1);
+				
+				cell = bodyRow3.createCell(3);
+				cell.setCellStyle(bodyStyle1);
+				
+				cell = bodyRow3.createCell(4);
+				cell.setCellStyle(bodyStyle1);
+				
+				cell = bodyRow3.createCell(5);
+				cell.setCellStyle(bodyStyle1);
+				
+				cell = bodyRow3.createCell(6);
+				cell.setCellStyle(bodyStyle1);
+				
+				CellRangeAddress region3 = new CellRangeAddress(3,3,1,6);
+				jyrSheet.addMergedRegion(region3);
+				
+			XSSFRow bodyRow4 = jyrSheet.createRow(4);
+				cell = bodyRow4.createCell(0);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("经营区域");
+				
+				cell = bodyRow4.createCell(1);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getJyqy());
+				
+				cell = bodyRow4.createCell(2);
+				cell.setCellStyle(bodyStyle1);
+				
+				cell = bodyRow4.createCell(3);
+				cell.setCellStyle(bodyStyle1);
+				
+				cell = bodyRow4.createCell(4);
+				cell.setCellStyle(bodyStyle1);
+				
+				cell = bodyRow4.createCell(5);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("主营货种");
+				
+				cell = bodyRow4.createCell(6);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getZyhz());
+				
+				CellRangeAddress region4 = new CellRangeAddress(4,4,1,4);
+				jyrSheet.addMergedRegion(region4);
+				
+			XSSFRow bodyRow5 = jyrSheet.createRow(5);
+				
+				cell = bodyRow5.createCell(0);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("法定代表人姓名");
+				cell = bodyRow5.createCell(1);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getFddbr());
+				
+				cell = bodyRow5.createCell(2);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("联系电话");
+				cell = bodyRow5.createCell(3);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getLxdh());
+				
+				cell = bodyRow5.createCell(4);
+				cell.setCellStyle(bodyStyle1);
+				
+				cell = bodyRow5.createCell(5);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("传真");
+				cell = bodyRow5.createCell(6);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getCz());
+				
+				CellRangeAddress region5 = new CellRangeAddress(5,5,3,4);
+				
+				jyrSheet.addMergedRegion(region5);
+				
+			XSSFRow bodyRow6 = jyrSheet.createRow(6);
+				cell = bodyRow6.createCell(0);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("工商营业执照编号");
+				cell = bodyRow6.createCell(1);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getGsyyzzbh());
+				
+				cell = bodyRow6.createCell(2);
+				cell.setCellStyle(bodyStyle);
+				
+				cell = bodyRow6.createCell(3);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("投资总额");
+				
+				cell = bodyRow6.createCell(4);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getTzze());
+				
+				cell = bodyRow6.createCell(5);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("注册资本");
+				
+				cell = bodyRow6.createCell(6);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getZczb());
+				
+				CellRangeAddress region6 = new CellRangeAddress(6,6,1,2);
+				jyrSheet.addMergedRegion(region6);
+				
+			XSSFRow bodyRow7 = jyrSheet.createRow(7);	
+				cell = bodyRow7.createCell(0);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("港口货物危险作业认可证号编号");
+				
+				cell = bodyRow7.createCell(1);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getGkwxhwzyfzbh());
+				
+				cell = bodyRow7.createCell(2);
+				cell.setCellStyle(bodyStyle);
+				
+				cell = bodyRow7.createCell(3);
+				cell.setCellStyle(bodyStyle);
+				
+				cell = bodyRow7.createCell(4);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("港口设施保安符合证书编号");
+				
+				cell = bodyRow7.createCell(5);
+				cell.setCellStyle(bodyStyle);
+				
+				cell = bodyRow7.createCell(6);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getGkssbafhzsbh());
+				
+				CellRangeAddress region7 = new CellRangeAddress(7,7,1,3);
+				CellRangeAddress region71 = new CellRangeAddress(7,7,4,5);
+				jyrSheet.addMergedRegion(region7);
+				jyrSheet.addMergedRegion(region71);
+				
+				
+			XSSFRow bodyRow8 = jyrSheet.createRow(8);
+				cell = bodyRow8.createCell(0);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("从业人员数量");
+				
+				cell = bodyRow8.createCell(1);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getCyrysl());
+				
+				cell = bodyRow8.createCell(2);
+				cell.setCellStyle(bodyStyle1);
+				
+				cell = bodyRow8.createCell(3);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("现场管理人员（人）");
+				
+				cell = bodyRow8.createCell(4);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getXcglrysl());
+				
+				cell = bodyRow8.createCell(5);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("参加培训人员数量（人）");
+				
+				cell = bodyRow8.createCell(6);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getXcglpxrysl());
+				
+			XSSFRow bodyRow9 = jyrSheet.createRow(9);
+				cell = bodyRow9.createCell(0);
+				cell.setCellStyle(bodyStyle);
+				
+				
+				cell = bodyRow9.createCell(1);
+				cell.setCellStyle(bodyStyle1);
+				
+				
+				cell = bodyRow9.createCell(2);
+				cell.setCellStyle(bodyStyle1);
+				
+				cell = bodyRow9.createCell(3);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("专业技术人员（人）");
+				
+				cell = bodyRow9.createCell(4);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getZyjsrysl());
+				
+				cell = bodyRow9.createCell(5);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("参加培训人员数量（人）");
+				
+				cell = bodyRow9.createCell(6);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getZyjspxrysl());
+				
+			XSSFRow bodyRow10 = jyrSheet.createRow(10);
+				cell = bodyRow10.createCell(0);
+				cell.setCellStyle(bodyStyle);
+				
+				
+				cell = bodyRow10.createCell(1);
+				cell.setCellStyle(bodyStyle1);
+				
+				
+				cell = bodyRow10.createCell(2);
+				cell.setCellStyle(bodyStyle1);
+				
+				cell = bodyRow10.createCell(3);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("现场作业人员（人）");
+				
+				cell = bodyRow10.createCell(4);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getXczyrysl());
+				
+				cell = bodyRow10.createCell(5);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("参加培训人员数量（人）");
+				
+				cell = bodyRow10.createCell(6);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getXczyrypxsl());
+				
+				CellRangeAddress region89101 = new CellRangeAddress(8,10,0,0);
+				jyrSheet.addMergedRegion(region89101);
+				CellRangeAddress region89102 = new CellRangeAddress(8,10,1,2);
+				jyrSheet.addMergedRegion(region89102);
+				CellRangeAddress region89103 = new CellRangeAddress(8,10,5,5);
+				jyrSheet.addMergedRegion(region89103);
+				
+				
+			XSSFRow bodyRow11 = jyrSheet.createRow(11);
+				cell = bodyRow11.createCell(0);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("房建设施总面积(平米)");
+			
+				cell = bodyRow11.createCell(1);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getFjsszmj());
+				
+				cell = bodyRow11.createCell(2);
+				cell.setCellStyle(bodyStyle1);
+				
+				cell = bodyRow11.createCell(3);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("有无产权证明");
+				
+				cell = bodyRow11.createCell(4);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getYwcqzmzw());
+				
+				cell = bodyRow11.createCell(5);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("办公用房（平米）");
+				
+				cell = bodyRow11.createCell(6);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getBgyfmj());
+				CellRangeAddress region11 = new CellRangeAddress(11,11,1,2);
+				jyrSheet.addMergedRegion(region11);
+			
+			XSSFRow bodyRow12 = jyrSheet.createRow(12);
+				cell = bodyRow12.createCell(0);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("岸线长度（米）");
+				
+				cell = bodyRow12.createCell(1);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getAxcd());
+				
+				cell = bodyRow12.createCell(2);
+				cell.setCellStyle(bodyStyle1);
+				
+				cell = bodyRow12.createCell(3);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("码头前沿河底高程（米）");
+				
+				cell = bodyRow12.createCell(4);
+				cell.setCellStyle(bodyStyle1);
+				
+				cell = bodyRow12.createCell(5);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getMtqyhdgc());
+				
+				cell = bodyRow12.createCell(6);
+				cell.setCellStyle(bodyStyle1);
+				
+				CellRangeAddress region121 = new CellRangeAddress(12,12,1,2);
+				jyrSheet.addMergedRegion(region121);
+				CellRangeAddress region122 = new CellRangeAddress(12,12,3,4);
+				jyrSheet.addMergedRegion(region122);
+				CellRangeAddress region123 = new CellRangeAddress(12,12,5,6);
+				jyrSheet.addMergedRegion(region123);
+				
+			XSSFRow bodyRow13 = jyrSheet.createRow(13);
+				cell = bodyRow13.createCell(0);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("码头泊位总数（平米）");
+				
+				cell = bodyRow13.createCell(1);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getMtbwzs());
+				
+				cell = bodyRow13.createCell(2);
+				cell.setCellStyle(bodyStyle1);
+				
+				cell = bodyRow13.createCell(3);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("生产性泊位（个）");
+				
+				cell = bodyRow13.createCell(4);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getScxbw());
+				
+				cell = bodyRow13.createCell(5);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("非生产泊位（个）");
+				
+				cell = bodyRow13.createCell(6);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getFscxbw());
+				CellRangeAddress region13 = new CellRangeAddress(13,13,1,2);
+				jyrSheet.addMergedRegion(region13);
+				
+			XSSFRow bodyRow14 = jyrSheet.createRow(14);
+				cell = bodyRow14.createCell(0);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("最大靠泊能力（万吨）");
+				
+				cell = bodyRow14.createCell(1);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getZdkbnl());
+				
+				cell = bodyRow14.createCell(2);
+				cell.setCellStyle(bodyStyle1);
+				
+				cell = bodyRow14.createCell(3);
+				cell.setCellStyle(bodyStyle1);
+				
+				cell = bodyRow14.createCell(4);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("万吨以上泊位数量（个）");
+				
+				cell = bodyRow14.createCell(5);
+				cell.setCellStyle(bodyStyle1);
+				
+				cell = bodyRow14.createCell(6);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getWdjysbwsl());
+				CellRangeAddress region14 = new CellRangeAddress(14,14,1,3);
+				jyrSheet.addMergedRegion(region14);
+				CellRangeAddress region141 = new CellRangeAddress(14,14,4,5);
+				jyrSheet.addMergedRegion(region141);
+			
+			XSSFRow bodyRow15 = jyrSheet.createRow(15);	
+				cell = bodyRow15.createCell(0);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("码头结构形式");
+				
+				cell = bodyRow15.createCell(1);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getMtjgxszw());
+				
+				cell = bodyRow15.createCell(2);
+				cell.setCellStyle(bodyStyle1);
+				
+				cell = bodyRow15.createCell(3);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("泊位总长度（米）");
+				
+				cell = bodyRow15.createCell(4);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getBwzcd());
+			
+					
+				cell = bodyRow15.createCell(5);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("有无竣工验收（证明）");
+				
+				cell = bodyRow15.createCell(6);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getYwjgyszw());
+				CellRangeAddress region15 = new CellRangeAddress(15,15,1,2);
+				jyrSheet.addMergedRegion(region15);
+				
+			XSSFRow bodyRow16 = jyrSheet.createRow(16);	
+				cell = bodyRow16.createCell(0);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("设计年通过能力（万吨）");
+				
+				cell = bodyRow16.createCell(1);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getSjntgnl());
+				
+				cell = bodyRow16.createCell(2);
+				cell.setCellStyle(bodyStyle1);
+				
+				cell = bodyRow16.createCell(3);
+				cell.setCellStyle(bodyStyle1);
+				
+				cell = bodyRow16.createCell(4);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("其中集装箱（万吨）");
+				
+				cell = bodyRow16.createCell(5);
+				cell.setCellStyle(bodyStyle);
+				
+				cell = bodyRow16.createCell(6);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getJzx());
+				CellRangeAddress region16 = new CellRangeAddress(16,16,1,3);
+				jyrSheet.addMergedRegion(region16);
+				CellRangeAddress region161 = new CellRangeAddress(16,16,4,5);
+				jyrSheet.addMergedRegion(region161);
+				
+			XSSFRow bodyRow17 = jyrSheet.createRow(17);
+				cell = bodyRow17.createCell(0);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("上年度总吞吐量（万吨）");
+				
+				cell = bodyRow17.createCell(1);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getSndzttl());
+				
+				cell = bodyRow17.createCell(2);
+				cell.setCellStyle(bodyStyle1);
+				
+				cell = bodyRow17.createCell(3);
+				cell.setCellStyle(bodyStyle1);
+				
+				cell = bodyRow17.createCell(4);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("其中集装箱（万吨）");
+				
+				cell = bodyRow17.createCell(5);
+				cell.setCellStyle(bodyStyle);
+				
+				cell = bodyRow17.createCell(6);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getSndzjzx());
+				
+				CellRangeAddress region17 = new CellRangeAddress(17,17,1,3);
+				jyrSheet.addMergedRegion(region17);
+				CellRangeAddress region171 = new CellRangeAddress(17,17,4,5);
+				jyrSheet.addMergedRegion(region171);
+				
+			XSSFRow bodyRow171 = jyrSheet.createRow(18);
+				cell = bodyRow171.createCell(0);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("其中外贸吞吐量（万吨）");
+				
+				cell = bodyRow171.createCell(1);
+				cell.setCellStyle(bodyStyle1);
+				//cell.setCellValue(voList.getSndzttl());
+				cell.setCellValue(voList.getSndwmttl());
+				
+				cell = bodyRow171.createCell(2);
+				cell.setCellStyle(bodyStyle1);
+				
+				cell = bodyRow171.createCell(3);
+				cell.setCellStyle(bodyStyle1);
+				
+				cell = bodyRow171.createCell(4);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("其中集装箱（万吨）");
+				
+				cell = bodyRow171.createCell(5);
+				cell.setCellStyle(bodyStyle);
+				
+				cell = bodyRow171.createCell(6);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getSndwmjzx());
+				
+				CellRangeAddress region1711 = new CellRangeAddress(18,18,1,3);
+				jyrSheet.addMergedRegion(region1711);
+				CellRangeAddress region1712 = new CellRangeAddress(18,18,4,5);
+				jyrSheet.addMergedRegion(region1712);
+				
+			XSSFRow bodyRow18 = jyrSheet.createRow(19);
+				cell = bodyRow18.createCell(0);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("陆域总面积（平米）");
+				
+				cell = bodyRow18.createCell(1);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getLymj());
+				
+				cell = bodyRow18.createCell(2);
+				cell.setCellStyle(bodyStyle1);
+				
+				cell = bodyRow18.createCell(3);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("仓库总面积（平米）");
+				
+				cell = bodyRow18.createCell(4);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getCkzmj());
+				
+				cell = bodyRow18.createCell(5);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("堆场总面积（平米）");
+				
+				cell = bodyRow18.createCell(6);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getTczmj());
+				CellRangeAddress region18 = new CellRangeAddress(19,19,1,2);
+				jyrSheet.addMergedRegion(region18);
+				
+			XSSFRow bodyRow19 = jyrSheet.createRow(20);
+				cell = bodyRow19.createCell(0);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("装卸设备总数量（台）");
+				
+				cell = bodyRow19.createCell(1);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getZxsbgs());
+				
+				cell = bodyRow19.createCell(2);
+				cell.setCellStyle(bodyStyle1);
+				
+				cell = bodyRow19.createCell(3);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("门做吊机（台）");
+				
+				cell = bodyRow19.createCell(4);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getMzdjgs());
+				
+				cell = bodyRow19.createCell(5);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("轮胎起重机（台）");
+				
+				cell = bodyRow19.createCell(6);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getLtqzjgs());
+				
+			XSSFRow bodyRow20 = jyrSheet.createRow(21);
+				cell = bodyRow20.createCell(0);
+				cell.setCellStyle(bodyStyle);
+				
+				
+				cell = bodyRow20.createCell(1);
+				cell.setCellStyle(bodyStyle1);
+				
+				
+				cell = bodyRow20.createCell(2);
+				cell.setCellStyle(bodyStyle1);
+				
+				cell = bodyRow20.createCell(3);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("固定吊机（台）");
+				
+				cell = bodyRow20.createCell(4);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getGddjgs());
+				
+				cell = bodyRow20.createCell(5);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("汽车起重机（台）");
+				
+				cell = bodyRow20.createCell(6);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getQcqzjgs());
+				
+			XSSFRow bodyRow21 = jyrSheet.createRow(22);
+				cell = bodyRow21.createCell(0);
+				cell.setCellStyle(bodyStyle);
+				
+				
+				cell = bodyRow21.createCell(1);
+				cell.setCellStyle(bodyStyle1);
+				
+				
+				cell = bodyRow21.createCell(2);
+				cell.setCellStyle(bodyStyle1);
+				
+				cell = bodyRow21.createCell(3);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("输送设备（台）");
+				
+				cell = bodyRow21.createCell(4);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getSssbgs());
+				
+				cell = bodyRow21.createCell(5);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("其他机械（台）");
+				
+				cell = bodyRow21.createCell(6);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getQtjxgs());
+				
+				CellRangeAddress region1920211 = new CellRangeAddress(20,22,0,0);
+				jyrSheet.addMergedRegion(region1920211);
+				CellRangeAddress region1920212 = new CellRangeAddress(20,22,1,2);
+				jyrSheet.addMergedRegion(region1920212);
+				
+				
+			XSSFRow bodyRow22 = jyrSheet.createRow(23);	
+				cell = bodyRow22.createCell(0);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("港作船舶（艘）");
+				
+				cell = bodyRow22.createCell(1);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getGzcbgs());
+				
+				cell = bodyRow22.createCell(2);
+				cell.setCellStyle(bodyStyle1);
+				
+				cell = bodyRow22.createCell(3);
+				cell.setCellStyle(bodyStyle1);
+				
+				cell = bodyRow22.createCell(4);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("船舶总载重量（万吨）");
+				
+				cell = bodyRow22.createCell(5);
+				cell.setCellStyle(bodyStyle);
+				
+				cell = bodyRow22.createCell(6);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getCbzzzl());
+				
+				CellRangeAddress region22 = new CellRangeAddress(23,23,1,3);
+				jyrSheet.addMergedRegion(region22);
+				CellRangeAddress region221 = new CellRangeAddress(23,23,4,5);
+				jyrSheet.addMergedRegion(region221);
+				
+			XSSFRow bodyRow23 = jyrSheet.createRow(24);	
+				cell = bodyRow23.createCell(0);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("工艺管线长度（米）");
+				
+				cell = bodyRow23.createCell(1);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getGygxcd());
+				
+				cell = bodyRow23.createCell(2);
+				cell.setCellStyle(bodyStyle1);
+				
+				cell = bodyRow23.createCell(3);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("铁路专用线长度（米）");
+				
+				cell = bodyRow23.createCell(4);
+				cell.setCellStyle(bodyStyle);
+				
+				cell = bodyRow23.createCell(5);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getTlzyxcd());
+				cell = bodyRow23.createCell(6);
+				cell.setCellStyle(bodyStyle1);
+				
+				CellRangeAddress region23 = new CellRangeAddress(24,24,1,2);
+				jyrSheet.addMergedRegion(region23);
+				CellRangeAddress region231 = new CellRangeAddress(24,24,3,4);
+				jyrSheet.addMergedRegion(region231);
+				CellRangeAddress region232 = new CellRangeAddress(24,24,5,6);
+				jyrSheet.addMergedRegion(region232);
+				
+			XSSFRow bodyRow24 = jyrSheet.createRow(25);
+				cell = bodyRow24.createCell(0);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("储罐数量(个)");
+				
+				cell = bodyRow24.createCell(1);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getCgsl());
+				
+				cell = bodyRow24.createCell(2);
+				cell.setCellStyle(bodyStyle1);
+				
+				cell = bodyRow24.createCell(3);
+				cell.setCellStyle(bodyStyle);
+				cell.setCellValue("储罐总容量（立方米）");
+				
+				cell = bodyRow24.createCell(4);
+				cell.setCellStyle(bodyStyle);
+				
+				cell = bodyRow24.createCell(5);
+				cell.setCellStyle(bodyStyle1);
+				cell.setCellValue(voList.getCgzrl());
+				
+				cell = bodyRow24.createCell(6);
+				cell.setCellStyle(bodyStyle);
+				
+				CellRangeAddress region24 = new CellRangeAddress(25,25,1,2);
+				jyrSheet.addMergedRegion(region24);
+				CellRangeAddress region241 = new CellRangeAddress(25,25,3,4);
+				jyrSheet.addMergedRegion(region241);
+				CellRangeAddress region242 = new CellRangeAddress(25,25,5,6);
+				jyrSheet.addMergedRegion(region242);
+				
+	}
+
 	@Override
 	public void exportJyr(List<GkjyrVo> voList, List<XkzxxVo> xkzxxVos, List<XkzfzVo> xkzfzVos, List<MtVo> mtVos, List<BwVo> bwVos, List<CgVo> cgVos, List<CkVo> ckVos, List<DcVo> dcVos, List<RyVo> ryVos, List<SssbVo> sssbVos, List<QytzVo> qytzVos, List<ZxjxVo> zxjxVos, ServletOutputStream outputStream, List<CodeEntity> listZycs, List<GqEntity> listgq, List<GkEntity> listgk) {
 //	public void exportJyr(List<GkjyrVo> voList, List<XkzfzVo> xkzfzVos, List<MtVo> mtVos, List<BwVo> bwVos, List<CgVo> cgVos, List<CkVo> ckVos, List<DcVo> dcVos, List<RyVo> ryVos, List<SssbVo> sssbVos, List<QytzVo> qytzVos, List<ZxjxVo> zxjxVos, ServletOutputStream outputStream, List<CodeEntity> listZycs, List<GqEntity> listgq, List<GkEntity> listgk) {
 		// 创建一个workbook 对应一个excel应用文件
 		XSSFWorkbook workBook = new XSSFWorkbook();
 		//经营人信息
-		setSheet(voList, outputStream, workBook);
+		//setSheet(voList, outputStream, workBook);
+		setSheet1(voList.get(0), outputStream, workBook);
 		//许可证信息
 		xkzxxService.setXkzxxSheet(xkzxxVos, outputStream, workBook);
 		//许可证附证信息