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

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

@@ -180,8 +180,10 @@
 									</tr>
 									<tr>
 										<th>经营人名称：</th>
-										<td colspan="5">${gkjyrxx.gkjyr}
+										<td colspan="3">${gkjyrxx.gkjyr}
 										</td>
+										<th>行政区划：</th>
+										<td>${gkjyrxx.xzqh}</td>
 										<th>企业性质：</th>
 										<td>${gkjyrxx.qyxz}</td>
 										<!-- <th></th>

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

@@ -37,7 +37,10 @@
 						</tr>
 						<tr>
 							<th>港口经营人名称 : &nbsp;</th>
-							<td colspan="5">${gkjyrxx.gkjyr}
+							<td colspan="3">${gkjyrxx.gkjyr}
+							</td>
+							<th>行政区划: &nbsp;</th>
+							<td>${gkjyrxx.xzqh}
 							</td>
 							<th>企业性质: &nbsp;</th>
 							<td>${gkjyrxx.qyxz}

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

@@ -21,6 +21,7 @@
 		gkjyrdetails.main.initYwcqzm('ywcqzmsel','');
 		gkjyrdetails.main.initYwjgys('ywjgyssel','');
 		gkjyrdetails.main.initSfwhqy('sfwhqysel','');
+		gkjyrdetails.main.initXzqh('xzqhsel','','${gk}');
 		gkjyrdetails.main.initJyrMtjgxs('jyrmtjgxssel', '');
 		gkjyrdetails.main.initQyxz('qyxzsel','');
 	});
@@ -51,7 +52,11 @@
 						</tr>
 						<tr>
 							<th><span class="needwrite">*</span>经营人名称：</th>
-							<td colspan="5" ><input type="text" class="form-control" name="gkjyr" maxlength="200" style="width:99%">
+							<td colspan="3" ><input type="text" class="form-control" name="gkjyr" maxlength="200" style="width:99%">
+							</td>
+							<th>行政区划：</th>
+							<td>
+								<div id="xzqhsel"></div>
 							</td>
 							<th>企业性质：<!-- 行政区划： --></th>
 							<td><span id="qyxzsel"></span></td>

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

@@ -23,6 +23,7 @@
 		gkjyrdetails.main.initYwcqzm('ywcqzmsel','${gkjyr.ywcqzm}');
 		gkjyrdetails.main.initYwjgys('ywjgyssel','${gkjyr.ywjgys}');
 		gkjyrdetails.main.initSfwhqy('sfwhqysel','${gkjyr.sfwhqy}');
+		gkjyrdetails.main.initXzqh('xzqhsel','${gkjyr.xzqh}','${gkjyr.szgk}');
 		gkjyrdetails.main.initJyrMtjgxs('jyrmtjgxssel', '${gkjyr.mtjgxs}');
 		gkjyrdetails.main.initQyxz('qyxzsel','${gkjyr.qyxz}');
 	});
@@ -54,7 +55,11 @@
 							</tr>
 						<tr>
 							<th>经营人名称：</th>
-							<td colspan="5"><input type="text" class="form-control" value="${gkjyr.gkjyr}" name="gkjyr" maxlength="200" style="width:99%">
+							<td colspan="3"><input type="text" class="form-control" value="${gkjyr.gkjyr}" name="gkjyr" maxlength="200" style="width:99%">
+							</td>
+							<th>行政区划：</th>
+							<td>
+								<div id="xzqhsel"></div>
 							</td>
 							<th>企业性质：<!-- 行政区划： --></th>
 							<td><span id="qyxzsel"></span></td>

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

@@ -43,8 +43,10 @@
 						</tr>
 						<tr>
 							<th>经营人名称：</th>
-							<td colspan="5">${gkjyr.gkjyr}
+							<td colspan="3">${gkjyr.gkjyr}
 							</td>
+							<th>行政区划：</th>
+							<td>${gkjyr.xzqh}</td>
 							<th>企业性质：<!-- 行政区划： --></th>
 							<td>${gkjyr.qyxzzw}<%-- ${gkjyr.xzqh} --%></td>
 							<!-- <th></th>

gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gkjyr/jyrjbxx/gkjyrdetails.js

