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

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

@@ -81,23 +81,37 @@
 			<div class="apply_fill">
  <form  id="addform" method="post" enctype="multipart/form-data"> 			
  <input type="hidden" class="form-control"  name="fjids" id="fjids">
-					<table class="apply" cellpadding="0" cellspacing="0">
+					<table class="apply3" cellpadding="0" cellspacing="0">
 						<tr>
 							<th><span class="needwrite">*</span>项目编码：&nbsp;</th>
-							<td colspan="4">
-								<input type="text" style="width: 92.5%;" class="form-control" name="xmbm">
+							<td>
+								<input type="text"  class="form-control" name="xmbm">
+							</td>
+							<th><span class="needwrite">*</span>项目名称：&nbsp;</th>
+							<td>
+								<input type="text"  class="form-control" name="xmmc">
 							</td>
 						</tr>
 						<tr>
-							<th><span class="needwrite">*</span>项目名称：&nbsp;</th>
-							<td colspan="4">
-								<input type="text" style="width: 92.5%;" class="form-control" name="xmmc">
+							<th>项目概况：&nbsp;</th>
+							<td colspan="3">
+								<input type="text" class="form-control" name="xmgk">
+							</td>
+						</tr>
+						<tr>
+						 	<th>建设规模：&nbsp;</th>
+							<td colspan="3">
+								<input type="text" class="form-control" name="jsgm">
 							</td>
 						</tr>
 						<tr>
-							<th><span class="needwrite">*</span>所属单位：&nbsp;</th>
-							<td colspan="4" style="position:relative;">
-								<input type="text" style="width: 92.5%;" readonly="readonly" class="form-control"  id ="jyrmc" value ="${jyr.gkjyr }">
+							<th><span class="needwrite">*</span>项目法人：&nbsp;</th>
+							<td >
+								<input type="text" class="form-control" name="xmfr" id="xmfr">
+							</td>
+							<th><span class="needwrite">*</span>建设单位：&nbsp;</th>
+							<td  style="position:relative;">
+								<input type="text"  readonly="readonly" class="form-control"  id ="jyrmc" value ="${jyr.gkjyr }">
 								<input type="hidden" class="form-control" name="ssjyrid" id ="jyrid"  value ="${jyr.id }">
 								<c:if test="${jyr.id == null }">
 										<a class="btn btn-primary btn-sm" href="#"
@@ -108,24 +122,26 @@
 							</td>
 						</tr>
 						<tr>
+							<th><span class="needwrite">*</span>行政区划：&nbsp;</th>
+							<td>
+								<div id="xzqhsel"></div>
+								<input type="hidden"  id="xmbm" name="xmbm">
+							</td>
 						    <th><span class="needwrite">*</span>所在地：&nbsp;</th>
 							<td>
 								<div id="szdsel"></div>
 							</td>
+						</tr>
+						<tr>
 							<th><span class="needwrite">*</span>所在港口：&nbsp;</th>
 							<td >
 								<div id="gksel"></div>
 							</td>
-						</tr>
-						<tr>
 						    <th><span class="needwrite">*</span>所在港区：&nbsp;</th>
 						 	<td >
 								<div id="gqsel"></div>
 							</td>
-							<th><span class="needwrite">*</span>项目法人：&nbsp;</th>
-							<td >
-								<input type="text" class="form-control" name="xmfr" id="xmfr">
-							</td>
+							
 						</tr>
 						<tr>
 						    <th><span class="needwrite">*</span>项目类型：&nbsp;</th>
@@ -138,25 +154,15 @@
 							</td>
 						</tr>
 						<tr>
-						    <th>建设规模：&nbsp;</th>
-							<td >
-								<input type="text" class="form-control" name="jsgm">
+						   <th>总投资 （万元）：&nbsp;</th>
+							<td>
+								<input type="text" class="form-control" name="ztz">
 							</td>
 							<th>投资类型：&nbsp;</th>
 							<td >
 								<div id="tzlxsel"></div>
 							</td>
 						</tr>
