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

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

@@ -17,6 +17,7 @@
 				xkzbg.detail.initXzqh('xzqhsel','${gkjyr.xzqh}','${gkjyr.szgkzw}');
 				xkzbg.detail.initQyxz('qyxzsel','${gkjyr.qyxz}');
 			}
+			xkzbg.detail.initYwjgys("ywjgyssel","${gkjyr.ywjgys}");
 			iFrameHeightIframe('gkjyr');//自适应高度
 			xkzbg.detail.init();
 
@@ -814,7 +815,7 @@
 											<th rowspan="2">码头结构型式：</th>
 											<td rowspan="2" colspan="2"><input type="text"
 												id="mtjgxs"
-												class="form-control" value="${gkjyr.mtjgxs}" name="mtjgxs"
+												class="form-control" value="${gkjyr.mtjgxszw}" name="mtjgxs"
 												maxlength="100" style="width: 97.5%"></td>
 											<th>泊位总长度（米）：</th>
 											<td colspan="4"><input type="text" class="form-control"
@@ -825,7 +826,7 @@
 										<tr>
 											<th>有无竣工验收<br>证明：
 											</th>
-											<td colspan="4"><span id="ywjgyssel"></td>
+											<td colspan="4"><span id="ywjgyssel"></span></td>
 										</tr>
 										<tr>
 											<th>设计年通过能力<br>（万吨）：

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

@@ -707,7 +707,7 @@
 										<tr>
 											<th rowspan="2">码头结构型式：</th>
 											<td rowspan="2" colspan="2"><input type="text"
-												class="form-control" value="${gkjyr.mtjgxs}" name="mtjgxs"
+												class="form-control" value="${gkjyr.mtjgxszw}" name="mtjgxs"
 												maxlength="100" style="width: 97.5%"></td>
 											<th>泊位总长度（米）：</th>
 											<td colspan="4"><input type="text" class="form-control"

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

@@ -631,7 +631,7 @@
 									</tr>
 									<tr>
 										<th rowspan="2">码头结构型式：</th>
-										<td rowspan="2" colspan="2">${gkjyrxx.mtjgxs}</td>
+										<td rowspan="2" colspan="2">${gkjyrxx.mtjgxszw}</td>
 										<th>泊位总长度（米）：</th>
 										<td colspan="4">${gkjyrxx.bwzcd}</td>
 									</tr>

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

@@ -21,7 +21,7 @@
 		xkzsq.detail.szdData='${gkjyr.szd}';
 		xkzsq.detail.init();
 		tabiFrameHeightIframe('gkjyrxx');//自适应高度
