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

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

@@ -17,15 +17,15 @@
 			jsjdgl.detail.init();
 			$("#scbt11").hide();
 			initSylxSelect('sylxsel', '${record.sylx }', '80%');
-			initXmlxSelect('xmlxsel','${record.xmlx.id }','80%');
-			initTzlxSelect('tzlxsel','${record.tzlx.id }','80%');
-			initXmhzjbSelect('xmhzjbsel','${record.xmhzjb.id }','80%');
-			initAxspjbSelect('axspjbsel','${record.axspjb.id }','80%');
-			xmxxgl.detail.initszdSelect('szdsel','${record.jyrid.szd.id }', 'showgk', '80%','disable');
-			xmxxgl.detail.initgkSelect('gksel','${record.jyrid.szgk.id }','${record.jyrid.szd.id }','showgq','80%','disable');
-			xmxxgl.detail.initgqSelect('gqsel','${record.jyrid.szgq.id }','${record.jyrid.szd.id }','${record.jyrid.szgk.id }',null,'80%','disable');
-			xmxxgl.detail.initBwyt('bwytsel', '');
-			xmxxgl.detail.initZyhbwfl('zyhbwflsel', '','');
+			initXmlxSelect('xmlxsel','${record.xmlx }','80%');
+			initTzlxSelect('tzlxsel','${record.tzlx}','80%');
+			initXmhzjbSelect('xmhzjbsel','${record.xmhzjb }','80%');
+			initAxspjbSelect('axspjbsel','${record.axspjb }','80%');
+			xmxxgl.detail.initszdSelect('szdsel','${jyr.szd.id }', 'showgk', '80%','disable');
+			xmxxgl.detail.initgkSelect('gksel','${jyr.szgk.id }','${jyr.szd.id }','showgq','80%','disable');
+			xmxxgl.detail.initgqSelect('gqsel','${jyr.szgq.id }','${jyr.szd.id }','${jyr.szgk.id }',null,'80%','disable');
+			xmxxgl.detail.initBwyt('bwytsel', '${record.bwyt }');
+			xmxxgl.detail.initZyhbwfl('zyhbwflsel', '${record.zyhbwfl }','${record.bwyt }');
 			$('.close').click(function(){
 				guanbi();
 			});
@@ -46,12 +46,12 @@
 		});
 		
 		function showgk(){
-			initgkSelect('gksel','${record.jyrid.szgk.id }',$('.szdselectpicker').val(),"showgq",'80%');
+			initgkSelect('gksel','${jyr.szgk.id }',$('.szdselectpicker').val(),"showgq",'80%');
 			showgq();
 		}
 
 		function showgq(){
-			initgqSelect('gqsel','${record.jyrid.szgq.id }',$('.szdselectpicker').val(),$('.gkselectpicker').val(),null,'80%');
+			initgqSelect('gqsel','${jyr.szgq.id }',$('.szdselectpicker').val(),$('.gkselectpicker').val(),null,'80%');
 		}
 		
 		
@@ -95,8 +95,8 @@ text-align:center;
 						<tr>
 							<th>所属单位：&nbsp;</th>
 							<td colspan="3" >
-								<input type="hidden"  class="form-control" id="ssjyrid" name="ssjyrid" value="${record.jyrid.id}">
-								<input type="text" style="width: 92.5%;" readonly class="form-control" id="jyrmc" value="${record.jyrid.gkjyr }">
+								<input type="hidden"  class="form-control" id="ssjyrid" name="ssjyrid" value="${jyr.id}">
+								<input type="text" style="width: 92.5%;" readonly class="form-control" id="jyrmc" value="${jyr.gkjyr }">
 							</td>
 						</tr>
 						
@@ -162,27 +162,33 @@ text-align:center;
 						</tr>
 						<tr>
 					    	<th>岸线审批级别：&nbsp;</th>
-							<td >
-								<div id="axspjbsel"></div>
+							<td>
+								<span id="axspjbsel">
+								</span>
 							</td>
-							<th>岸线长度（米）：&nbsp;</th>
+							<th>岸线长度 （米）：&nbsp;</th>
 							<td >