-						<tr>
-						    <th>总投资 （万元）：&nbsp;</th>
-							<td>
-								<input type="text" class="form-control" name="ztz">
-							</td>
-     						<th>项目核准级别：&nbsp;</th>
-							<td>
-							   <div id="xmhzjbsel"></div>
-							</td>
-						</tr>
 							<tr id="zftzDiv" style="display:none">
 						    <th>政府投资（万元）：&nbsp;</th>
 							<td >
@@ -168,6 +174,16 @@
 							</td>
 						</tr>
 						<tr>
+						<th>建成时间：&nbsp;</th>
+							<td>
+							<input type="text" class="Wdate" name="jcsj" value="${jcsj }" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd'})">
+							</td>
+							 <th>泊位个数：&nbsp;</th>
+							<td>
+							<input type="text" readonly="readonly" class="form-control" id="bwgs">
+							</td>
+						</tr>
+						<tr>
 						    <th>岸线审批级别：&nbsp;</th>
 							<td >
 								<div id="axspjbsel"></div>
@@ -177,27 +193,12 @@
 								<input type="text" class="form-control" name="axcd">
 							</td>
 						</tr>
-						<tr>
-						   
-							<th>通过能力（万吨）：&nbsp;</th>
-							<td >
-								<input type="text" class="form-control" name="tgnl">
-							</td>
 						
-					 	    <th>泊位用途：&nbsp;</th>
-                        <td >
-	                        <span id="bwytsel"></span>
-                        </td>
-                       </tr>
                       	<tr>
 							<th>水域类型：&nbsp;</th>
 							<td >
 								<div id="sylxsel"></div>
 							</td>
-						    <th>建成时间：&nbsp;</th>
-							<td>
-							<input type="text" class="Wdate" name="jcsj" value="${jcsj }" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd'})">
-							</td>
 						</tr>
 						
 					</table>

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

@@ -84,20 +84,35 @@
 					<table class="apply3" cellpadding="0" cellspacing="0" style="table-layout: fixed;">
 					<tr>
 							<th><span class="needwrite">*</span>项目编码：&nbsp;</th>
+							<td>
+								<input type="text" class="form-control" name="xmbm" value="${record.xmbm }">
+							</td>
+							<th><span class="needwrite">*</span>项目名称：&nbsp;</th>
+							<td>
+								<input type="text"  class="form-control" name="xmmc" value="${record.xmmc }">
+							</td>
+						</tr>
+						
+						<tr>
+							<th>项目概况：&nbsp;</th>
 							<td colspan="3">
-								<input type="text" style="width: 92.5%;" class="form-control" name="xmbm" value="${record.xmbm }">
+								<input type="text" class="form-control" name="xmgk" value="${record.xmgk }">
 							</td>
 						</tr>
 						<tr>
-							<th><span class="needwrite">*</span>项目名称：&nbsp;</th>
-							<td colspan="3" >
-								<input type="text" style="width: 92.5%;" class="form-control" name="xmmc" value="${record.xmmc }">
+							<th>建设规模：&nbsp;</th>
+							<td colspan="3">
+								<input type="text" class="form-control" name="jsgm" value="${record.jsgm }">
 							</td>
 						</tr>
 						<tr>
-							<th><span class="needwrite">*</span>所属单位：&nbsp;</th>
+							<th><span class="needwrite">*</span>项目法人：&nbsp;</th>
+							<td >
+								<input type="text" class="form-control" name="xmfr" value="${record.xmfr }">
+							</td>
+							<th><span class="needwrite">*</span>建设单位：&nbsp;</th>
 							<td colspan="3" style="position:relative;">
-								<input type="text" style="width: 92.5%;" readonly="readonly" class="form-control"  id ="jyrmc" value ="${jyr.gkjyr }">
+								<input type="text"  readonly="readonly" class="form-control"  id ="jyrmc" value ="${jyr.gkjyr }">
 								<input type="hidden" class="form-control" name="ssjyrid" id ="jyrid" value ="${jyr.id }">
 								<c:if test="${jyr.id == null }">
 								<a class="btn btn-primary btn-sm" href="#"
