فهرست منبع

项目信息管理问题修改

git-svn-id: https://192.168.57.71/svn/jsgkj@219 931142cf-59ea-a443-aa0e-51397b428577
ld_guxl 9 سال پیش
والد
کامیت
5f0012fb4b

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

@@ -27,6 +27,8 @@
 				initXmlxSelect('xmlxsel','2201','80%');
 			//投资类型默认企业投资
 				initTzlxSelect('tzlxsel','1902','80%');
+			//水域类型
+				initSylxSelect('sylxsel','1902','80%');
 				initXmhzjbSelect('xmhzjbsel','','80%');
 				initAxspjbSelect('axspjbsel','','80%');
 				xmxxgl.detail.initBwyt('bwytsel', '');
@@ -81,6 +83,12 @@
  <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 colspan="4">
+								<input type="text" style="width: 92.5%;" class="form-control" name="xmbm">
+							</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">
@@ -124,7 +132,7 @@
 							<td >
 								<div id="xmlxsel"></div>
 							</td>
-							<th><span class="needwrite">*</span>建设地:&nbsp;</th>
+							<th><span class="needwrite">*</span>建设地:&nbsp;</th>
 							<td >
 								<input type="text" class="form-control" name="jsdd">
 							</td>
@@ -142,13 +150,23 @@
 						<tr>
 						    <th>总投资 (万元):&nbsp;</th>
 							<td>
-								<input type="text" class="form-control" name="ztz">
+								<input type="text" class="form-control" name="ztz" onchange="ratesub()">
 							</td>
      						<th>项目核准级别:&nbsp;</th>
 							<td>
 							   <div id="xmhzjbsel"></div>
 							</td>
 						</tr>
+						<tr id="zftzDiv" style="display:none">
+						    <th>政府投资(万元):&nbsp;</th>
+							<td >
+								<input type="text" class="form-control" name="zftze" onchange="ratesub()">
+							</td>
+							<th>政府投资占比(%):&nbsp;</th>
+							<td >
+								<input type="text" class="form-control" readonly="readonly" id="zftzezb">
+							</td>
+						</tr>
 						<tr>
 						    <th>岸线审批级别:&nbsp;</th>
 							<td >
@@ -160,17 +178,17 @@
 							</td>
 						</tr>
 						<tr>
-						    <th>泊位吨级 (吨):&nbsp;</th>
+						    <!-- <th>泊位吨级 (吨):&nbsp;</th>
 							<td >
 								<input type="text" class="form-control" name="bwdj">
-							</td>
-							<th>通过能力(万吨):&nbsp;</th>
-							<td colspan="3">
+							</td> -->
+							<th><span class="needwrite">*</span>通过能力(万吨):&nbsp;</th>
+							<td>
 								<input type="text" class="form-control" name="tgnl">
 							</td>
-						</tr>
+						<!-- </tr>
 						
-						<tr>
+						<tr> -->
 					 	    <th>泊位用途:&nbsp;</th>
                         <td>
 	                        <span id="bwytsel"></span>
@@ -182,6 +200,16 @@
                         </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>
+						<tr>
 						    <th>码头前沿位置_上端点X:&nbsp;</th>
 							<td>
 								<input type="text" class="form-control" name="sddx">

+ 50 - 9
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/xmxxgl/xmxxgledit.jsp