-								<input type="text" class="form-control" value="${record.axcd }" name="axcd">
+								<input type="text" class="form-control" name="axcd" value="${record.axcd }">
 							</td>
 						</tr>
 						<tr>
-					    	
-							<th>通过能力（万吨）：&nbsp;</th>
+					    	<%-- <th>泊位吨级（吨）：&nbsp;</th>
 							<td>
-								<input type="text" class="form-control" name="tgnl">
+								<input type="text" class="form-control" name="bwdj" value="${record.bwdj }">
+							</td> --%>
+							<th><span class="needwrite">*</span>通过能力（万吨）：&nbsp;</th>
+							<td colspan="1">
+								<input type="text" class="form-control" name="tgnl" value="${record.tgnl }">
 							</td>
+						<!-- </tr>
 						
+						<tr> -->
 					 	    <th>泊位用途：&nbsp;</th>
                         <td>
 	                        <span id="bwytsel"></span>
                         </td>
                        
-                        <!-- <th>专业化泊位分类：&nbsp;</th>
+                      <!--   <th>专业化泊位分类：&nbsp;</th>
                         <td>
 	                        <span id="zyhbwflsel"></span>
                         </td> -->
@@ -194,29 +200,38 @@ text-align:center;
 							</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'})">
+							<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>码头前沿位置_上端点X：&nbsp;</th>
+						<!-- <tr>
+						    <th>泊位个数：&nbsp;</th>
+							<td>
+								<input type="text" class="form-control" name="bwgs" value="" readonly="readonly">
+							</td>
+							<th></th>
+							<td >
+							</td>
+						</tr> -->
+						<%-- <tr>
+						    <th>码头前沿位置_上端点X：&nbsp;</th>
 							<td>
-								<input type="text" class="form-control" name="sddx">
+								<input type="text" class="form-control" name="sddx" value="${record.sddx }">
 							</td>
 						    <th>码头前沿位置_上端点Y：&nbsp;</th>
 							<td>
-								<input type="text" class="form-control" name="sddy">
+								<input type="text" class="form-control" name="sddy" value="${record.sddy }">
 							</td>
 						</tr>
 						<tr>
 					    	<th>码头前沿位置_下端点X：&nbsp;</th>
 							<td>
-								<input type="text" class="form-control" name="xddx">
+								<input type="text" class="form-control" name="xddx" value="${record.xddx }">
 							</td>
 							<th>码头前沿位置_下端点Y：&nbsp;</th>
 							<td colspan="3">
-								<input type="text" class="form-control" name="xddy">
+								<input type="text" class="form-control" name="xddy" value="${record.xddy }">
 							</td>
-						</tr>
+						</tr> --%>
 					</table>
 <ul id="myTab" class="nav nav-tabs">
    <li class="active" style="width:12%;font-size:14px">

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

@@ -309,7 +309,7 @@
 							<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>
+						<%-- <tr>
 						    <th>码头前沿位置_上端点X：&nbsp;</th>
 							<td>
 								<input type="text" class="form-control" name="sddx" id="sddx" value="${record.sddx }">
@@ -328,7 +328,7 @@
 							<td colspan="3">
 								<input type="text" class="form-control" name="xddy" id="xddy" value="${record.xddy }">
 							</td>
-						</tr>
+						</tr> --%>
 					</table>
 					
 <ul id="myTab" class="nav nav-tabs">

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

@@ -48,6 +48,20 @@
 			$('.close').click(function(){
 				guanbi();
 			})