@@ -108,27 +123,28 @@
 							</td>
 						</tr>
 						<tr>
+							 <th><span class="needwrite">*</span>行政区划：&nbsp;</th>
+							<td>
+								<input type="text"  readonly="readonly" class="form-control" value="${xzqhname}">
+							</td>
 						    <th><span class="needwrite">*</span>所在地：&nbsp;</th>
 							<td>
 								<span id="szdsel">
 								</span>
 							</td>
+							
+						</tr>
+						<tr>
 							<th><span class="needwrite">*</span>所在港口：&nbsp;</th>
 							<td >
 								<span id="gksel">
 								</span>
 							</td>
-						</tr>
-						<tr>
 					    	<th><span class="needwrite">*</span>所在港区：&nbsp;</th>
 							<td >
 								<span id="gqsel">
 								</span>
 							</td>
-							<th><span class="needwrite">*</span>项目法人：&nbsp;</th>
-							<td >
-								<input type="text" class="form-control" name="xmfr" value="${record.xmfr }">
-							</td>
 						</tr>
 						<tr>
 						    <th><span class="needwrite">*</span>项目类型：&nbsp;</th>
@@ -142,24 +158,13 @@
 							</td>
 						</tr>
 						<tr>
-					    	<th>建设规模：&nbsp;</th>
-							<td >
-								<input type="text" class="form-control" name="jsgm" value="${record.jsgm }">
-							</td>
-							<th>投资类型：&nbsp;</th>
-							<td>
-								<span id="tzlxsel">
-								</span>
-							</td>
-						</tr>
-						<tr>
-						    <th>总投资（万元）：&nbsp;</th>
+					    	 <th>总投资（万元）：&nbsp;</th>
 							<td>
 								<input type="text" class="form-control" name="ztz" value="${record.ztz }">
 							</td>
-							<th>项目核准级别：&nbsp;</th>
+							<th>投资类型：&nbsp;</th>
 							<td>
-								<span id="xmhzjbsel">
+								<span id="tzlxsel">
 								</span>
 							</td>
 						</tr>
@@ -174,38 +179,46 @@
 							</td>
 						</tr>
 						<tr>
-					    	<th>岸线审批级别：&nbsp;</th>
+						<th>建成时间：&nbsp;</th>
 							<td>
-								<span id="axspjbsel">
-								</span>
+							<input type="text" class="Wdate" name="jcsj" value="${fn:substring(record.jcsj,0,10) }" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd'})">
 							</td>
-							<th>岸线长度 （米）：&nbsp;</th>
+							<th>泊位个数：&nbsp;</th>
 							<td >
-								<input type="text" class="form-control" name="axcd" value="${record.axcd }">
+								<input type="text"  readonly="readonly" class="form-control" value="${bwgs}">
 							</td>
 						</tr>
 						<tr>
-					    	
+						   
+							<th>项目核准级别：&nbsp;</th>
+							<td>
+								<span id="xmhzjbsel">
+								</span>
+							</td>
 							<th>通过能力（万吨）：&nbsp;</th>
 							<td >
 								<input type="text" class="form-control" name="tgnl" value="${record.tgnl }">
 							</td>
+						</tr>
 						
-					 	    <th>泊位用途：&nbsp;</th>
-                        <td >
-	                        <span id="bwytsel"></span>
-                        </td>
-                       
+						<tr>
+					    	<th>岸线审批级别：&nbsp;</th>
+							<td>
+								<span id="axspjbsel">
+								</span>
+							</td>
+							<th>岸线长度 （米）：&nbsp;</th>
+							<td >
+								<input type="text" class="form-control" name="axcd" value="${record.axcd }">
+							</td>
 						</tr>
+						
 							<tr>
 							<th>水域类型：&nbsp;</th>
 							<td >
 								<div id="sylxsel"></div>
 							</td>