@@ -54,6 +54,7 @@ function showgq() {
 	$('#xzjyrid').val("");
 	initgqSelect('gqsel', gkjyrdetails.main.szgqbackData, $('.szdselectpicker')
 			.val(), $('.gkselectpicker').val(), null, '95%');
+	gkjyrdetails.main.initXzqh('xzqhsel','', $('.gkselectpicker').val());
 };
 
 /**判断是否select的实现
@@ -135,6 +136,35 @@ gkjyrdetails.main.initSfwhqy=function(divid, existVal){
       }
   }, "json");
 };
+//行政区划
+gkjyrdetails.main.initXzqh=function(divid, existVal, gk ){
+	$.post($.app + "/gkjyr/selectXzqh", {
+		gk:gk
+	}, function(data) {
+		if (data) {
+			var str = "";
+			str+="<select   class='xzqhselectpicker' name='xzqhid'  >";
+			str+="<option></option>";
+			for(var i=0;i<data.length;i++){
+				var xzqh = data[i];
+				if(xzqh.text==existVal){
+					str+=" <option selected='selected' value='"+xzqh.id+"' >"+xzqh.text+"</option>";
+				}else{
+					str+=" <option value='"+xzqh.id+"' >"+xzqh.text+"</option>";
+				}
+			}
+			str+="</select>";
+			$("#"+divid).empty();
+			$("#"+divid).append(str);
+			
+			$('.xzqhselectpicker').selectpicker({
+				width:'95%'
+			});
+		} else {
+			
+		}
+	}, "json");
+};
 
 gkjyrdetails.main.initYwjgys=function(divid, existVal){
 	 $.post($.app + "/gkjyr/selectYw", {

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrjbxx/ctl/GkjyrCtl.java

@@ -627,7 +627,7 @@ public class GkjyrCtl extends BaseWebCtl {
 	 */
 	@RequestMapping(value = "/save")
 	@ResponseBody