+			if('${record.tzlx }' == "1903") {
+				$("#zftzDiv").css("display","table-row");
+				var ztz = '${record.ztz}';
+				var zftze = '${record.zftze}';
+				if(isEmpty(ztz) || isEmpty(zftze)) {
+					return;
+				}
+				if(isFDS(ztz) && isFDS(zftze)) {
+					var rate = (zftze/ztz)*100;
+					$("#zftzTd").html(rate.toFixed(2));
+				}
+			} else {
+				$("#zftzDiv").css("display","none");
+			}
 		});
 		
 		function tanchu(){
@@ -138,56 +152,66 @@
 								<span id="xmhzjbzw">${record.xmhzjbzw }</span>
 							</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 >
-								<span id="axspjbzw">${record.axspjbzw }</span>
+								${record.axspjbzw }
 							</td>
-							<th>岸线长度（米）：&nbsp;</th>
+							<th>岸线长度 （米）：&nbsp;</th>
 							<td >
-								<span id="axcd">${record.axcd }</span>
+								${record.axcd }
 							</td>
 						</tr>
 						<tr>
-					    	<th>泊位吨级（吨）：&nbsp;</th>
-							<td >
-								<span id="bwdj">${record.bwdj }</span>
-							</td>
+						   
 							<th>通过能力（万吨）：&nbsp;</th>
-							<td colspan="3">
+							<td >
 								${record.tgnl }
 							</td>
-						</tr>
-						<tr>
+					
 					    	<th>泊位用途：</th>
                             <td>
                              ${record.bwytzw }
-                            </td>
-                           <%--  <th>专业化泊位分类：</th>
-                            <td>
-                             ${record.zyhbwflzw }
-                            </td>  --%>
                        </tr>
 						<tr>
+							<th>水域类型：&nbsp;</th>
+							<td >
+								${record.sylxzw }
+							</td>
+						    <th>建成时间：&nbsp;</th>
+							<td>
+								${fn:substring(record.jcsj,0,10)}
+							</td>
+						</tr>
+						<%-- <tr>
 					    	<th>码头前沿位置_上端点X：&nbsp;</th>
 							<td>
-								<span id=sddx>${record.sddx }</span>
+								${record.sddx }
 							</td>
 					    	<th>码头前沿位置_上端点Y：&nbsp;</th>
 							<td >
-								<span id="sddy">${record.sddy }</span>
+								${record.sddy }
 							</td>
 						</tr>
 						<tr>
-						    <th>码头前沿位置_下端点X：&nbsp;</th>
+					    	<th>码头前沿位置_下端点X：&nbsp;</th>
 							<td>
-								<span id="xddx">${record.xddx }</span>
+								${record.xddx }
 							</td>
 							<th>码头前沿位置_下端点Y：&nbsp;</th>
 							<td>
-								<span id="xddy">${record.xddy }</span>
+								${record.xddy }
 							</td>
-						</tr>
+						</tr> --%>
+				
 					</table>
 					
 <ul id="myTab" class="nav nav-tabs">
@@ -426,7 +450,7 @@
 								${recordfj32.fbsj }
 					</td>
 				</tr>
-				 <c:if test="${ record.flowstatus > 0  }">         
+				       
 					<tr>
 										<td>4</td>
 										<td>审查会议纪要</td>
@@ -497,7 +521,7 @@
 										<td><span id="fbsj38">${recordfj38.fbsj }</span></td>
 										
 									</tr>
-									</c:if>
+									
 				 <c:forEach items="${fjvolist3}" var="qtfj" varStatus="status">
 						<tr height="40px">
 							<td>${status.index+3 }</td>
@@ -944,26 +968,30 @@
 						<th width="10%">文号</th>
 						<th width="10%">批文时间</th>
 					</tr>
-				<tr height="40px">
+					<tr height="40px">
 				    <td>
 								1
 					</td>
 					 <td>
-								竣工资料汇编
+								港口建设项目竣工验收申请文件
 					</td>
 					<td>
-					            <input type="hidden" class="form-control" id="delid81" value="${fjList81.fjid }">
-					            <a class='main_title' href="#" onclick="jsjdgl.detail.download()">${fjList81.fjmc }</a>
+					            <input type="hidden" class="form-control" name="delid81" id="delid81" value="${fjList81.fjid }">
+					            <input type="hidden" class="form-control" id="fjzdid81">
+					            <a class='main_title' href="#" onclick="jsjdgl.detail.download('81')"><span id="fjmc81">${fjList81.fjmc }</span></a>
 					</td>
 					<td>
-								${recordfj81.fbdw }
+								<span id="fbdw81">${recordfj81.fbdw }</span>
 					</td>
 					<td>
-								${recordfj81.wjh }
+								<span id=wjh81>${recordfj81.wjh }</span>
 					</td>
 					<td>
-								${recordfj81.fbsj }
+								<span id="fbsj81">${recordfj81.fbsj }</span>
 					</td>
+					
+					        
+					
 				</tr>
 				
 				<tr height="40px">
@@ -971,21 +999,64 @@
 								2
 					</td>
 					 <td>
-								竣工验收证书(多个，新码头，老码头改造)
+								港口建设项目竣工验收材料
 					</td>
 					<td>
-					            <input type="hidden" class="form-control" id="delid82" value="${fjList82.fjid }">
-					            <a class='main_title' href="#" onclick="jsjdgl.detail.download()">${fjList82.fjmc }</a>
+					            <input type="hidden" class="form-control" name="delid82" id="delid82" value="${fjList82.fjid }">
+					            <input type="hidden" class="form-control" id="fjzdid82">
+					            <a class='main_title' href="#" onclick="jsjdgl.detail.download('82')"><span id="fjmc82">${fjList82.fjmc }</span></a>
 					</td>
 					<td>
-								${recordfj82.fbdw }
+								<span id="fbdw82">${recordfj82.fbdw }</span>
 					</td>
 					<td>
-								${recordfj82.wjh }
+								<span id="wjh82">${recordfj82.wjh }</span>
 					</td>
 					<td>
-								${recordfj82.fbsj }
+								<span id="fbsj82">${recordfj82.fbsj }</span>
 					</td>
+					
+					        
+					
+				</tr>
+				<tr>
+				<tr>
+					<td>3</td>
+					<td>竣工验收鉴定书</td>
+					<td><input type="hidden" class="form-control"
+						name="delid83" id="delid83" value="${fjList83.fjid }">
+						<input type="hidden" class="form-control" id="fjzdid83">
+						<a class='main_title' href="#"
+						onclick="jsjdgl.detail.download('83')"><span id="fjmc83">${fjList83.fjmc }</span></a>
+					</td>
+					<td><span id="fbdw83">${recordfj83.fbdw }</span></td>
+					<td><span id="wjh83">${recordfj83.wjh }</span></td>
+					<td><span id="fbsj83">${recordfj83.fbsj }</span></td>
+				</tr>
+					<td>4</td>
+					<td>专家审查意见</td>
+					<td><input type="hidden" class="form-control"
+						name="delid84" id="delid84" value="${fjList84.fjid }">
+						<input type="hidden" class="form-control" id="fjzdid84">
+						<a class='main_title' href="#"
+						onclick="jsjdgl.detail.download('84')"><span id="fjmc84">${fjList84.fjmc }</span></a>
+					</td>
+					<td><span id="fbdw84">${recordfj84.fbdw }</span></td>
+					<td><span id="wjh84">${recordfj84.wjh }</span></td>
+					<td><span id="fbsj84">${recordfj84.fbsj }</span></td>
+				</tr>
+				<tr>
+					<td>5</td>
+					<td>对验收意见的答复</td>
+					<td><input type="hidden" class="form-control"
+						name="delid85" id="delid85" value="${fjList85.fjid }">
+						<input type="hidden" class="form-control" id="fjzdid85">
+						<a class='main_title' href="#"
+						onclick="jsjdgl.detail.download('85')"><span id="fjmc85">${fjList85.fjmc }</span></a>
+					</td>
+					<td><span id="fbdw85">${recordfj85.fbdw }</span></td>
+					<td><span id="wjh85">${recordfj85.wjh }</span></td>
+					<td><span id="fbsj85">${recordfj85.fbsj }</span></td>
 				</tr>
 				<c:forEach items="${fjvolist8}" var="qtfj" varStatus="status">
 						<tr height="40px">

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

@@ -209,7 +209,7 @@ text-align:center;
 							<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>
+						<%-- <tr>
 						    <th>码头前沿位置_上端点X：&nbsp;</th>
 							<td>
 								<input type="text" class="form-control" name="sddx" value="${record.sddx }">
@@ -228,7 +228,7 @@ text-align:center;
 							<td>
 								<input type="text" class="form-control" name="xddy" value="${record.xddy }">
 							</td>
-						</tr>
+						</tr> --%>
 					</table>
 <ul id="myTab" class="nav nav-tabs">
    <li class="active" style="width:12%;font-size:14px">
@@ -261,7 +261,7 @@ text-align:center;
 					            <input type="hidden" class="form-control" id="delid11" name="delid11" value="${fjList11.fjid }">
 					            <input type="hidden" class="form-control" id="fjzdid11" value="${recordfj11.id }">
 					            <input type="hidden" class="form-control" id="flag" value="11">
-					            <a class='main_title' href="#" onclick="jsjdgl.detail.download()"><span id="fjmc11">${fjList11.fjmc }</span></a>
+					            <a class='main_title' href="#" onclick="jsjdgl.detail.download('11')"><span id="fjmc11">${fjList11.fjmc }</span></a>
 					</td>
 					<td>
 								<span id="fbdw11">${recordfj11.fbdw }</span>

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

@@ -18,11 +18,33 @@
 				xmxxgl.detail.szd ='${jyr.szd.id}';
 				xmxxgl.detail.gq ='${jyr.szgq.id}';
 				xmxxgl.detail.gk ='${jyr.szgk.id}';
+				if(!isEmpty(xmxxgl.detail.gk)){
+				    $.post($.app+"/xmxxgl/selectXzqh?pid="+'${jyr.szgk.xzqh}',{
+					},function(data) {
+						 var str = "";
+						 str+="<select class='xzqhselectpicker' id='xzqh' onchange='checkxzqh()' >";
+						 str+="<option></option>";
+						 if(data){
+							for(var i=0;i<data.length;i++){
+								var select = data[i];
+								str+=" <option value='"+select.id+"' >"+select.text+"</option>";
+							}
+							str+="</select>";
+							$("#xzqhsel").empty();
+							$("#xzqhsel").append(str);
+							
+							$('.xzqhselectpicker').selectpicker({
+								width:'80%'
+							});
+						}
+						}, "json");
+				}
 			}else{
 				xmxxgl.detail.szd ='${sz}';
 				xmxxgl.detail.gk ='${gk}';
 				
 			}