-						    <th>建成时间：&nbsp;</th>
-							<td>
-							<input type="text" class="Wdate" name="jcsj" value="${fn:substring(record.jcsj,0,10) }" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd'})">
-							</td>
+						   
 						</tr>
 							<tr>
                     <th>地市附件与专家评审附件：&nbsp;</th>

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

@@ -91,41 +91,57 @@
 					<table class="apply3" cellpadding="0" cellspacing="0" style="table-layout: fixed;">
 					<tr>
 							<th>项目编码：&nbsp;</th>
-							<td colspan="3">
+							<td>
 								${record.xmbm }
 							</td>
-						</tr>
-						<tr>
+						
 							<th>项目名称：&nbsp;</th>
-							<td colspan="3" >
+							<td>
 								${record.xmmc }
 							</td>
 						</tr>
 						<tr>
-							<th>所属单位：&nbsp;</th>
+							 <th>项目概况：&nbsp;</th>
 							<td colspan="3" >
+								${record.xmgk }
+							</td>
+						</tr>
+						<tr>
+							 <th>建设规模：&nbsp;</th>
+							<td colspan="3">
+								${record.jsgm }
+							</td>
+						</tr>
+						<tr>
+							<th>项目法人：&nbsp;</th>
+							<td >
+								${record.xmfr }
+							</td>
+							<th>建设单位：&nbsp;</th>
+							<td>
 								${jyr.gkjyr }
 							</td>
 						</tr>
 						<tr>
+							 <th>行政区划：&nbsp;</th>
+							<td>
+								${xzqhname}
+							</td>
 						    <th>所在地：&nbsp;</th>
 							<td >
 								${record.szddzw }
 							</td>
+							
+						</tr>
+						<tr>
 							<th>所在港口：&nbsp;</th>
 							<td>
 								${record.szgkzw }
 							</td>
-						</tr>
-						<tr>
 						    <th>所在港区：&nbsp;</th>
 							<td >
 								${record.szgqzw }
 							</td>
-							<th>项目法人：&nbsp;</th>
-							<td >
-								${record.xmfr }
-							</td>
 						</tr>
 						<tr>
 						    <th>项目类型：&nbsp;</th>
@@ -138,32 +154,44 @@
 							</td>
 						</tr>
 						<tr>
-						    <th>建设规模：&nbsp;</th>
-							<td >
-								${record.jsgm }
+						   <th>总投资 （万元）：&nbsp;</th>
+							<td>
+								${record.ztz }
 							</td>
 							<th>投资类型：&nbsp;</th>
 							<td>
 								${record.tzlxzw }
 							</td>
 						</tr>
+						
+						<tr id="zftzDiv" style="display:none">
+						    <th>政府投资（万元）：&nbsp;</th>
+							<td >
+								${record.zftze }
+							</td>
+							<th>政府投资占比（%）：&nbsp;</th>
+							<td id="zftzTd"></td>
+						</tr>
 						<tr>
-					    	<th>总投资 （万元）：&nbsp;</th>
+					    	<th>建成时间：&nbsp;</th>
 							<td>
-								${record.ztz }
+								${fn:substring(record.jcsj,0,10)}
+							</td>
+							<th>泊位个数：&nbsp;</th>
+							<td>
+								${bwgs }
 							</td>
+						</tr>
+						<tr>
+					    	
 							<th>项目核准级别：&nbsp;</th>
 							<td>
 								${record.xmhzjbzw }
 							</td>
-						</tr>
-						<tr id="zftzDiv" style="display:none">
-						    <th>政府投资（万元）：&nbsp;</th>
+							<th>通过能力（万吨）：&nbsp;</th>
 							<td >
-								${record.zftze }
+								${record.tgnl }
 							</td>
-							<th>政府投资占比（%）：&nbsp;</th>
-							<td id="zftzTd"></td>
 						</tr>
 						<tr>
 						    <th>岸线审批级别：&nbsp;</th>
@@ -175,27 +203,13 @@
 								${record.axcd }
 							</td>
 						</tr>