-
+		xkzsq.detail.initYwjgys("ywjgyssel","${gkjyr.ywjgys}");
 		var root = $("#simple_new_menu");
 		var path = '${path}';
 		if (path != null && path != '') {
@@ -719,7 +719,7 @@
 											<th rowspan="2">码头结构型式：</th>
 											<td rowspan="2" colspan="2"><input type="text"
 												id="mtjgxs"
-												class="form-control" value="${gkjyr.mtjgxs}" name="mtjgxs"
+												class="form-control" value="${gkjyr.mtjgxszw}" name="mtjgxs"
 												maxlength="100" style="width: 97.5%"></td>
 											<th>泊位总长度（米）：</th>
 											<td colspan="4"><input type="text" class="form-control"

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

@@ -14,6 +14,7 @@
 		$(document).ready(function () {
 			xkzsq.detail.initXzqh('xzqhsel','${gkjyr.xzqh}', '${gkjyr.szgkzw}');
 			xkzsq.detail.initQyxz('qyxzsel','${gkjyr.qyxz}');
+			xkzsq.detail.initYwjgys("ywjgyssel","${gkjyr.ywjgys}");
 			xkzsq.detail.szdData='${gkjyr.szd}';
 			xkzsq.detail.init();
 			iFrameHeightIframe('gkjyr');//自适应高度
@@ -186,7 +187,7 @@
 		<tr>
 			<th>港口经营人：&nbsp;</th>
 			<td colspan="3">
-				<input type="text" style="width: 88%" readonly="readonly" class="form-control" id="xzjyr" name="jyrmc" value="${record.jyrmc }">
+				<input type="text" style="width: 85%" readonly="readonly" class="form-control" id="xzjyr" name="jyrmc" value="${record.jyrmc }">
 				<input type="hidden" class="form-control" name="jyrid" id="jyrid" value="${record.jyrid }">
 				 
 			</td>
@@ -194,14 +195,14 @@
 		<tr>
 			<th>办公地点：&nbsp;</th>
 			<td colspan="3">
-				<input type="text" style="width: 88%" class="form-control" id="bgdd" name="bgdd" value ="${record.bgdd }">
+				<input type="text" style="width: 85%" class="form-control" id="bgdd" name="bgdd" value ="${record.bgdd }">
 			</td>
 		</tr>
 		
 		<tr>
 			<th><span class="needwrite">*</span>经营地域：&nbsp;</th>
 			<td colspan="3" style="position:relative;" >
-				<textarea readonly="readonly" id="jydyadd" style="width: 88%"  class="form-control">${jyfwstr }</textarea>
+				<textarea readonly="readonly" id="jydyadd" style="width: 85%"  class="form-control">${jyfwstr }</textarea>
 				<a class="btn btn-primary btn-sm" style="float: right;position:absolute;right:5px;top:15px;" href="#" onclick="xkzsq.detail.jydyxz()">选择经营地域</a>
 			</td>
 		</tr>
@@ -212,7 +213,7 @@
 			</td>
 			<th><span class="needwrite">*</span>联系电话：&nbsp;</th>
 			<td>
-				<input type="text" class="form-control" style="width: 69%" id="lxdh" name="lxdh" value='${record.lxdh }'>
+				<input type="text" class="form-control" style="width: 64%" id="lxdh" name="lxdh" value='${record.lxdh }'>
 			</td>
 		</tr>
 		<tr>
@@ -222,13 +223,13 @@
 			</td>
 			<th>电话、传真：&nbsp;</th>
 			<td>
-				<input type="text" class="form-control" style="width: 69%" id="cz" name="cz" value='${record.cz }'>
+				<input type="text" class="form-control" style="width: 64%" id="cz" name="cz" value='${record.cz }'>
 			</td>
 		</tr>
 		<tr>
 			<th>申请从事的港口经营业务种类：&nbsp;</th>
 			<td colspan="3" style="position:relative;">
-			<textarea readonly="readonly" id="ywzladd" style="width: 88%" class="form-control">${ jylzstr}</textarea>
+			<textarea readonly="readonly" id="ywzladd" style="width: 85%" class="form-control">${ jylzstr}</textarea>
 			<a class="btn btn-primary btn-sm" style="float: right;position:absolute;right:5px;top:15px;" href="#" onclick="xkzsq.detail.jydyxz()">选择经营范围</a>
 			</td>
 		</tr>

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

@@ -15,6 +15,7 @@
 			iFrameHeightIframe('gkjyr');//自适应高度
 			xkzsq.detail.path='${path}';
 			xkzsq.detail.path2='${path2}';
+			xkzsq.detail.initYwjgys("ywjgyssel","${gkjyr.ywjgys}");
 			xkzsq.detail.type='${type}';
 			var root = $("#simple_new_menu");
 			var path = '${path}';
@@ -584,7 +585,7 @@
 									</tr>
 									<tr>
 										<th rowspan="2">码头结构型式：</th>
-										<td rowspan="2" colspan="2">${gkjyrxx.mtjgxs}</td>
+										<td rowspan="2" colspan="2">${gkjyrxx.mtjgxszw}</td>
 										<th>泊位总长度（米）：</th>
 										<td colspan="4">${gkjyrxx.bwzcd}</td>
 									</tr>

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

@@ -617,7 +617,7 @@
 									</tr>
 									<tr>
 										<th rowspan="2">码头结构型式：</th>
-										<td rowspan="2" colspan="2">${gkjyrxx.mtjgxs}</td>
+										<td rowspan="2" colspan="2">${gkjyrxx.mtjgxszw}</td>
 										<th>泊位总长度（米）：</th>
 										<td colspan="4">${gkjyrxx.bwzcd}</td>
 									</tr>

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

@@ -607,7 +607,7 @@
 									</tr>
 									<tr>
 										<th rowspan="2">码头结构型式：</th>
-										<td rowspan="2" colspan="2">${gkjyrxx.mtjgxs}</td>
+										<td rowspan="2" colspan="2">${gkjyrxx.mtjgxszw}</td>
 										<th>泊位总长度（米）：</th>
 										<td colspan="4">${gkjyrxx.bwzcd}</td>
 									</tr>

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

@@ -24,7 +24,34 @@ xkzbg.detail.init = function() {
 	 * initgqSelect('gqsel','',$('.szdselectpicker').val(),$('.gkselectpicker').val(),null,300);
 	 */
 }
-
+xkzbg.detail.initYwjgys=function(divid, existVal){
+	 $.post($.app + "/gkjyr/selectYw", {
+     
+ }, function(data) {
+     if (data) {
+    	 var str = "";
+    		str+="<select   class='ywjgysselectpicker' name='ywjgysid'  >";
+    		str+="<option></option>";
+    			for(var i=0;i<data.length;i++){
+    				var ywjgys = data[i];
+    				if(ywjgys.id==existVal){
+    					str+=" <option selected='selected' value='"+ywjgys.id+"' >"+ywjgys.text+"</option>";
+    				}else{
+    					str+=" <option value='"+ywjgys.id+"' >"+ywjgys.text+"</option>";
+    				}
+    			}
+    		str+="</select>";
+    		$("#"+divid).empty();
+    		$("#"+divid).append(str);
+    		
+    		$('.ywjgysselectpicker').selectpicker({
+    			width: '98.75%'
+    		});
+     } else {
+    	
+     }
+ }, "json");
+};
 
 xkzbg.detail.delData=function(data){
 	$.confirm({

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

@@ -25,7 +25,34 @@ xkzsq.detail.init = function() {
 	 */
 }
 
-
+xkzsq.detail.initYwjgys=function(divid, existVal){
+	 $.post($.app + "/gkjyr/selectYw", {
+    
+}, function(data) {
+    if (data) {
+   	 var str = "";
+   		str+="<select   class='ywjgysselectpicker' name='ywjgysid'  >";
+   		str+="<option></option>";
+   			for(var i=0;i<data.length;i++){
+   				var ywjgys = data[i];
+   				if(ywjgys.id==existVal){
+   					str+=" <option selected='selected' value='"+ywjgys.id+"' >"+ywjgys.text+"</option>";
+   				}else{
+   					str+=" <option value='"+ywjgys.id+"' >"+ywjgys.text+"</option>";
+   				}
+   			}
+   		str+="</select>";
+   		$("#"+divid).empty();
+   		$("#"+divid).append(str);
+   		
+   		$('.ywjgysselectpicker').selectpicker({
+   			width: '98.75%'
+   		});
+    } else {
+   	
+    }
+}, "json");
+};
 xkzsq.detail.delData = function(data) {
 	$.confirm({
 		title : '确认框',

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

@@ -502,6 +502,8 @@ public class XkzbgCtl extends BaseWebCtl {
 				gkjyrVo.setJyqy(xkz.getCq());
 			}
 		}
+		gkjyrVo.setYwjgys(null != gkjyr.getYwjgys() ? gkjyr.getYwjgys().getId() : "");
+		gkjyrVo.setMtjgxszw(null != gkjyr.getMtjgxs() ? gkjyr.getMtjgxs().getText() : "");
 		gkjyrVo.setSfwhqyzw(null != gkjyr.getSfwhqy() ? gkjyr.getSfwhqy().getText() : "");
 		gkjyrVo.setSfzdsp(null != gkjyr.getSfzdsp() ? gkjyr.getSfzdsp().getText() : "");
 		gkjyrVo.setYwcqzmzw(null != gkjyr.getYwcqzm() ? gkjyr.getYwcqzm().getText() : "");
@@ -1248,6 +1250,7 @@ public class XkzbgCtl extends BaseWebCtl {
 				gkjyrVo.setJyqy(xkz.getCq());
 			}
 		}
+		gkjyrVo.setMtjgxszw(null != gkjyr.getMtjgxs() ? gkjyr.getMtjgxs().getText() : "");
 		gkjyrVo.setSfwhqyzw(null != gkjyr.getSfwhqy() ? gkjyr.getSfwhqy().getText() : "");
 		gkjyrVo.setSfzdsp(null != gkjyr.getSfzdsp() ? gkjyr.getSfzdsp().getText() : "");
 		gkjyrVo.setYwcqzmzw(null != gkjyr.getYwcqzm() ? gkjyr.getYwcqzm().getText() : "");
@@ -1510,6 +1513,7 @@ public class XkzbgCtl extends BaseWebCtl {
 				gkjyrVo.setJyqy(xkz.getCq());
 			}
 		}
+		gkjyrVo.setMtjgxszw(null != gkjyr.getMtjgxs() ? gkjyr.getMtjgxs().getText() : "");
 		gkjyrVo.setSfwhqyzw(null != gkjyr.getSfwhqy() ? gkjyr.getSfwhqy().getText() : "");
 		gkjyrVo.setSfzdsp(null != gkjyr.getSfzdsp() ? gkjyr.getSfzdsp().getText() : "");
 		gkjyrVo.setYwcqzmzw(null != gkjyr.getYwcqzm() ? gkjyr.getYwcqzm().getText() : "");

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

@@ -41,6 +41,8 @@ import com.xt.jygl.common.SearchCondition;
 import com.xt.jygl.common.Utils;
 import com.xt.jygl.ftp.Ftp;
 import com.xt.jygl.ftp.FtpUtil;
+import com.xt.jygl.gkjcxx.ax.entity.AxEntity;
+import com.xt.jygl.gkjcxx.ax.service.AxService;
 import com.xt.jygl.gkjcxx.gk.entity.GkEntity;
 import com.xt.jygl.gkjcxx.gk.service.GkService;
 import com.xt.jygl.gkjcxx.gq.entity.GqEntity;
@@ -168,6 +170,8 @@ public class XkzsqCtl extends BaseWebCtl {
 	private ZxjxService zxjxService;
 	@Autowired
 	private XzglbmxxService xzglbmxxService;
+	@Autowired
+	private AxService axService;
 
 	/**
 	 * 一览查询
@@ -543,7 +547,101 @@ public class XkzsqCtl extends BaseWebCtl {
 				gkjyrVo.setJyqy(xkz.getCq());
 			}
 		}
+		// 岸线
+		List<AxEntity> axEntities = axService.findByJyrid(gkjyr.getId());
+		if (axEntities == null) {
+			axEntities = new ArrayList<AxEntity>();
+		}
+		double axcd = 0;
+		for (AxEntity axEntity : axEntities) {
+			axcd += axEntity == null ? 0 : axEntity.getAxcd();
+		}
+		// 岸线长度
+		gkjyrVo.setAxcd(axcd + "");
+
+		// 码头泊位
+		List<BwEntity> bwList = bwService.findByJyrid(gkjyr.getId());
+		if (bwList == null) {
+			bwList = new ArrayList<BwEntity>();
+		}
+		// 码头泊位总数
+		gkjyrVo.setMtbwzs(bwList.size() + "");
+		int scxbw = 0;
+		int fscxbw = 0;
+		double zdkbnl = 0;
+		int wdjysbw = 0;
+		double bwzcd = 0;
+		double sjntgnl = 0;
+		double sjtgnl = 0;
+		for (BwEntity bwEntity : bwList) {
+			if (bwEntity.getSclx() != null) {
+				if (bwEntity.getSclx().getId().equals("2601") && bwEntity.getSclx().getId().equals("2602")) {
+					scxbw++;
+				} else if (bwEntity.getSclx().getId().equals("2603") && bwEntity.getSclx().getId().equals("2604")) {
+					fscxbw++;
+				}
+			}
+
+			sjtgnl = bwEntity.getSjtgnl() == null ? 0 : bwEntity.getSjtgnl();
+			zdkbnl += sjtgnl;
+			if (sjtgnl >= 10000) {
+				wdjysbw++;
+			}
+			bwzcd += bwEntity.getBwcd() == null ? 0 : bwEntity.getBwcd();
+			sjntgnl += bwEntity.getNhwtgnl() == null ? 0 : Double.parseDouble(bwEntity.getNhwtgnl());
+		}
+		// 泊位生产类型
+		gkjyrVo.setScxbw(scxbw + "");
+		gkjyrVo.setFscxbw(fscxbw + "");
+		// 最大靠泊能力
+		gkjyrVo.setZdkbnl(zdkbnl + "");
+		// 万吨级以上泊位
+		gkjyrVo.setWdjysbwsl(wdjysbw + "");
+		// 泊位总长度
+		gkjyrVo.setBwzcd(bwzcd + "");
+		// 设计年通过能力
+		gkjyrVo.setSjntgnl(sjntgnl + "");
+
+		// 仓库
+		List<CkEntity> ckEntities = ckService.findByJyrid(gkjyr.getId());
+		if (ckEntities == null) {
+			ckEntities = new ArrayList<CkEntity>();
+		}
+		double ckzmj = 0;
+		for (CkEntity ckEntity : ckEntities) {
+			ckzmj += ckEntity.getCkzmj() == null ? 0 : ckEntity.getCkzmj();
+		}
+		// 仓库总面积
+		gkjyrVo.setCkzmj(ckzmj + "");
+
+		// 堆场
+		List<DcEntity> dcEntities = dcService.findByJyrid(gkjyr.getId());
+		if (dcEntities == null) {
+			dcEntities = new ArrayList<DcEntity>();
+		}
+		double dczmj = 0;
+		for (DcEntity dcEntity : dcEntities) {
+			dczmj += dcEntity.getDczmj() == null ? 0 : dcEntity.getDczmj();
+		}
+		// 堆场总面积
+		gkjyrVo.setTczmj(dczmj + "");
+
+		// 储罐
+		List<CgEntity> cgEntities = cgService.findByJyrid(gkjyr.getId());
+		if (cgEntities == null) {
+			cgEntities = new ArrayList<CgEntity>();
+		}
+		double cgzrl = 0;
+		for (CgEntity cgEntity : cgEntities) {
+			cgzrl += cgEntity.getCgqmj() == null ? 0 : cgEntity.getCgqmj();
+		}
+		// 储罐数量
+		gkjyrVo.setCgsl(cgEntities.size() + "");
+		// 储罐总容量
+		gkjyrVo.setCgzrl(cgzrl + "");
 		// 获取各个字典的中文
+		gkjyrVo.setMtjgxszw(null != gkjyr.getMtjgxs() ? gkjyr.getMtjgxs().getText() : "");
+		gkjyrVo.setYwjgys(null != gkjyr.getYwjgys() ? gkjyr.getYwjgys().getId() : "");
 		gkjyrVo.setSfwhqyzw(null != gkjyr.getSfwhqy() ? gkjyr.getSfwhqy().getText() : "");
 		gkjyrVo.setSfzdsp(null != gkjyr.getSfzdsp() ? gkjyr.getSfzdsp().getText() : "");
 		gkjyrVo.setYwcqzmzw(null != gkjyr.getYwcqzm() ? gkjyr.getYwcqzm().getText() : "");
@@ -811,6 +909,7 @@ public class XkzsqCtl extends BaseWebCtl {
 				gkjyrVo.setJyqy(xkz.getCq());
 			}
 		}
+		gkjyrVo.setMtjgxszw(null != gkjyr.getMtjgxs() ? gkjyr.getMtjgxs().getText() : "");
 		gkjyrVo.setSfwhqyzw(null != gkjyr.getSfwhqy() ? gkjyr.getSfwhqy().getText() : "");
 		gkjyrVo.setSfzdsp(null != gkjyr.getSfzdsp() ? gkjyr.getSfzdsp().getText() : "");
 		gkjyrVo.setYwcqzmzw(null != gkjyr.getYwcqzm() ? gkjyr.getYwcqzm().getText() : "");

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

@@ -940,6 +940,7 @@ public class XkzyxCtl extends BaseWebCtl {
 				gkjyrVo.setJyqy(xkz.getCq());
 			}
 		}
+		gkjyrVo.setMtjgxszw(null != gkjyr.getMtjgxs() ? gkjyr.getMtjgxs().getText() : "");
 		gkjyrVo.setSfwhqyzw(null != gkjyr.getSfwhqy() ? gkjyr.getSfwhqy().getText() : "");
 		gkjyrVo.setSfzdsp(null != gkjyr.getSfzdsp() ? gkjyr.getSfzdsp().getText() : "");
 		gkjyrVo.setYwcqzmzw(null != gkjyr.getYwcqzm() ? gkjyr.getYwcqzm().getText() : "");

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

@@ -1202,6 +1202,7 @@ public class XkzzxCtl extends BaseWebCtl {
 				gkjyrVo.setJyqy(xkz.getCq());
 			}
 		}
+		gkjyrVo.setMtjgxszw(null != gkjyr.getMtjgxs() ? gkjyr.getMtjgxs().getText() : "");
 		gkjyrVo.setSfwhqyzw(null != gkjyr.getSfwhqy() ? gkjyr.getSfwhqy().getText() : "");
 		gkjyrVo.setSfzdsp(null != gkjyr.getSfzdsp() ? gkjyr.getSfzdsp().getText() : "");
 		gkjyrVo.setYwcqzmzw(null != gkjyr.getYwcqzm() ? gkjyr.getYwcqzm().getText() : "");