+			
 			//项目类型默认新建
 				initXmlxSelect('xmlxsel','2201','80%');
 			//投资类型默认企业投资
@@ -41,6 +63,22 @@
 			}) */
 		});
 		
+		function checkxzqh(){
+		    $.ajax({
+		         url:$.app+"/xmxxgl/getXmbh",
+		         data:{xzqh:$('#xzqh').val()},
+		         type:"post",
+		         dataType:"json",
+		         success:function(data){//ajax返回的数据
+			           if (data.success) {
+			               $('#xmbm').val(data.attrs.xmbm);
+			           }else {
+				           
+			           }
+			     }
+		    }); 
+		}
+		
 		function showgk(){
 			initgkSelect('gksel',xmxxgl.detail.gk,$('.szdselectpicker').val(),"showgq",'80%');
 			showgq();
@@ -83,9 +121,14 @@
  <input type="hidden" class="form-control"  name="fjids" id="fjids">
 					<table class="apply" cellpadding="0" cellspacing="0">
 						<tr>
+						    <th><span class="needwrite">*</span>行政区划：&nbsp;</th>
+							<td >
+								<div id="xzqhsel"></div>
+							</td>
+						
 							<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"  readonly="readonly" class="form-control" id="xmbm" name="xmbm">
 							</td>
 						</tr>
 						<tr>
@@ -209,7 +252,7 @@
 							<input type="text" class="Wdate" name="jcsj" value="${jcsj }" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd'})">
 							</td>
 						</tr>
-						<tr>
+						<!-- <tr>
 						    <th>码头前沿位置_上端点X：&nbsp;</th>
 							<td>
 								<input type="text" class="form-control" name="sddx">
@@ -228,7 +271,7 @@
 							<td colspan="3">
 								<input type="text" class="form-control" name="xddy">
 							</td>
-						</tr>
+						</tr> -->
 					</table>
 				
 					<div  id="buttons">

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

@@ -1045,7 +1045,52 @@ public class JsjdglCtl extends BaseWebCtl {
 
 	@RequestMapping(value = "/choose")
 	public String choose(Model model, String id) {
-		model.addAttribute("record", xmxxglService.findOne(id));
+		XmxxglEntity entity = xmxxglService.findOne(id);
+		XmxxglVo vo = new XmxxglVo();
+		BeanUtils.copyProperties(entity, vo);
+		vo.setTzlxzw(entity.getTzlx() != null ? entity.getTzlx().getText() : "");
+		vo.setXmlxzw(entity.getXmlx() != null ? entity.getXmlx().getText() : "");
+		vo.setXmhzjbzw(entity.getXmhzjb() != null ? entity.getXmhzjb().getText() : "");
+		vo.setAxspjbzw(entity.getAxspjb() != null ? entity.getAxspjb().getText() : "");
+		vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
+		vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
+		vo.setZyhbwflzw(entity.getZyhbwfl() != null ? entity.getZyhbwfl().getText() : "");
+
+		vo.setSylxzw(entity.getSylx() != null ? entity.getSylx().getText() : "");
+		vo.setSylx(entity.getSylx() != null ? entity.getSylx().getId() : "");
+		// if (entity.getJyrid() != null) {
+		// vo.setSzddzw(entity.getJyrid().getSzd() != null ?
+		// entity.getJyrid().getSzd().getText() : "");
+		// }
+		vo.setSzddzw(entity.getSzd() != null ? entity.getSzd().getText() : "");
+		if (entity.getBwyt() != null) {
+			String bwytzw = "";
+			String[] s = entity.getBwyt().split(",");
+			/*
+			 * for (String string : s) { bwytzw +=
+			 * securityMgr.codeService().findOne(string).getText() + " "; }
+			 */
+			for (int i = 0; i < s.length; i++) {
+				CodeEntity code = securityMgr.codeService().findOne(s[i]);
+				if (code != null) {
+					bwytzw += code.getText() + ",";
+				}
+			}
+			if (!StringUtils.isEmpty(bwytzw)) {
+				bwytzw = bwytzw.substring(0, bwytzw.length() - 1);
+			}
+			vo.setBwytzw(bwytzw);
+		}
+
+		vo.setTzlx(entity.getTzlx() != null ? entity.getTzlx().getId() : "");
+		vo.setXmlx(entity.getXmlx() != null ? entity.getXmlx().getId() : "");
+		vo.setXmhzjb(entity.getXmhzjb() != null ? entity.getXmhzjb().getId() : "");
+		vo.setAxspjb(entity.getAxspjb() != null ? entity.getAxspjb().getId() : "");
+		vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
+		vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
+		vo.setZyhbwfl(entity.getZyhbwfl() != null ? entity.getZyhbwfl().getId() : "");
+		model.addAttribute("record", vo);
+		model.addAttribute("jyr", entity.getJyrid());
 		return "gkjsgl/jsjdgl/jsjdgladd";
 	}
 
@@ -1653,7 +1698,7 @@ public class JsjdglCtl extends BaseWebCtl {
 	@RequestMapping(value = "/xiugai")
 	public String xiugai(Model model, String id) {
 		// 附件
-		List<AccessoryEntity> accessoryList = accessoryService.queryBySsidAndSstype(id, "jdjd");
+		List<AccessoryEntity> accessoryList = accessoryService.queryBySsidAndSstype(id, "jsjd");
 		List<AccessoryEntity> qtfjlist = accessoryService.queryBySsidAndSstype(id, "jsjdqtfj");
 		qtfjgtview(model, qtfjlist, "1");
 		for (int i = 0; i < accessoryList.size(); i++) {

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/xmxxgl/ctl/XmxxglCtl.java

@@ -538,7 +538,7 @@ public class XmxxglCtl extends BaseWebCtl {
 		vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
 		vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
 		vo.setSylxzw(entity.getSylx() != null ? entity.getSylx().getText() : "");
-
+		vo.setSylx(entity.getSylx() != null ? entity.getSylx().getId() : "");
 		vo.setTzlx(entity.getTzlx() != null ? entity.getTzlx().getId() : "");
 		vo.setXmlx(entity.getXmlx() != null ? entity.getXmlx().getId() : "");
 		vo.setXmhzjb(entity.getXmhzjb() != null ? entity.getXmhzjb().getId() : "");
@@ -547,7 +547,7 @@ public class XmxxglCtl 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() : "");
-		vo.setSylx(entity.getSylx() != null ? entity.getSylx().getId() : "");
+		
 		model.addAttribute("record", vo);
 		model.addAttribute("jyr", entity.getJyrid());
 		return "gkjsgl/xmxxgl/xmxxgledit";
@@ -571,9 +571,10 @@ public class XmxxglCtl extends BaseWebCtl {
 		vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
 		vo.setZyhbwflzw(entity.getZyhbwfl() != null ? entity.getZyhbwfl().getText() : "");
 		vo.setSylxzw(entity.getSylx() != null ? entity.getSylx().getText() : "");
-//		if (entity.getJyrid() != null) {
-//			vo.setSzddzw(entity.getJyrid().getSzd() != null ? entity.getJyrid().getSzd().getText() : "");
-//		}
+		// if (entity.getJyrid() != null) {
+		// vo.setSzddzw(entity.getJyrid().getSzd() != null ?
+		// entity.getJyrid().getSzd().getText() : "");
+		// }
 		vo.setSzddzw(entity.getSzd() != null ? entity.getSzd().getText() : "");
 		if (entity.getBwyt() != null) {
 			String bwytzw = "";
@@ -620,7 +621,7 @@ public class XmxxglCtl extends BaseWebCtl {
 		SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd");
 		Date today = new Date();
 		model.addAttribute("jcsj", dateTimeFormat.format(today));
-		
+
 		if (SecUtils.getCurrUser() != null) {
 			List<CodeEntity> list = securityMgr.codeService().findValidCodesByGroupCodeAndCity(Constants.GROUP_CODE_SZD, GlobalData.CITY_CODE);
 			model.addAttribute("sz", list.size() == 1 ? list.get(0).getId() : "");
@@ -667,4 +668,27 @@ public class XmxxglCtl extends BaseWebCtl {
 		return list;
 	}
 
+	@RequestMapping(value = "/selectXzqh")
+	@ResponseBody
+	public List<CodeEntity> selectXzqh(Model model, String pid) {
+		List<CodeEntity> list = securityMgr.codeService().findByPid(pid);
+		return list;
+	}
+
+	@RequestMapping(value = "/getXmbh")
+	@ResponseBody
+	public WebJsonResult getXmbh(Model model, String xzqh) {
+		WebJsonResult wr = new WebJsonResult();
+		String xmbm = "";
+		try {
+			SimpleDateFormat data = new SimpleDateFormat("yyyy");
+			String nf = data.format(new Date());
+			String bh = xmxxglService.getxmbm();
+			xmbm = nf + xzqh + "GK" + bh;
+			wr.setAttr("xmbm", xmbm);
+		} catch (Exception e) {
+			wr.setSuccess(false);
+		}
+		return wr;
+	}
 }

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/xmxxgl/dao/XmxxglDao.java

@@ -1,8 +1,12 @@
 package com.xt.jygl.gkjsgl.xmxxgl.dao;
 
+import org.springframework.data.jpa.repository.Query;
+
 import com.xt.jygl.gkjsgl.xmxxgl.entity.XmxxglEntity;
 import com.xtframe.sec.common.SecRepository;
 
 public interface XmxxglDao extends SecRepository<XmxxglEntity, String> {
 
+	@Query(value = "select lpad(to_number(nvl(substr(max(xmbm),13,16),'0000'))+1,4,'0') from GK_BASIC_JSJY_GKJS_XMXXGL where substr(xmbm,0,4) = (to_char(to_date(sysdate),'yyyy'))", nativeQuery = true)
+	String getXmbm();
 }

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/xmxxgl/service/XmxxglService.java

@@ -17,4 +17,5 @@ public interface XmxxglService extends BaseWorkFlowService {
 
 	public boolean changeAudit(String shyj, XmxxglEntity xmxx, boolean flag);
 	
+	String getxmbm();
 }

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/xmxxgl/service/impl/XmxxglServiceImpl.java

@@ -1,6 +1,5 @@
 package com.xt.jygl.gkjsgl.xmxxgl.service.impl;
 
-import java.net.URL;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -120,4 +119,10 @@ public class XmxxglServiceImpl extends BaseWorkFlowServiceImpl<XmxxglEntity, Str
 	}
 
 
+	@Override
+	public String getxmbm() {
+		return dao.getXmbm();
+	}
+
+
 }