-							<tr>
-							<th>通过能力（万吨）：&nbsp;</th>
-							<td >
-								${record.tgnl }
-							</td>
-					
-					    	<th>泊位用途：&nbsp;</th>
-                            <td >
-                             ${record.bwytzw }
-                            </td>
-                           
-                       </tr>
+						
                        <tr>
 							<th>水域类型：&nbsp;</th>
 							<td >
 								${record.sylxzw }
 							</td>
-						    <th>建成时间：&nbsp;</th>
-							<td>
-								${fn:substring(record.jcsj,0,10)}
-							</td>
+						   
 						</tr>
 						<tr>
                     <th>地市附件与专家评审附件：&nbsp;</th>

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

@@ -1746,64 +1746,67 @@
                     </c:if>
                     <c:if test="${sfjyr=='' }">
 					<c:if test="${flag=='audit' }">
-						<c:if test="${record.flowstatus == '1' || record.flowstatus == '3'  }">
-								<c:if test="${sfjyr!=1 }">	            
-								<a id="tuihuibt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.audit('N','${record.id}')">
-									   <i class="glyphicon glyphicon-ban-circle"></i> 
-									            退回</a>
-							</c:if>
-							
-							
-						</c:if>
-					<c:if test="${ (spflag =='3' && record.flowstatus == '2') || (spflag =='8' && record.flowstatus == '4') }">
-						<a id="auditbt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.audit('Y','${record.id}')">
-							   <i class="glyphicon glyphicon-ok-sign"></i> 
-							            同意</a>
-						<c:if test="${sfjyr!=1 }">	            
-						<a id="tuihuibt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.audit('N','${record.id}')">
-							   <i class="glyphicon glyphicon-ban-circle"></i> 
-							           退回</a>
-					</c:if>
-					</c:if> 
-					
-					
-					
-					<c:if test="${record.flowstatus == '' || record.flowstatus == null }">
-							<c:if test="${ (spflag =='3') }">
+						<c:if test="${ spflag !='3' && spflag !='8'  }">
 							<a id="auditbt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.audit('Y','${record.id}')">
 							   <i class="glyphicon glyphicon-ok-sign"></i> 
 							            同意</a>
-					
-						
-						
-							<a id="auditbt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.saveTbzt('${record.id}')">
-							   <i class="glyphicon glyphicon-ok-sign"></i> 
-							    转报省级</a>
-								
-						
-						
-						
 							<c:if test="${sfjyr!=1 }">	            
 							<a id="tuihuibt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.audit('N','${record.id}')">
-							   <i class="glyphicon glyphicon-ban-circle"></i> 
-							          退回</a>
-							          </c:if>
+								   <i class="glyphicon glyphicon-ban-circle"></i> 
+								           退回</a>
+							</c:if>
+						</c:if>
+						
+						<c:if test="${ spflag =='3' }">
+								<c:if test="${record.flowstatus == '1'  }">
+									<c:if test="${sfjyr!=1 }">	            
+									<a id="tuihuibt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.audit('N','${record.id}')">
+									   <i class="glyphicon glyphicon-ban-circle"></i> 
+									            退回</a>
+									</c:if>
+								</c:if>
+								<c:if test="${record.flowstatus == '2' || record.flowstatus == '' || record.flowstatus == null }">
+										<a id="auditbt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.audit('Y','${record.id}')">
+											   <i class="glyphicon glyphicon-ok-sign"></i> 
+											            同意</a>
+										<c:if test="${record.flowstatus == '' || record.flowstatus == null }">	            
+											      <a id="auditbt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.saveTbzt('${record.id}')">
+												   <i class="glyphicon glyphicon-ok-sign"></i> 
+												    转报省级</a>      
+										</c:if>            
+										<c:if test="${sfjyr!=1 }">	            
+										<a id="tuihuibt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.audit('N','${record.id}')">
+											   <i class="glyphicon glyphicon-ban-circle"></i> 
+											           退回</a>
+								
+										</c:if>
+								</c:if>
 					</c:if>
-					</c:if>	
 					