-	public WebJsonResult save(Model model, String iFlag, GkjyrEntity gkjyrEntity, String szdid, String szgkid, String szgqid, String sfwhqyid, String sfzdspid, String ywcqzmid, String ywjgysid, String jyrmtjgxsid, String qyxzid) {
+	public WebJsonResult save(Model model, String iFlag, GkjyrEntity gkjyrEntity, String szdid, String szgkid, String szgqid, String sfwhqyid, String xzqhid, String sfzdspid, String ywcqzmid, String ywjgysid, String jyrmtjgxsid, String qyxzid) {
 		WebJsonResult wr = success();
 		if (StringUtils.isEmpty(iFlag)) {
 			if (StringUtils.isEmpty(szdid)) {
@@ -700,6 +700,12 @@ public class GkjyrCtl extends BaseWebCtl {
 			} else {
 				gkjyrEntity.setSfwhqy(yjyr.getSfwhqy());
 			}
+			if (StringUtils.isNotEmpty(xzqhid)) {
+				CodeEntity xzqh = new CodeEntity(xzqhid);
+				gkjyrEntity.setXzqh(xzqh);
+			} else {
+				gkjyrEntity.setXzqh(yjyr.getXzqh());
+			}
 			if (StringUtils.isNotEmpty(sfzdspid)) {
 				CodeEntity sfzdsp = new CodeEntity(sfzdspid);
 				gkjyrEntity.setSfzdsp(sfzdsp);
@@ -770,6 +776,7 @@ public class GkjyrCtl extends BaseWebCtl {
 		}
 
 		gkjyrVo.setSfwhqy(null != gkjyr.getSfwhqy() ? gkjyr.getSfwhqy().getText() : "");
+		gkjyrVo.setXzqh(null != gkjyr.getXzqh() ? gkjyr.getXzqh().getText() : "");
 		gkjyrVo.setSfzdsp(null != gkjyr.getSfzdsp() ? gkjyr.getSfzdsp().getText() : "");
 		gkjyrVo.setYwcqzmzw(null != gkjyr.getYwcqzm() ? gkjyr.getYwcqzm().getText() : "");
 		gkjyrVo.setYwjgyszw(null != gkjyr.getYwjgys() ? gkjyr.getYwjgys().getText() : "");
@@ -934,6 +941,7 @@ public class GkjyrCtl extends BaseWebCtl {
 			}
 		}
 		gkjyrVo.setSfwhqyzw(null != gkjyr.getSfwhqy() ? gkjyr.getSfwhqy().getText() : "");
+		gkjyrVo.setXzqh(null != gkjyr.getXzqh() ? gkjyr.getXzqh().getText() : "");
 		gkjyrVo.setSfzdspzw(null != gkjyr.getSfzdsp() ? gkjyr.getSfzdsp().getText() : "");
 
 		gkjyrVo.setSzd(null != gkjyr.getSzd() ? gkjyr.getSzd().getId() : "");
@@ -1018,6 +1026,7 @@ public class GkjyrCtl extends BaseWebCtl {
 		}
 
 		gkjyrVo.setSfwhqyzw(null != gkjyr.getSfwhqy() ? gkjyr.getSfwhqy().getText() : "");
+		gkjyrVo.setXzqh(null != gkjyr.getXzqh() ? gkjyr.getXzqh().getText() : "");
 		gkjyrVo.setSfzdsp(null != gkjyr.getSfzdsp() ? gkjyr.getSfzdsp().getText() : "");
 		gkjyrVo.setYwcqzmzw(null != gkjyr.getYwcqzm() ? gkjyr.getYwcqzm().getText() : "");
 		gkjyrVo.setYwjgyszw(null != gkjyr.getYwjgys() ? gkjyr.getYwjgys().getText() : "");
@@ -1154,6 +1163,7 @@ public class GkjyrCtl extends BaseWebCtl {
 		}
 
 		gkjyrVo.setSfwhqyzw(null != gkjyr.getSfwhqy() ? gkjyr.getSfwhqy().getText() : "");
+		gkjyrVo.setXzqh(null != gkjyr.getXzqh() ? gkjyr.getXzqh().getText() : "");
 		gkjyrVo.setSfzdsp(null != gkjyr.getSfzdsp() ? gkjyr.getSfzdsp().getText() : "");
 		gkjyrVo.setYwcqzmzw(null != gkjyr.getYwcqzm() ? gkjyr.getYwcqzm().getText() : "");
 		gkjyrVo.setYwjgyszw(null != gkjyr.getYwjgys() ? gkjyr.getYwjgys().getText() : "");
@@ -2021,6 +2031,18 @@ public class GkjyrCtl extends BaseWebCtl {
 		List<CodeEntity> list = securityMgr.codeService().findValidCodesByGroupCode(Constants.GROUP_CODE_SF);
 		return list;
 	}
+	
+	@RequestMapping(value = "/selectXzqh")
+	@ResponseBody
+	public List<CodeEntity> selectXzqh(Model model, String gk) {
+		GkEntity gkEntitie = gkService.findOne(gk);
+		if (gkEntitie == null) {
+			gkEntitie = new GkEntity();
+		}
+		String pid = gkEntitie.getXzqh();
+		List<CodeEntity> list = securityMgr.codeService().findByPid(pid);
+		return list;
+	}
 
 	// 时间格式化
 	private String transFormatDate(Date d) {

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrjbxx/entity/GkjyrEntity.java

@@ -114,7 +114,7 @@ public class GkjyrEntity extends BaseEntity<String> implements Cloneable {
 	/* 上级港口经营人 */
 	private String parentJyrId;
 	/* 行政区划 */
-	private String xzqh;
+	private CodeEntity xzqh;
 	/* 所在港口 */
 	private GkEntity szgk;
 	// 人业人员数量
@@ -260,11 +260,13 @@ public class GkjyrEntity extends BaseEntity<String> implements Cloneable {
 		this.szgk = szgk;
 	}
 
-	public String getXzqh() {
+	@ManyToOne(fetch = FetchType.EAGER, targetEntity = CodeEntity.class)
+	@JoinColumn(name = "xzqh")
+	public CodeEntity getXzqh() {
 		return xzqh;
 	}
 
-	public void setXzqh(String xzqh) {
+	public void setXzqh(CodeEntity xzqh) {
 		this.xzqh = xzqh;
 	}