@@ -13,14 +13,19 @@
 	<script type="text/javascript">
 		$(document).ready(function () {
 			xmxxgl.detail.init();
-			var id = '${jyr.id}';
+			var id = '${record.szd }';
 			if(!isEmpty(id)){
+				xmxxgl.detail.szd ='${record.szd}';
+				xmxxgl.detail.gq ='${record.szgq}';
+				xmxxgl.detail.gk ='${record.szgk}';
+			} else {
 				xmxxgl.detail.szd ='${jyr.szd.id}';
-				xmxxgl.detail.gq ='${jyr.szgq.id}'
-				xmxxgl.detail.gk ='${jyr.szgk.id}'
+				xmxxgl.detail.gq ='${jyr.szgq.id}';
+				xmxxgl.detail.gk ='${jyr.szgk.id}';
 			}
 			initXmlxSelect('xmlxsel', '${record.xmlx }', '80%');
 			initTzlxSelect('tzlxsel', '${record.tzlx }', '80%');
+			initSylxSelect('sylxsel', '${record.sylx }', '80%');
 			initXmhzjbSelect('xmhzjbsel', '${record.xmhzjb }', '80%');
 			initAxspjbSelect('axspjbsel', '${record.axspjb }', '80%');
 			initszdSelect('szdsel', xmxxgl.detail.szd, 'showgk', '80%');
@@ -28,6 +33,7 @@
 			initgqSelect('gqsel',xmxxgl.detail.gq,xmxxgl.detail.szd,xmxxgl.detail.gk,null,'80%');
 			xmxxgl.detail.initBwyt('bwytsel', '${record.bwyt }');
 			xmxxgl.detail.initZyhbwfl('zyhbwflsel', '${record.zyhbwfl }','${record.bwyt }');
+			
 		});
 		function jyrSel(jyrid){
 			guanbipop();
@@ -76,6 +82,12 @@
  <input type="hidden" name="fjids" id="fjids">	
 					<table class="apply" 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" value="${record.xmbm }">
+							</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" value="${record.xmmc }">
@@ -123,7 +135,7 @@
 								<span id="xmlxsel">
 								</span>
 							</td>
-							<th><span class="needwrite">*</span>建设地:&nbsp;</th>
+							<th><span class="needwrite">*</span>建设地:&nbsp;</th>
 							<td >
 								<input type="text" class="form-control" name="jsdd" value="${record.jsdd }">
 							</td>
@@ -150,6 +162,16 @@
 								</span>
 							</td>
 						</tr>
+						<tr id="zftzDiv" style="display:none">
+						    <th>政府投资(万元):&nbsp;</th>
+							<td >
+								<input type="text" class="form-control" name="zftze" value="${record.zftze }" onchange="ratesub()">
+							</td>
+							<th>政府投资占比(%):&nbsp;</th>
+							<td >
+								<input type="text" class="form-control" readonly="readonly" id="zftzezb">
+							</td>
+						</tr>
 						<tr>
 					    	<th>岸线审批级别:&nbsp;</th>
 							<td>
@@ -162,17 +184,17 @@
 							</td>
 						</tr>
 						<tr>
-					    	<th>泊位吨级(吨):&nbsp;</th>
+					    	<%-- <th>泊位吨级(吨):&nbsp;</th>
 							<td>
 								<input type="text" class="form-control" name="bwdj" value="${record.bwdj }">
-							</td>
+							</td> --%>
 							<th>通过能力(万吨):&nbsp;</th>
-							<td colspan="3">
+							<td colspan="1">
 								<input type="text" class="form-control" name="tgnl" value="${record.tgnl }">
 							</td>
-						</tr>
+						<!-- </tr>
 						
-						<tr>
+						<tr> -->
 					 	    <th>泊位用途:&nbsp;</th>
                         <td>
 	                        <span id="bwytsel"></span>
@@ -184,6 +206,25 @@
                         </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>
+							<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" value="${record.sddx }">

+ 52 - 6
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/xmxxgl/xmxxglview.jsp

@@ -16,6 +16,21 @@
 			$('.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);
+				}
+			} else {
+				$("#zftzDiv").css("display","none");
+			}
 		});
 		
 		function tanchu(){
@@ -38,6 +53,12 @@
  <form  id="addform" method="post" enctype="multipart/form-data"> 		
 					<table class="apply" cellpadding="0" cellspacing="0">
 						<tr>
+							<th>项目编码:&nbsp;</th>
+							<td colspan="4" >
+								${record.xmbm }
+							</td>
+						</tr>
+						<tr>
 							<th>项目名称:&nbsp;</th>
 							<td colspan="4" >
 								${record.xmmc }
@@ -74,7 +95,7 @@
 							<td >
 								${record.xmlxzw }
 							</td>
-							<th>建设地:&nbsp;</th>
+							<th>建设地:&nbsp;</th>
 							<td >
 								${record.jsdd }
 							</td>
@@ -99,6 +120,14 @@
 								${record.xmhzjbzw }
 							</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>
 							<td >
@@ -110,17 +139,17 @@
 							</td>
 						</tr>
 						<tr>
-						    <th>泊位吨级 (吨):&nbsp;</th>
+						    <%-- <th>泊位吨级 (吨):&nbsp;</th>
 							<td >
 								${record.bwdj }
-							</td>
+							</td> --%>
 							<th>通过能力(万吨):&nbsp;</th>
-							<td colspan="3">
+							<td colspan="">
 								${record.tgnl }
 							</td>
-						</tr>
+						<!-- </tr>
 						
-						<tr>
+						<tr> -->
 					    	<th>泊位用途:</th>
                             <td>
                              ${record.bwytzw }
@@ -130,6 +159,23 @@
                              ${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>泊位个数:&nbsp;</th>
+							<td>
+							</td>
+							<th></th>
+							<td >
+							</td>
 						</tr>
 						<tr>
 					    	<th>码头前沿位置_上端点X:&nbsp;</th>

+ 58 - 2
gkjsjy/trunk/WebContent/static/biz/js/gkjsgl/xmxxgl/xmxxgldetail.js

@@ -25,6 +25,7 @@ xmxxgl.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(van($('#addform input[name=zftze]'),"政府投资额")==false){return false;}
 	 if(van($('#addform input[name=sddx]'),"码头前沿位置_上端点X")==false){return false;}
 	 if(van($('#addform input[name=sddy]'),"码头前沿位置_上端点Y")==false){return false;}
 	 if(van($('#addform input[name=xddx]'),"码头前沿位置_下端点X")==false){return false;}
@@ -60,6 +61,58 @@ xmxxgl.detail.save=function(){
 	 
 	
 
+//构建水域类型下拉	
+function initSylxSelect(divid,existVal,width){
+	$.post($.app+"/xmxxgl/selectSylx",{
+	},function(data) {
+		var str="";
+		str+="<select class='sylxselectpicker' name='sylxid' id='sylxid'>";
+		str+="<option></option>";
+		if(data){
+			for(var i=0;i<data.length;i++){
+				var sylx=data[i];
+				if(sylx.id==existVal){
+					str+=" <option selected='selected' value='"+sylx.id+"' >"+sylx.text+"</option>";
+				}else{
+					str+="<option value='"+sylx.id+"'>"+sylx.text+"</option>" ;
+				}
+			}
+		}
+		str+="</select>";
+		$("#"+divid).empty;
+		$("#"+divid).append(str);
+		$('.sylxselectpicker').selectpicker({
+			width:width
+		});
+	}, "json");
+};
+//构建投资类型下拉事件	
+function tzlxChange() {
+	var val = $("#tzlxid").val();
+	if(val == "1903") {
+		$("#zftzDiv").css("display","table-row");
+	} else {
+		$("#zftzezb").val("");
+		$("#zftzDiv").css("display","none");
+	}
+};
+
+//构建政府投资额占比变化事件	
+function ratesub() {
+	var val = $("#tzlxid").val();
+	var ztz = $('#addform input[name=ztz]').val();
+	var zftze = $('#addform input[name=zftze]').val();
+	if(val == "1903") {
+		if(isEmpty(ztz) || isEmpty(zftze)) {
+			$("#zftzezb").val("");
+			return;
+		}
+		if(isFDS(ztz) && isFDS(zftze)) {
+			var rate = (zftze/ztz)*100;
+			$("#zftzezb").val(rate.toFixed(2));
+		}
+	}
+};
 	
 	
 //  构建项目类型下拉	
@@ -92,7 +145,7 @@ xmxxgl.detail.save=function(){
 			$.post($.app+"/xmxxgl/selectTzlx",{
 			},function(data) {
 				var str="";
-				str+="<select class='tzlxselectpicker' name='tzlxid' id='tzlxid'>";
+				str+="<select class='tzlxselectpicker' name='tzlxid' id='tzlxid' onchange='tzlxChange(this)'>";
 				str+="<option></option>";
 				if(data){
 					for(var i=0;i<data.length;i++){
@@ -110,6 +163,8 @@ xmxxgl.detail.save=function(){
 				$('.tzlxselectpicker').selectpicker({
 		    		width:width
 		    	});
+				tzlxChange();
+				ratesub();
 			}, "json");
 		}
 			//  构建项目核准级别下拉	
@@ -362,4 +417,5 @@ xmxxgl.detail.save=function(){
 				    		width:width
 				    	});
 				    }, "json");
-				}
+				}
+				 

+ 59 - 6
gkjsjy/trunk/src/com/xt/jygl/gkjsgl/xmxxgl/ctl/XmxxglCtl.java

@@ -1,7 +1,9 @@
 package com.xt.jygl.gkjsgl.xmxxgl.ctl;
 
 import java.net.URL;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -322,8 +324,13 @@ public class XmxxglCtl extends BaseWebCtl {
 	@RequestMapping(value = "/save")
 	@RequiresPermissions("xmxxgl:add")
 	@ResponseBody
-	public WebJsonResult save(Model model, XmxxglEntity code, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
+	public WebJsonResult save(Model model, XmxxglEntity code, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid, String sylxid) {
 		WebJsonResult wr = success();
+		if (StringUtils.isEmpty(code.getXmbm())) {
+			wr.setSuccess(false);
+			wr.setMessage("请输入项目编码");
+			return wr;
+		}
 		if (StringUtils.isEmpty(code.getXmmc())) {
 			wr.setSuccess(false);
 			wr.setMessage("请输入项目名称");
@@ -364,16 +371,24 @@ public class XmxxglCtl extends BaseWebCtl {
 			wr.setMessage("请输入建设地点");
 			return wr;
 		}
+		if (StringUtils.isEmpty(code.getTgnl())) {
+			wr.setSuccess(false);
+			wr.setMessage("请输入通过能力");
+			return wr;
+		}
 		try {
 			if (!StringUtils.isEmpty(code.getId())) {
 				// 修改
 				XmxxglEntity xmxxgl = xmxxglService.findOne(code.getId());
+				xmxxgl.setXmbm(code.getXmbm());
 				xmxxgl.setXmmc(code.getXmmc());
 				xmxxgl.setXmfr(code.getXmfr());
 				xmxxgl.setJsdd(code.getJsdd());
 				xmxxgl.setJsgm(code.getJsgm());
 				xmxxgl.setZtz(code.getZtz());
 				xmxxgl.setTgnl(code.getTgnl());
+				xmxxgl.setZftze(code.getZftze());
+				xmxxgl.setJcsj(code.getJcsj());
 				xmxxgl.setSddx(code.getSddx());
 				xmxxgl.setSddy(code.getSddy());
 				xmxxgl.setXddx(code.getXddx());
@@ -392,7 +407,11 @@ public class XmxxglCtl extends BaseWebCtl {
 					CodeEntity zyhbwfl = new CodeEntity(zyhbwflid);
 					xmxxgl.setZyhbwfl(zyhbwfl);
 				}
-
+				if (!StringUtils.isEmpty(szdid)) {
+					CodeEntity szd = new CodeEntity();
+					szd.setId(szdid);
+					xmxxgl.setSzd(szd);
+				}
 				if (!StringUtils.isEmpty(szgkid)) {
 					GkEntity szgk = new GkEntity();
 					szgk.setId(szgkid);
@@ -429,6 +448,13 @@ public class XmxxglCtl extends BaseWebCtl {
 				} else {
 					xmxxgl.setAxspjb(null);
 				}
+				if (!StringUtils.isEmpty(sylxid)) {
+					CodeEntity sylx = new CodeEntity();
+					sylx.setId(sylxid);
+					xmxxgl.setSylx(sylx);
+				} else {
+					xmxxgl.setSylx(null);
+				}
 				xmxxglService.save(xmxxgl);
 			} else {
 				if (!StringUtils.isEmpty(ssjyrid)) {
@@ -438,6 +464,11 @@ public class XmxxglCtl extends BaseWebCtl {
 				}
 
 				// 新增直接保存
+				if (!StringUtils.isEmpty(szdid)) {
+					CodeEntity szd = new CodeEntity();
+					szd.setId(szdid);
+					code.setSzd(szd);
+				}
 				if (!StringUtils.isEmpty(szgkid)) {
 					GkEntity szgk = new GkEntity();
 					szgk.setId(szgkid);
@@ -473,6 +504,11 @@ public class XmxxglCtl extends BaseWebCtl {
 					axspjbdx.setId(axspjbid);
 					code.setAxspjb(axspjbdx);
 				}
+				if (!StringUtils.isEmpty(sylxid)) {
+					CodeEntity sylx = new CodeEntity();
+					sylx.setId(sylxid);
+					code.setSylx(sylx);
+				}
 				xmxxglService.save(code);
 
 			}
@@ -499,16 +535,20 @@ public class XmxxglCtl extends BaseWebCtl {
 		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.setSzdzw(entity.getSzd() != null ? entity.getSzd().getText() : "");
 		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.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.setSzd(entity.getSzd() != null ? entity.getSzd().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() : "");
+		vo.setSylx(entity.getSylx() != null ? entity.getSylx().getId() : "");
 		model.addAttribute("record", vo);
 		model.addAttribute("jyr", entity.getJyrid());
 		return "gkjsgl/xmxxgl/xmxxgledit";
@@ -531,9 +571,11 @@ public class XmxxglCtl extends BaseWebCtl {
 		vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
 		vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
 		vo.setZyhbwflzw(entity.getZyhbwfl() != null ? entity.getZyhbwfl().getText() : "");
-		if (entity.getJyrid() != null) {
-			vo.setSzddzw(entity.getJyrid().getSzd() != null ? entity.getJyrid().getSzd().getText() : "");
-		}
+		vo.setSylxzw(entity.getSylx() != null ? entity.getSylx().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 = "";
 			String[] s = entity.getBwyt().split(",");
@@ -575,7 +617,11 @@ public class XmxxglCtl extends BaseWebCtl {
 		}
 		model.addAttribute("jyr", jyr);
 		model.addAttribute("szd", user.getSzd());
-
+		// 默认建成时间当天
+		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() : "");
@@ -601,6 +647,13 @@ public class XmxxglCtl extends BaseWebCtl {
 		return list;
 	}
 
+	@RequestMapping(value = "/selectSylx")
+	@ResponseBody
+	public List<CodeEntity> selectSylx(Model model) {
+		List<CodeEntity> list = securityMgr.codeService().findValidCodesByGroupCode(Constants.GQ_CODE_GQSZSYLX);
+		return list;
+	}
+
 	@RequestMapping(value = "/selectXmhzjb")
 	@ResponseBody
 	public List<CodeEntity> selectXmhzjb(Model model) {

+ 43 - 0
gkjsjy/trunk/src/com/xt/jygl/gkjsgl/xmxxgl/entity/XmxxglEntity.java

@@ -1,5 +1,7 @@
 package com.xt.jygl.gkjsgl.xmxxgl.entity;
 
+import java.util.Date;
+
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
@@ -52,6 +54,13 @@ public class XmxxglEntity extends BaseEntity<String> implements Cloneable {
 	private CodeEntity zyhbwfl;/* 专业化泊位分类*/
 	private String lcjd;/* 流程节点*/
 	private String sfqswj;/* 是否缺失文件*/
+
+	private String xmbm;/* 项目编码 */
+	private String zftze;/* 政府投资额 */
+	private CodeEntity sylx;/* 水域类型 */
+	private Date jcsj; /* 建成时间 */
+	
+	
 	@Id
 	@GenericGenerator(name = "systemUUID", strategy = "uuid")
 	@GeneratedValue(generator = "systemUUID")
@@ -275,4 +284,38 @@ public class XmxxglEntity extends BaseEntity<String> implements Cloneable {
 		this.sfqswj = sfqswj;
 	}
 
+	public String getXmbm() {
+		return xmbm;
+	}
+
+	public void setXmbm(String xmbm) {
+		this.xmbm = xmbm;
+	}
+
+	public String getZftze() {
+		return zftze;
+	}
+
+	public void setZftze(String zftze) {
+		this.zftze = zftze;
+	}
+	
+	@ManyToOne(fetch = FetchType.EAGER, targetEntity = CodeEntity.class)
+	@JoinColumn(name = "sylx")
+	public CodeEntity getSylx() {
+		return sylx;
+	}
+
+	public void setSylx(CodeEntity sylx) {
+		this.sylx = sylx;
+	}
+
+	public Date getJcsj() {
+		return jcsj;
+	}
+
+	public void setJcsj(Date jcsj) {
+		this.jcsj = jcsj;
+	}
+
 }

+ 49 - 0
gkjsjy/trunk/src/com/xt/jygl/gkjsgl/xmxxgl/vo/XmxxglVo.java

@@ -1,5 +1,7 @@
 package com.xt.jygl.gkjsgl.xmxxgl.vo;
 
+import java.util.Date;
+
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 
@@ -36,6 +38,13 @@ public class XmxxglVo extends BaseVo {
 	private String dqzt;/* 当前状态 */
 	private String flag;/* 用于判断列表页面是否显示项目进度 */
 	private String sfyzjbz;/* 是否有资金补助 */
+	
+	private String xmbm;/* 项目编码 */
+	private String zftze;/* 政府投资额 */
+	private String sylx;/* 水域类型 */
+	private String sylxzw;/* 水域类型中文 */
+	private Date jcsj; /* 建成时间 */
+	
 	// 流程历史字段
 	private String currentname;/* 流程节点名 */
 	private String auditusername;/* 审批人 */
@@ -443,6 +452,46 @@ public class XmxxglVo extends BaseVo {
 	public void setShowjsjd(String showjsjd) {
 		this.showjsjd = showjsjd;
 	}
+
+	public String getXmbm() {
+		return xmbm;
+	}
+
+	public void setXmbm(String xmbm) {
+		this.xmbm = xmbm;
+	}
+
+	public String getZftze() {
+		return zftze;
+	}
+
+	public void setZftze(String zftze) {
+		this.zftze = zftze;
+	}
+
+	public String getSylx() {
+		return sylx;
+	}
+
+	public void setSylx(String sylx) {
+		this.sylx = sylx;
+	}
+
+	public String getSylxzw() {
+		return sylxzw;
+	}
+
+	public void setSylxzw(String sylxzw) {
+		this.sylxzw = sylxzw;
+	}
+
+	public Date getJcsj() {
+		return jcsj;
+	}
+
+	public void setJcsj(Date jcsj) {
+		this.jcsj = jcsj;
+	}