-					<c:if test="${  spflag == '8' && (record.flowstatus == 2 || record.flowstatus == '' || record.flowstatus == null )}">
-						<a id="auditbt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.audit('Y','${record.id}')">
-							   <i class="glyphicon glyphicon-ok-sign"></i> 
-							            同意</a>
-							<a id="auditbt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.saveTbzt('${record.id}')">
-							   <i class="glyphicon glyphicon-ok-sign"></i> 
-							    转报省级</a>
-						
-							<c:if test="${sfjyr!=1 }">	            
-							<a id="tuihuibt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.audit('N','${record.id}')">
+					<c:if test="${ spflag =='8' }">
+								<c:if test="${record.flowstatus == '3'  }">
+									<c:if test="${sfjyr!=1 }">	            
+									<a id="tuihuibt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.audit('N','${record.id}')">
 									   <i class="glyphicon glyphicon-ban-circle"></i> 
-									         退回</a>
-							</c:if>
+									            退回</a>
+									</c:if>
+								</c:if>
+								<c:if test="${ record.flowstatus == '2'  || record.flowstatus == '4'  || record.flowstatus == '' || record.flowstatus == null }">
+										<a id="auditbt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.audit('Y','${record.id}')">
+											   <i class="glyphicon glyphicon-ok-sign"></i> 
+											            同意</a>
+										<c:if test="${ record.flowstatus == '2'  || record.flowstatus == '' || record.flowstatus == null }">	            
+											      <a id="auditbt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.saveTbzt('${record.id}')">
+												   <i class="glyphicon glyphicon-ok-sign"></i> 
+												    转报省级</a>      
+										</c:if>            
+										<c:if test="${sfjyr!=1 }">	            
+										<a id="tuihuibt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.audit('N','${record.id}')">
+											   <i class="glyphicon glyphicon-ban-circle"></i> 
+											           退回</a>
+								
+										</c:if>
+								</c:if>
 					</c:if>
 					</c:if>
 					</c:if>

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

@@ -46,6 +46,8 @@ import com.xt.jygl.gkjsgl.jgsq.vo.JgsqfjVo;
 import com.xt.jygl.gkjsgl.jsjdgl.vo.JsjdfjVo;
 import com.xt.jygl.gkjsgl.tzjhgl.entity.TzjhglEntity;
 import com.xt.jygl.gkjsgl.tzjhgl.service.TzjhglService;
+import com.xt.jygl.gkjsgl.xmxxgl.entity.XmbwglbEntity;
+import com.xt.jygl.gkjsgl.xmxxgl.service.XmbwglbService;
 import com.xt.jygl.gkjsgl.xmxxgl.vo.XmxxglVo;
 import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.GkjyrEntity;
 import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.service.GkjyrService;
@@ -84,7 +86,9 @@ public class JgsqCtl extends BaseWebCtl {
 	private GkService gkService;
 	@Autowired
 	private JgsqfjService jgsqfjService;
-
+	@Autowired
+	private XmbwglbService xmbwglbService;
+	
 	@RequestMapping(value = "/main")
 	@RequiresPermissions("jgsq: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 {
@@ -747,7 +751,20 @@ public class JgsqCtl extends BaseWebCtl {
 		vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
 		vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
 		vo.setZyhbwfl(entity.getZyhbwfl() != null ? entity.getZyhbwfl().getId() : "");
-
+		if (StringUtils.isNotEmpty(entity.getXmbm())) {
+			String codeid = entity.getXmbm().substring(4, 10);
+			CodeEntity code = securityMgr.codeService().findOne(codeid);
+			model.addAttribute("xzqhname", code.getText());
+		}
+		String bwids = "";
+		List<XmbwglbEntity> bwlist = xmbwglbService.findByXmid(entity.getId());
+		if (bwlist != null && bwlist.size() > 0) {
+			model.addAttribute("bwgs", bwlist.size());
+			for (XmbwglbEntity xmbw : bwlist) {
+				bwids = bwids + xmbw.getBwid() + ",";
+			}
+			bwids = bwids.substring(0, bwids.length() - 1);
+		}
 		// 附件
 		List<AccessoryEntity> accessoryList = accessoryService.queryBySsidAndSstype(id, "jsjd");
 		for (int i = 0; i < accessoryList.size(); i++) {
@@ -882,7 +899,20 @@ public class JgsqCtl extends BaseWebCtl {
 		vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
 		vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
 		vo.setZyhbwfl(entity.getZyhbwfl() != null ? entity.getZyhbwfl().getId() : "");
-
+		if (StringUtils.isNotEmpty(entity.getXmbm())) {
+			String codeid = entity.getXmbm().substring(4, 10);
+			CodeEntity code = securityMgr.codeService().findOne(codeid);
+			model.addAttribute("xzqhname", code.getText());
+		}
+		String bwids = "";
+		List<XmbwglbEntity> bwlist = xmbwglbService.findByXmid(entity.getId());
+		if (bwlist != null && bwlist.size() > 0) {
+			model.addAttribute("bwgs", bwlist.size());
+			for (XmbwglbEntity xmbw : bwlist) {
+				bwids = bwids + xmbw.getBwid() + ",";
+			}
+			bwids = bwids.substring(0, bwids.length() - 1);
+		}
 		// 附件
 		List<AccessoryEntity> accessoryList = accessoryService.queryBySsidAndSstype(id, "jsjd");
 		for (int i = 0; i < accessoryList.size(); i++) {

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/entity/JgsqEntity.java

@@ -54,7 +54,16 @@ public class JgsqEntity extends BaseEntity<String> implements Cloneable {
 	private String zftze;/* 政府投资额 */
 	private CodeEntity sylx;/* 水域类型 */
 	private Date jcsj; /* 建成时间 */
+	private String xmgk;
 	
+	public String getXmgk() {
+		return xmgk;
+	}
+
+	public void setXmgk(String xmgk) {
+		this.xmgk = xmgk;
+	}
+
 	@Id
 	@GenericGenerator(name = "systemUUID", strategy = "uuid")
 	@GeneratedValue(generator = "systemUUID")

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/vo/JgsqVo.java

@@ -67,7 +67,15 @@ public class JgsqVo extends BaseVo {
 	private String sylxzw;
 	private String sftb;
 	private String tbzt;
+	private String xmgk;
 	
+	public String getXmgk() {
+		return xmgk;
+	}
+
+	public void setXmgk(String xmgk) {
+		this.xmgk = xmgk;
+	}
 	public String getSftb() {
 		return sftb;
 	}

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdgl/ctl/JsjdglCtl.java

@@ -349,18 +349,23 @@ public class JsjdglCtl extends BaseWebCtl {
 		WebJsonResult wr = success();
 		XmxxglEntity entity = xmxxglService.findOne(id);
 		entity.setSftb(Constants.YES);
+		xmxxglService.save(entity);
 		String url = "/GK_OPERATION_JSJY_JSJDCBSJ_ONE_CP?condition=ID=" + id;
 		if ("2".equals(entity.getFlowstatus())) {
 			url = "/GK_OPERATION_JSJY_JGSQ_ONE_CP?condition=ID=" + id;
 		}
-		entity.setFlowstatus("0");
-		xmxxglService.save(entity);
+		
+		
 		boolean flag = getTbStatus(url);
 		if (flag) {
 			entity.setFlowstatus("0");
 			entity.setTbzt(Constants.YES);
 			xmxxglService.save(entity);
 		} else {
+			entity.setFlowstatus(null);
+			entity.setSftb(Constants.NO);
+			xmxxglService.save(entity);
+			
 			wr.setSuccess(false);
 			wr.setMessage("转报省级失败");
 		}

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhsq/ctl/LhsqCtl.java

@@ -527,6 +527,8 @@ public class LhsqCtl extends BaseWebCtl {
 			entity.setTbzt(Constants.YES);
 			lhsqService.save(entity);
 		} else {
+			entity.setSftb(Constants.NO);
+			lhsqService.save(entity);
 			wr.setSuccess(false);
 			wr.setMessage("提交失败");
 		}