Explorar o código

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

ld_xuhx %!s(int64=8) %!d(string=hai) anos
pai
achega
590c1a1b29
Modificáronse 19 ficheiros con 1524 adicións e 543 borrados
  1. 197 0
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/xkzxx/editxkz.jsp
  2. 6 0
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/xkzbgmain.jsp
  3. 6 0
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/xkzsqmain.jsp
  4. 6 0
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/xkzyxmain.jsp
  5. 72 1
      gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gkjyr/xkzxx/xkzxxdetail.js
  6. 2 1
      gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gkjyxkgl/gkjyzkbg/xkzbgdetail.js
  7. 832 3
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzxx/ctl/XkzxxCtl.java
  8. 3 0
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzxx/dao/XkzxxDao.java
  9. 18 0
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzxx/entity/XkzxxEntity.java
  10. 2 0
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzxx/service/XkzxxService.java
  11. 5 0
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzxx/service/impl/XkzxxServiceImpl.java
  12. 28 0
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzxx/vo/XkzxxVo.java
  13. 293 528
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkbg/ctl/XkzbgCtl.java
  14. 2 2
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkbg/service/impl/XkzbgServiceImpl.java
  15. 7 0
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkbg/vo/XkzbgVo.java
  16. 17 7
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxksq/ctl/XkzsqCtl.java
  17. 10 0
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxksq/vo/XkzsqVo.java
  18. 9 1
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkyx/ctl/XkzyxCtl.java
  19. 9 0
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkyx/vo/XkzyxVo.java

+ 197 - 0
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/xkzxx/editxkz.jsp

@@ -0,0 +1,197 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+	pageEncoding="UTF-8"%>
+
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>江苏省港口建设与经营管理信息系统</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+	<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+    <%@ include file="../../../common.jsp"%>
+	<script type="text/javascript" src="${app }/static/biz/js/gkjygl/gkjyr/xkzxx/xkzxxdetail.js"></script>
+</head>
+<style type="text/css">
+	 .dvs {
+	 	display: none;
+	 	position:absolute;
+	    width: 90%;
+	    height: 90%;
+	 	z-index:100;
+	 }
+	 .dvs img{
+	 	display: block;
+	    width: 90%;
+	    height: 90%;
+	 }
+	 .dvs span img{
+	 	display: block;
+	 	margin-top: 15%;
+	    margin-left: 30%;
+	    width: 150px;
+	    height: 150px;
+	 }
+	 #overlay {
+	    background: #000;
+	    filter: alpha(opacity=70); /* IE的透明度 */
+	    opacity: 0.7;  /* 透明度 */
+	    position: fixed;
+	    top: 0px;
+	    left: 0px;
+	    width: 100%;
+	    height: 100%;
+	    z-index: 50; /* 此处的图层要大于页面 */
+	    display:none;
+	}
+	</style>
+	<script type="text/javascript">
+		$(document).ready(function () {
+			xkzxx.detail.path='${path}';
+			iFrameHeightIframe('${menuid}');//自适应高度
+		});
+		function show0(){
+			//alert(this.value);
+			$dp.$('yxqq1').value = this.value;
+		}
+		function show1(){
+			//alert(this.value);
+			$dp.$('yxqz1').value = this.value;
+			//alert($dp.$('yxqz1').value);		 	
+		}
+		function show2(){
+			$dp.$('fzrq1').value = this.value;
+		}
+	</script>
+<body>
+<div id="overlay"></div>
+	<div class="box" >
+		<div class="box-content" >
+			<div class="apply_fill">
+			<form  id="addform" method="post"  enctype="multipart/form-data">
+			<input type="hidden" id="zmpicid" name="zmpicid" value="${record.zmpicid }"/>
+			<input type="hidden" id="fmpicid" name="fmpicid" value="${record.fmpicid }"/>
+			<input type="hidden" id="opId" name="opId" value="${opId }">
+			 <input type="hidden" name="id" value="${record.id }">	
+				<table class="apply" cellpadding="0" cellspacing="0">
+					<tr>
+						<th><span class="needwrite">*</span>公司名称:&nbsp;</th>
+						<td colspan="3">
+                        	<input type="text" class="form-control" readonly="readonly" value="${record.gkjyrzw}">
+                        	<input type="hidden" class="form-control" id="gkjyr" name="gkjyr"  value="${record.gkjyr}">
+                        </td>
+                        
+					</tr>
+					<tr>
+					<th><span class="needwrite">*</span>法定代表人:&nbsp;</th>
+						<td colspan="3">
+							<input type="text" class="form-control" id="fddbr"  name="fddbr" readonly="readonly"  value="${record.fddbr}">
+						</td>
+					</tr>
+					<tr>
+					<th><span class="needwrite">*</span>办公地址:&nbsp;</th>
+						<td colspan="3">
+							<input type="text" class="form-control" id="dz"  value="${record.dz}" readonly="readonly"  name="dz">
+						</td>
+					</tr>
+					<tr >
+						<th><span class="needwrite">*</span>经营地域:&nbsp;</th>
+						<td colspan="3">
+							<input type="text" class="form-control" id="cq" name="cq" readonly="readonly"  value="${record.cq}">
+						</td>
+					</tr>
+					<tr>
+						<th><span class="needwrite">*</span>经营范围:&nbsp;</th>
+						<td colspan="3">
+							<input type="text" class="form-control" id="zyqyfw" name="zyqyfw" readonly="readonly"  value="${record.zyqyfw}">
+						</td>
+					</tr>
+					<tr>
+					<th><span class="needwrite">*</span>许可证编号:&nbsp;</th>
+					<td >
+						<input type="text" class="form-control" id="gkjyxkzh" name="gkjyxkzh"  value="${record.gkjyxkzh}">
+					</td>
+					<th><span class="needwrite">*</span>发证机关:&nbsp;</th>
+					<td >
+						<input type="text" class="form-control" id="fzjg" name="fzjg" value="${record.fzjg}">
+					</td>
+					</tr>
+					<tr>
+						<th><span class="needwrite">*</span>有效期起:&nbsp;</th>
+						<td >
+							<input class="Wdate" type="text" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd'})" name="yxqq"
+							value="${record.yxqqfmt}">
+						</td>
+						<th><span class="needwrite">*</span>有效期至:&nbsp;</th>
+						<td >
+							<input class="Wdate" type="text" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd'})" name="yxqz"
+							value="${record.yxqzfmt}">
+						</td>
+				<tr>
+						<th><span class="needwrite">*</span>发证日期:&nbsp;</th>
+						<td>
+							<input class="Wdate" type="text" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd'})" name="fzrq"
+							value="${record.fzrqfmt}">
+						</td>
+					</tr>
+					<tr>
+						<th><span class="needwrite">*</span>许可证电子扫描件(正面):&nbsp;</th>
+						<td>
+						 <c:if test="${record.zmpicid =='' }">
+						 	<div >
+							 <a href="#" id="fzzm"  class="file"><input type="file" name="zmpic" id="zmpic"   onchange="xkzxx.detail.saveFile1()">上传扫描件正面</a>
+							 </div>
+							  <div id="fjxq1">
+							  </div>
+						</c:if>
+						 <c:if test="${record.zmpicid !='' }">
+						 <div >
+							 <a href="#" id="fzzm" style="display: none" class="file"><input type="file" name="zmpic" id="zmpic"   onchange="xkzxx.detail.saveFile1()">上传扫描件正面</a>
+							 </div>
+							 <div id="fjxq1">
+						      
+	                <span id='fzmc1'><a class='main_title' href='${app }/accessory/download?id=${record.zmpicid}'>${record.zmpicname }</a></span>
+	                <a class="main_title" onclick="xkzxx.detail.delFj('${record.zmpicid}','1')" class='btn btn-default btn-xs'><i class='glyphicon glyphicon-trash'></i>删除</a>
+	                 </div>
+						</c:if>
+			            </td>
+						<th>许可证电子扫描件(反面):&nbsp;</th>
+						<td >
+						 <c:if test="${record.fmpicid !='' }">
+							<div>
+							 <a href="#" id="fzfm"  style="display: none"  class="file"><input type="file" name="fmpic" id="fmpic"   onchange="xkzxx.detail.saveFile2()">上传扫描件反面</a>
+							 </div>
+							  <div id="fjxq2">
+							    <span id='fzmc2'><a class='main_title' href='${app }/accessory/download?id=${record.fmpicid}'>${record.fmpicname }</a></span>
+	                			<a class="main_title" onclick="xkzxx.detail.delFj('${record.fmpicid}','2')" class='btn btn-default btn-xs'><i class='glyphicon glyphicon-trash'></i>删除</a>
+						     </div>
+						   </c:if>
+						    <c:if test="${record.fmpicid =='' }">
+						    
+						    <div>
+							 <a href="#" id="fzfm"  class="file"><input type="file" name="fmpic" id="fmpic"   onchange="xkzxx.detail.saveFile2()">上传扫描件反面</a>
+							 </div>
+							  <div id="fjxq2">
+							   </div>
+						     </c:if>
+						</td>
+					</tr>
+				</table>
+				</form>
+				<div  id="buttons">
+				<a class="btn btn-default btn-sm" href="#" onclick="xkzxx.detail.save()">
+			   		<i class="glyphicon glyphicon-floppy-disk"></i>保存
+			   	</a>
+			   	<c:if test="${opId != null  }">
+			   	<a class="btn btn-default btn-sm" href="#" onclick="xkzxx.detail.saveFzxkz()">
+			   		<i class="glyphicon glyphicon-floppy-disk"></i>发证
+			   	</a>
+			   	</c:if>
+					<a class="btn btn-default btn-sm" href="#"  onclick="xkzxx.detail.back()">
+						<i class="glyphicon glyphicon-arrow-left"></i>返回
+					</a>
+         		</div>
+			</div>
+		</div>
+	</div>
+</body>
+</html>

+ 6 - 0
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/xkzbgmain.jsp

@@ -165,6 +165,12 @@
 										class="glyphicon glyphicon-search"></i>
 									</a>
 								</c:if>
+									<c:if test ="${xkz.opflag == 1 }">
+								<a class="btn btn-default btn-xs" href="#"
+									onclick="parent.main.menuClick('xkzxx','许可证信息','/xkzxx/editxkz?id=${xkz.id}&status=12')"  title="发证"> <i
+										class="glyphicon glyphicon-search"></i>
+										</a>
+								</c:if>
 								<c:if test="${xkz.taskState =='Y'}">
 							 <a class="btn btn-default btn-xs" href="#"  onclick="xkzbg.main.banli('${xkz.id}')" title=" 办理">
 									   <i class="glyphicon glyphicon-check"></i> 

+ 6 - 0
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/xkzsqmain.jsp

@@ -162,6 +162,12 @@
 										class="glyphicon glyphicon-search"></i>
 									</a>
 								</c:if>
+								<c:if test ="${xkz.opflag == 1 }">
+								<a class="btn btn-default btn-xs" href="#"
+									onclick="parent.main.menuClick('xkzxx','许可证信息','/xkzxx/editxkz?id=${xkz.id}&status=11')"  title="发证"> <i
+										class="glyphicon glyphicon-search"></i>
+										</a>
+								</c:if>
 							 <c:if test="${xkz.taskState =='Y'}">
 							 <a class="btn btn-default btn-xs" href="#"  onclick="xkzsq.main.banli('${xkz.id}')" title="办理">
 									   <i class="glyphicon glyphicon-check"></i> 

+ 6 - 0
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/xkzyxmain.jsp

@@ -147,6 +147,12 @@
 									onclick="xkzyx.main.showxkzjds('${xkz.id}')" title="许可证决定书"> <i
 										class="glyphicon glyphicon-search"></i>
 									</a>
+								</c:if>
+									<c:if test ="${xkz.opflag == 1 }">
+								<a class="btn btn-default btn-xs" href="#"
+									onclick="parent.main.menuClick('xkzxx','许可证信息','/xkzxx/editxkz?id=${xkz.id}&status=13')"  title="发证"> <i
+										class="glyphicon glyphicon-search"></i>
+										</a>
 								</c:if>   
 									  <c:if test="${xkz.taskState =='Y'}">
 							 <a class="btn btn-default btn-xs" href="#"  onclick="xkzyx.main.banli('${xkz.id}')" title="办理">

+ 72 - 1
gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gkjyr/xkzxx/xkzxxdetail.js

@@ -89,7 +89,10 @@ xkzxx.detail.save=function(){
 	if (vae($('#addform input[name=fzjg]'), "发证机关") == false) {
 		return false;
 	}
-	if (vae($('#addform input[name=yxqz]'), "有效期") == false) {
+	if (vae($('#addform input[name=yxqq]'), "有效期起") == false) {
+		return false;
+	}
+	if (vae($('#addform input[name=yxqz]'), "有效期至") == false) {
 		return false;
 	}
 	if (vae($('#addform input[name=fzrq]'), "发证日期") == false) {
@@ -132,6 +135,74 @@ xkzxx.detail.save=function(){
     }); 
 };
 
+xkzxx.detail.saveFzxkz=function(){
+
+	// 验证必填字段是否为空
+	if (vae($('#addform input[name=fddbr]'), "法定代表人") == false) {
+		return false;
+	}
+	if (vae($('#addform input[name=dz]'), "办公地址") == false) {
+		return false;
+	}
+	if (vae($('#addform input[name=cq]'), "经营地域") == false) {
+		return false;
+	}
+	if (vae($('#addform input[name=zyqyfw]'), "经营范围") == false) {
+		return false;
+	}
+	if (vae($('#addform input[name=gkjyxkzh]'), "许可证编号") == false) {
+		return false;
+	}
+	if (vae($('#addform input[name=fzjg]'), "发证机关") == false) {
+		return false;
+	}
+	if (vae($('#addform input[name=yxqq]'), "有效期起") == false) {
+		return false;
+	}
+	if (vae($('#addform input[name=yxqz]'), "有效期至") == false) {
+		return false;
+	}
+	
+	if (vae($('#addform input[name=fzrq]'), "发证日期") == false) {
+		return false;
+	}
+	if (vae($('#addform input[name=zmpicid]'), "附证电子扫描件(正面)") == false) {
+		return false;
+	}
+	
+	 $(".btn").attr("disabled",true);
+	 $.ajax({
+         url:$.app+"/xkzxx/saveFzxkz",
+         data:$("#addform").serialize(),
+         type:"post",
+         dataType:"json",
+         success:function(data){//ajax返回的数据
+	           if (data.success) {
+		           	$.alert({
+		       		    title: '提示',
+		       		    content: '操作成功',
+		       		    confirm:function(){
+		       		 	if(xkzxx.detail.path!=null&&xkzxx.detail.path!='') {
+		       		 		location.href=$.app+xkzxx.detail.path;
+		       		 	} else {
+		       		 		location.href=$.app+"/xkzxx/main";
+		       		 	}
+		       		 	
+		       		 }
+		           	});
+	           }else {
+		           	$.alert({
+		       		    title: '提示',
+		       		    content: data.message,
+		       		    confirm: function(){
+		       		    	$(".btn").attr("disabled",false);
+		       		    }
+		           	});
+	           }
+	     }
+    }); 
+};
+
 xkzxx.detail.back=function(){
 	if(xkzxx.detail.path!=null&&xkzxx.detail.path!='') {
 		location.href=$.app+xkzxx.detail.path;

+ 2 - 1
gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gkjyxkgl/gkjyzkbg/xkzbgdetail.js

@@ -860,6 +860,7 @@ function initjyfwmcSelect(divid,existVal,fjdmc,jyfwid,changefunc,width){
 
 
 xkzbg.detail.audit=function(auditpass,id){
+	$(".btn").attr("disabled",true);
 	var opflag = $('#opflag').val();
 	var shyj="";
 	if(opflag == 1){
@@ -901,7 +902,7 @@ xkzbg.detail.audit=function(auditpass,id){
        		    title: '提示',
        		    content: data.message,
        		    confirm: function(){
-       		    	
+       		    	$(".btn").attr("disabled",false);
        		    }
            	});
        }

+ 832 - 3
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzxx/ctl/XkzxxCtl.java

@@ -9,6 +9,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.InetAddress;
+import java.sql.Timestamp;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -16,6 +17,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+
 import javax.imageio.ImageIO;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaBuilder.In;
@@ -26,7 +28,9 @@ import javax.persistence.criteria.Subquery;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import net.sf.json.JSONObject;
+
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -37,7 +41,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
+
 import cache.CacheSearchCondition;
+
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.liandi.sun.qrcode.QrcodeFactory;
 import com.xt.jygl.accessory.entity.AccessoryEntity;
@@ -50,16 +56,49 @@ import com.xt.jygl.gkjcxx.gk.entity.GkEntity;
 import com.xt.jygl.gkjcxx.gk.service.GkService;
 import com.xt.jygl.gkjcxx.gq.entity.GqEntity;
 import com.xt.jygl.gkjcxx.gq.service.GqService;
+import com.xt.jygl.gkjcxx.mt.entity.MtEntity;
+import com.xt.jygl.gkjcxx.mt.service.MtService;
+import com.xt.jygl.gkjcxx.xzdwxxgl.xzglbmxx.entity.XzglbmxxEntity;
+import com.xt.jygl.gkjcxx.zyq.service.ZyqService;
+import com.xt.jygl.gkjygl.gkjyr.jyrbw.service.BwService;
+import com.xt.jygl.gkjygl.gkjyr.jyrcg.entity.CgEntity;
+import com.xt.jygl.gkjygl.gkjyr.jyrcg.service.CgService;
+import com.xt.jygl.gkjygl.gkjyr.jyrck.entity.CkEntity;
+import com.xt.jygl.gkjygl.gkjyr.jyrck.service.CkService;
+import com.xt.jygl.gkjygl.gkjyr.jyrdc.entity.DcEntity;
+import com.xt.jygl.gkjygl.gkjyr.jyrdc.service.DcService;
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.BwEntity;
 import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.GkjyrEntity;
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.RyEntity;
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.RyzsEntity;
 import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.service.GkjyrService;
 import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.vo.GkjyrVo;
+import com.xt.jygl.gkjygl.gkjyr.qytz.entity.QytzEntity;
+import com.xt.jygl.gkjygl.gkjyr.qytz.service.QytzService;
+import com.xt.jygl.gkjygl.gkjyr.ry.service.RyService;
+import com.xt.jygl.gkjygl.gkjyr.ry.service.RyzsService;
+import com.xt.jygl.gkjygl.gkjyr.sssb.entity.SssbEntity;
+import com.xt.jygl.gkjygl.gkjyr.sssb.service.SssbService;
 import com.xt.jygl.gkjygl.gkjyr.xkzfz.service.XkzfzService;
 import com.xt.jygl.gkjygl.gkjyr.xkzxx.entity.XkzglbEntity;
 import com.xt.jygl.gkjygl.gkjyr.xkzxx.entity.XkzxxEntity;
 import com.xt.jygl.gkjygl.gkjyr.xkzxx.service.XkzglbService;
 import com.xt.jygl.gkjygl.gkjyr.xkzxx.service.XkzxxService;
 import com.xt.jygl.gkjygl.gkjyr.xkzxx.vo.XkzxxVo;
+import com.xt.jygl.gkjygl.gkjyr.zxjx.entity.ZxjxEntity;
+import com.xt.jygl.gkjygl.gkjyr.zxjx.service.ZxjxService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkbg.entity.XkzbgEntity;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkbg.service.XkzbgService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkbg.service.XkzbgfjService;
 import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.ctl.XkzsqCtl;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.entity.XkzjyfwEntity;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.entity.XkzsqEntity;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.service.XkzjyfwService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.service.XkzsqService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.service.XkzsqglbService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.service.XkzsqzscsService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkyx.entity.XkzyxEntity;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkyx.service.XkzyxService;
 import com.xtframe.core.anon.auth.RequiresPermissions;
 import com.xtframe.core.base.ctl.WebJsonResult;
 import com.xtframe.core.support.SecurityMgr;
@@ -94,6 +133,42 @@ public class XkzxxCtl extends BaseWebCtl {
 	private XkzglbService xkzglbService;
 	@Autowired
 	private AccessoryService accessoryService;
+	@Autowired
+	private XkzsqService xkzsqService;
+	@Autowired
+	private XkzbgService xkzbgService;
+	@Autowired
+	private XkzyxService xkzyxService;
+	@Autowired
+	private MtService mtService;
+	@Autowired
+	private ZyqService zyqService;
+	@Autowired
+	private BwService bwService;
+	@Autowired
+	private CgService cgService;
+	@Autowired
+	private CkService ckService;
+	@Autowired
+	private DcService dcService;
+	@Autowired
+	private RyService ryService;
+	@Autowired
+	private SssbService sssbService;
+	@Autowired
+	private QytzService qytzService;
+	@Autowired
+	private XkzsqzscsService xkzsqzscsService;
+	@Autowired
+	private XkzsqglbService xkzsqglbService;
+	@Autowired
+	private XkzbgfjService xkzbgfjService;
+	@Autowired
+	private XkzjyfwService xkzjyfwService;
+	@Autowired
+	private RyzsService ryzsService;
+	@Autowired
+	private ZxjxService zxjxService;
 
 	/**
 	 * 许可证管理
@@ -805,14 +880,33 @@ public class XkzxxCtl extends BaseWebCtl {
 
 	@RequestMapping(value = "/saveFz")
 	@ResponseBody
-	public WebJsonResult saveFz(MultipartFile zmpic, MultipartFile fmpic, Model model) {
+	public WebJsonResult saveFz(MultipartFile zmpic, MultipartFile fmpic, Model model, String id) {
 		WebJsonResult wr = success();
+		GkjyrVo gkjyr = new GkjyrVo();
+		if (isJyr()) {
+			gkjyr = getSsjyr();
+		} else {
+			XkzxxEntity xkzxx = xkzxxService.findOne(id);
+			if (xkzxx != null) {
+				GkjyrEntity jyr = gkjyrService.findOne(xkzxx.getGkjyr());
+				if (jyr != null) {
+					BeanUtils.copyProperties(jyr, gkjyr);
+					gkjyr.setSzdzw(null != jyr.getSzd() ? jyr.getSzd().getText() : "");
+					gkjyr.setSzgkzw(null != jyr.getSzgk() ? jyr.getSzgk().getGkmc() : "");
+					gkjyr.setSzgqzw(null != jyr.getSzgq() ? jyr.getSzgq().getGqmc() : "");
+
+					gkjyr.setSzd(null != jyr.getSzd() ? jyr.getSzd().getId() : "");
+					gkjyr.setSzgk(null != jyr.getSzgk() ? jyr.getSzgk().getId() : "");
+					gkjyr.setSzgq(null != jyr.getSzgq() ? jyr.getSzgq().getId() : "");
+				}
+			}
+		}
 		if (!StringUtils.isEmpty(zmpic) && zmpic.getSize() > 0) {
-			AccessoryEntity acc = accessoryService.saveFz(zmpic, getSsjyr(), "xkzxx");
+			AccessoryEntity acc = accessoryService.saveFz(zmpic, gkjyr, "xkzxx");
 			wr.setAttr("acc", acc);
 		}
 		if (!StringUtils.isEmpty(fmpic) && fmpic.getSize() > 0) {
-			AccessoryEntity acc = accessoryService.saveFz(fmpic, getSsjyr(), "xkzxx");
+			AccessoryEntity acc = accessoryService.saveFz(fmpic, gkjyr, "xkzxx");
 			wr.setAttr("fmacc", acc);
 		}
 		return wr;
@@ -948,6 +1042,741 @@ public class XkzxxCtl extends BaseWebCtl {
 		}
 		return voList;
 	}
+
+	@RequestMapping(value = "/editxkz")
+	public String editxkz(Model model, String id, String status,String menuid) {
+		model.addAttribute("menuid", menuid);
+		/*String jyrid = "";
+		if ("11".equals(status)) {
+			XkzsqEntity xkzsq = xkzsqService.findOne(id);
+			if (xkzsq != null) {
+				jyrid = xkzsq.getJyrid();
+			}
+		} else if ("12".equals(status)) {
+			XkzbgEntity xkzbg = xkzbgService.findOne(id);
+			if (xkzbg != null) {
+				// 变更经营人
+				GkjyrEntity bgjyr = gkjyrService.findOne(xkzbg.getJyrid());
+				jyrid = bgjyr.getYjyrid();
+			}
+		} else if ("13".equals(status)) {
+			XkzyxEntity xkzyx = xkzyxService.findOne(id);
+			if (xkzyx != null) {
+				jyrid = xkzyx.getJyrid();
+			}
+		}*/
+
+		XkzxxEntity xkzxx = xkzxxService.findByOpid(id, status);
+
+		if (xkzxx != null) {
+			XkzxxVo vo = new XkzxxVo();
+			BeanUtils.copyProperties(xkzxx, vo);
+			if (null != xkzxx.getGkjyr()) {
+				if (null != getSsjyr()) {
+					vo.setGkjyrzw(getSsjyr().getGkjyr());
+				}else{
+					vo.setGkjyrzw(gkjyrService.findOne(xkzxx.getGkjyr()).getGkjyr());
+				}
+
+			}
+			if (null != xkzxx.getYxqz()) {
+				String yxqz = DateTime.toString(xkzxx.getYxqz());
+				vo.setYxqzfmt(yxqz);
+			}
+			if (null != xkzxx.getYxqq()) {
+				String yxqq = DateTime.toString(xkzxx.getYxqq());
+				vo.setYxqqfmt(yxqq);
+			}
+			if (null != xkzxx.getFzrq()) {
+				String fzrq = DateTime.toString(xkzxx.getFzrq());
+				vo.setFzrqfmt(fzrq);
+			}
+
+			if (!StringUtils.isEmpty(xkzxx.getZmpicid())) {
+				AccessoryEntity acc = accessoryService.findOne(xkzxx.getZmpicid());
+				vo.setZmpicname(acc.getName());
+			} else {
+				vo.setZmpicid("");
+			}
+
+			if (!StringUtils.isEmpty(xkzxx.getFmpicid())) {
+				AccessoryEntity acc = accessoryService.findOne(xkzxx.getFmpicid());
+				vo.setFmpicname(acc.getName());
+			} else {
+				vo.setFmpicid("");
+			}
+			model.addAttribute("record", vo);
+			model.addAttribute("opId", id);
+		}
+
+		return "gkjygl/gkjyr/xkzxx/editxkz";
+	}
+
+	@RequestMapping(value = "/saveFzxkz")
+	@ResponseBody
+	public WebJsonResult saveFzxkz(Model model, String opId, XkzxxEntity code, String zmpicid, String fmpicid) {
+		// how:如果是新增直接保存,如果更新,先取出数据库中记录,然后更新页面传过来的字段
+		// why:这样的话一些在前台无需显示的字段保证不会丢失,同时一个个字段设置有助于bug排查
+		WebJsonResult wr = success();
+		try {
+			if (!StringUtils.isEmpty(code.getId())) {// 修改
+				XkzxxEntity xkzxx = xkzxxService.findOne(code.getId());
+				if (code.getGkjyr() != null) {
+					GkjyrEntity gkjyr = gkjyrService.findOne(code.getGkjyr());
+					xkzxx.setSsgq(gkjyr.getSzgq().getId());
+					xkzxx.setSzgk(gkjyr.getSzgk().getId());
+				}
+				xkzxx.setFddbr(code.getFddbr());
+				xkzxx.setDz(code.getDz());
+				xkzxx.setCq(code.getCq());
+				xkzxx.setZyqyfw(code.getZyqyfw());
+				xkzxx.setGkjyxkzh(code.getGkjyxkzh());
+				xkzxx.setFzjg(code.getFzjg());
+				xkzxx.setYxqz(code.getYxqz());
+				xkzxx.setYxqq(code.getYxqq());
+				xkzxx.setFzrq(code.getFzrq());
+				xkzxx.setIsflag("1");
+				xkzxx.setZmpicid(zmpicid);
+				xkzxx.setFmpicid(fmpicid);
+				if ("11".equals(xkzxx.getSfyx())) {
+					XkzsqEntity xkzsq = xkzsqService.findOne(opId);
+					xkzxx.setSfyx("1");
+					xkzxx = xkzxxService.save(xkzxx);
+					GkjyrEntity jyr = gkjyrService.findOne(xkzxx.getGkjyr());
+					// 经营人许可证更新
+					jyr.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
+					jyr.setFddbr(xkzxx.getFddbr());
+					jyr.setLxdh(xkzxx.getLxdh());
+					jyr.setCz(xkzsq.getCz());
+					jyr.setGkjyxkzh(xkzxx.getGkjyxkzh());
+					jyr.setJyfw(xkzxx.getZyqyfw());
+					jyr.setJyqy(xkzxx.getCq());
+					jyr.setFzrq(xkzxx.getFzrq());
+					jyr.setFzjg(xkzxx.getFzjg());
+					gkjyrService.save(jyr);
+
+					// xkzglb表操作
+					// 码头泊位储罐仓库堆场人员设备信息企业投资
+					List<XkzglbEntity> xkzglblist = xkzglbService.findByCzid(opId);
+					if (xkzglblist != null && xkzglblist.size() > 0) {
+						for (XkzglbEntity xkzglb : xkzglblist) {
+							xkzglb.setXkzid(xkzxx.getId());
+							xkzglb.setXkzbh(xkzxx.getGkjyxkzh());
+							xkzglbService.save(xkzglb);
+							if (xkzglb.getType().equals("1")) {
+								MtEntity mt = mtService.findOne(xkzglb.getYwid());
+								if (mt != null) {
+									mt.setXkzid(xkzxx.getId());
+									mtService.save(mt);
+								}
+							} else if (xkzglb.getType().equals("2")) {
+								BwEntity bw = bwService.findOne(xkzglb.getYwid());
+								if (bw != null) {
+									bw.setXkzid(xkzxx.getId());
+									bwService.save(bw);
+								}
+							} else if (xkzglb.getType().equals("3")) {
+								CgEntity cg = cgService.findOne(xkzglb.getYwid());
+								if (cg != null) {
+									cg.setXkzid(xkzxx.getId());
+									cgService.save(cg);
+								}
+							} else if (xkzglb.getType().equals("4")) {
+								CkEntity ck = ckService.findOne(xkzglb.getYwid());
+								if (ck != null) {
+									ck.setXkzid(xkzxx.getId());
+									ckService.save(ck);
+								}
+							} else if (xkzglb.getType().equals("5")) {
+								DcEntity dc = dcService.findOne(xkzglb.getYwid());
+								if (dc != null) {
+									dc.setXkzid(xkzxx.getId());
+									dcService.save(dc);
+								}
+							} else if (xkzglb.getType().equals("6")) {
+								RyEntity ry = ryService.findOne(xkzglb.getYwid());
+								if (ry != null) {
+									ry.setXkzid(xkzxx.getId());
+									ryService.save(ry);
+								}
+							} else if (xkzglb.getType().equals("7")) {
+								SssbEntity sssb = sssbService.findOne(xkzglb.getId());
+								if (sssb != null) {
+									sssb.setXkzid(xkzxx.getId());
+									sssbService.save(sssb);
+								}
+							} else if (xkzglb.getType().equals("8")) {
+								QytzEntity qytz = qytzService.findOne(xkzglb.getId());
+								if (qytz != null) {
+									qytz.setXkzid(xkzxx.getId());
+									qytzService.save(qytz);
+								}
+							} else if (xkzglb.getType().equals("9")) {
+								ZxjxEntity zxjx = zxjxService.findOne(xkzglb.getId());
+								if (zxjx != null) {
+									zxjx.setXkzid(xkzxx.getId());
+									zxjxService.save(zxjx);
+								}
+							}
+						}
+					}
+
+				} else if ("12".equals(xkzxx.getSfyx())) {
+					XkzbgEntity xkzbg = xkzbgService.findOne(opId);
+					// 变更经营人
+					GkjyrEntity bgjyr = gkjyrService.findOne(xkzbg.getJyrid());
+					// 原经营人
+					GkjyrEntity njyr = gkjyrService.findOne(bgjyr.getYjyrid());
+
+					njyr.setAqbmfzr(bgjyr.getAqbmfzr());
+					njyr.setAqfzrlxdh(bgjyr.getAqfzrlxdh());
+					njyr.setAqfzrsj(bgjyr.getAqfzrsj());
+					njyr.setAqfzrzbdh(bgjyr.getAqfzrzbdh());
+					njyr.setAqgljg(bgjyr.getAqgljg());
+					njyr.setAqid(bgjyr.getAqid());
+					njyr.setAqzgbm(bgjyr.getAqzgbm());
+					njyr.setAxcd(bgjyr.getAxcd());
+					njyr.setBafzjg(bgjyr.getBafzjg());
+					njyr.setBafzrq(bgjyr.getBafzrq());
+					njyr.setBayxq(bgjyr.getBayxq());
+					njyr.setBgdz(bgjyr.getBgdz());
+					njyr.setBgyfmj(bgjyr.getBgyfmj());
+					njyr.setBwzcd(bgjyr.getBwzcd());
+					njyr.setCbzzzl(bgjyr.getCbzzzl());
+					njyr.setCgsl(bgjyr.getCgsl());
+					njyr.setCgzrl(bgjyr.getCgzrl());
+					njyr.setCkzmj(bgjyr.getCkzmj());
+					njyr.setCyrysl(bgjyr.getCyrysl());
+					njyr.setCz(bgjyr.getCz());
+					njyr.setDtsj(bgjyr.getDtsj());
+					njyr.setFddbr(bgjyr.getFddbr());
+					njyr.setFjsszmj(bgjyr.getFjsszmj());
+					njyr.setFscxbw(bgjyr.getFscxbw());
+					njyr.setFzjg(bgjyr.getFzjg());
+					njyr.setFzrq(bgjyr.getFzrq());
+					njyr.setFzyxq(bgjyr.getFzyxq());
+					njyr.setGddjgs(bgjyr.getGddjgs());
+					njyr.setGisStatus(bgjyr.getGisStatus());
+					njyr.setGjjgdm(bgjyr.getGjjgdm());
+					njyr.setGkjyr(bgjyr.getGkjyr());
+					njyr.setGkjyxkzh(bgjyr.getGkjyxkzh());
+					njyr.setGkssbafhzsbh(bgjyr.getGkssbafhzsbh());
+					njyr.setGkwxhwzyfzbh(bgjyr.getGkwxhwzyfzbh());
+					njyr.setGsyyzzbh(bgjyr.getGsyyzzbh());
+					njyr.setGygxcd(bgjyr.getGygxcd());
+					njyr.setGzcbgs(bgjyr.getGzcbgs());
+					njyr.setJyfw(bgjyr.getJyfw());
+					njyr.setJyqy(bgjyr.getJyqy());
+					njyr.setJzx(bgjyr.getJzx());
+					njyr.setLtqzjgs(bgjyr.getLtqzjgs());
+					njyr.setLxdh(bgjyr.getLxdh());
+					njyr.setLymj(bgjyr.getLymj());
+					njyr.setMtbwzs(bgjyr.getMtbwzs());
+					njyr.setMtjgxs(bgjyr.getMtjgxs());
+					njyr.setMtqyhdgc(bgjyr.getMtqyhdgc());
+					njyr.setMzdjgs(bgjyr.getMzdjgs());
+					njyr.setParentJyrId(bgjyr.getParentJyrId());
+					njyr.setQcqzjgs(bgjyr.getQcqzjgs());
+					njyr.setQtjxgs(bgjyr.getQtjxgs());
+					njyr.setQyaqdj(bgjyr.getQyaqdj());
+					njyr.setQylx(bgjyr.getQylx());
+					njyr.setQyxz(bgjyr.getQyxz());
+					njyr.setQyzzjgdm(bgjyr.getQyzzjgdm());
+					njyr.setRs(bgjyr.getRs());
+					njyr.setScxbw(bgjyr.getScxbw());
+					njyr.setSftb(bgjyr.getSftb());
+					njyr.setSfwhqy(bgjyr.getSfwhqy());
+					njyr.setSfzdsp(bgjyr.getSfzdsp());
+					njyr.setSjntgnl(bgjyr.getSjntgnl());
+					njyr.setSndwmjzx(bgjyr.getSndwmjzx());
+					njyr.setSndwmttl(bgjyr.getSndwmttl());
+					njyr.setSndzjzx(bgjyr.getSndzjzx());
+					njyr.setSndzttl(bgjyr.getSndzttl());
+					njyr.setSsgkglbm(bgjyr.getSsgkglbm());
+					njyr.setSshydl(bgjyr.getSshydl());
+					njyr.setSshyz(bgjyr.getSshyz());
+					njyr.setSssbgs(bgjyr.getSssbgs());
+					njyr.setSzd(bgjyr.getSzd());
+					njyr.setSzgk(bgjyr.getSzgk());
+					njyr.setSzgq(bgjyr.getSzgq());
+					njyr.setTbzt(bgjyr.getTbzt());
+					njyr.setTczmj(bgjyr.getTczmj());
+					njyr.setTlzyxcd(bgjyr.getTlzyxcd());
+					njyr.setTzze(bgjyr.getTzze());
+					njyr.setWdjysbwsl(bgjyr.getWdjysbwsl());
+					njyr.setXcglpxrysl(bgjyr.getXcglpxrysl());
+					njyr.setXcglrysl(bgjyr.getXcglrysl());
+					njyr.setXczyrypxsl(bgjyr.getXczyrypxsl());
+					njyr.setXczyrysl(bgjyr.getXczyrysl());
+					njyr.setXsje(bgjyr.getXsje());
+					njyr.setXzqh(bgjyr.getXzqh());
+					njyr.setYwcqzm(bgjyr.getYwcqzm());
+					njyr.setYwjgys(bgjyr.getYwjgys());
+					njyr.setYzbm(bgjyr.getYzbm());
+					njyr.setZczb(bgjyr.getZczb());
+					njyr.setZcze(bgjyr.getZcze());
+					njyr.setZdkbnl(bgjyr.getZdkbnl());
+					njyr.setZxsbgs(bgjyr.getZxsbgs());
+					njyr.setZyhz(bgjyr.getZyhz());
+					njyr.setZyid(bgjyr.getZyid());
+					njyr.setZyjspxrysl(bgjyr.getZyjspxrysl());
+					njyr.setZyjsrysl(bgjyr.getZyjspxrysl());
+					njyr.setZywxhwpm(bgjyr.getZywxhwpm());
+					njyr.setZzagrysl(bgjyr.getZzagrysl());
+					njyr.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
+					njyr = gkjyrService.save(njyr);
+
+					// 原许可证操作
+					List<XkzxxEntity> yxkzlist = xkzxxService.findByJyrid(njyr.getId());
+					if (yxkzlist != null && yxkzlist.size() > 0) {
+						for (XkzxxEntity xkzxxentity : yxkzlist) {
+							xkzxxentity.setSfyx(Constants.XKZ_WX);
+							xkzxxentity.setIsflag("0");
+							xkzxxService.save(xkzxxentity);
+						}
+					}
+					xkzxx.setSfyx("1");
+					xkzxx = xkzxxService.save(xkzxx);
+
+					// 经营范围 业务种类
+					List<XkzjyfwEntity> list = xkzjyfwService.findByJyrid(xkzbg.getJyrid());
+
+					// 原经营范围操作
+					if (!StringUtils.isEmpty(xkzbg.getXjydy())) {
+						xkzjyfwService.deleteByJyrid(njyr.getId());
+						// 删除后同步修改更新时间
+						List<XkzjyfwEntity> xkzjys = xkzjyfwService.findByJyrid(njyr.getId());
+						for (XkzjyfwEntity xkzjy : xkzjys) {
+							xkzjy.setUpdateDateTime(new Timestamp(new Date().getTime()));
+							xkzjyfwService.save(xkzjy);
+						}
+						if (list != null && list.size() > 0) {
+							for (int i = 0; i < list.size(); i++) {
+								XkzjyfwEntity entity = list.get(i);
+								entity.setJyrid(njyr.getId());
+								xkzjyfwService.save(entity);
+							}
+						}
+					}
+
+					// 码头
+					// 原经营人码头操作
+					List<MtEntity> ymtlist = mtService.findByJyrid(njyr.getId());
+					if (ymtlist != null && ymtlist.size() > 0) {
+						for (MtEntity mt : ymtlist) {
+							mt.setXkzid("");
+							mtService.logicDelete(mt.getId());
+						}
+					}
+					String bgid = opId;
+					List<MtEntity> bgmtlist = mtService.findByJyrid(bgjyr.getId());
+					if (bgmtlist != null && bgmtlist.size() > 0) {
+						List<XkzglbEntity> xkzglb = xkzglbService.findByCzid(bgid, "1");
+						for (MtEntity mt : bgmtlist) {
+							MtEntity nmt = new MtEntity();
+							BeanUtils.copyProperties(mt, nmt);
+							// 判断是否关联许可证
+							boolean flag = false;
+							if (xkzglb != null && xkzglb.size() > 0) {
+								for (XkzglbEntity v : xkzglb) {
+									if (mt.getId().equals(v.getYwid())) {
+										flag = true;
+										break;
+									}
+								}
+							}
+							if (flag) {
+								nmt.setXkzid(xkzxx.getId());
+							}
+
+							if (StringUtils.isEmpty(mt.getYmtid())) {
+								nmt.setId("");
+								nmt.setSsjyr(njyr);
+								nmt.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
+								nmt = mtService.save(nmt);
+								mt.setYmtid(nmt.getId());
+								mtService.save(mt);
+							} else {
+								nmt.setId(mt.getYmtid());
+								nmt.setSsjyr(njyr);
+								nmt.setYmtid("");
+								nmt.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
+								mtService.save(nmt);
+							}
+						}
+					}
+					// 泊位
+
+					// 原经营人泊位操作
+					List<BwEntity> ybwlist = bwService.findByJyrid(njyr.getId());
+					if (ybwlist != null && ybwlist.size() > 0) {
+						for (BwEntity bw : ybwlist) {
+							bw.setXkzid("");
+							bwService.logicDelete(bw.getId());
+						}
+					}
+
+					List<BwEntity> bgbwlist = bwService.findByJyrid(bgjyr.getId());
+					if (bgbwlist != null && bgbwlist.size() > 0) {
+						List<XkzglbEntity> xkzglb = xkzglbService.findByCzid(bgid, "2");
+						for (BwEntity bw : bgbwlist) {
+							BwEntity nbw = new BwEntity();
+							BeanUtils.copyProperties(bw, nbw);
+							// 判断是否关联许可证
+							boolean flag = false;
+							if (xkzglb != null && xkzglb.size() > 0) {
+								for (XkzglbEntity v : xkzglb) {
+									if (bw.getId().equals(v.getYwid())) {
+										flag = true;
+										break;
+									}
+								}
+							}
+							if (flag) {
+								nbw.setXkzid(xkzxx.getId());
+							}
+							if (!StringUtils.isEmpty(bw.getSsmt())) {
+								MtEntity mt = mtService.findOne(bw.getSsmt().getYmtid());
+								nbw.setSsmt(mt);
+							}
+							if (StringUtils.isEmpty(bw.getYbwid())) {
+								nbw.setId("");
+								nbw.setSsjyr(njyr);
+								nbw.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
+								bwService.save(nbw);
+							} else {
+								nbw.setId(bw.getYbwid());
+								nbw.setSsjyr(njyr);
+								nbw.setYbwid("");
+								nbw.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
+								bwService.save(nbw);
+							}
+						}
+					}
+					// 储罐
+
+					// 原经营人储罐操作
+					List<CgEntity> ycglist = cgService.findByJyrid(njyr.getId());
+					if (ycglist != null && ycglist.size() > 0) {
+						for (CgEntity cg : ycglist) {
+							cg.setXkzid("");
+							cgService.logicDelete(cg.getId());
+						}
+					}
+
+					List<CgEntity> bgcglist = cgService.findByJyrid(bgjyr.getId());
+					if (bgcglist != null && bgcglist.size() > 0) {
+						List<XkzglbEntity> xkzglb = xkzglbService.findByCzid(bgid, "3");
+						for (CgEntity cg : bgcglist) {
+							CgEntity ncg = new CgEntity();
+							BeanUtils.copyProperties(cg, ncg);
+							// 判断是否关联许可证
+							boolean flag = false;
+							if (xkzglb != null && xkzglb.size() > 0) {
+								for (XkzglbEntity v : xkzglb) {
+									if (cg.getId().equals(v.getYwid())) {
+										flag = true;
+										break;
+									}
+								}
+							}
+							if (flag) {
+								ncg.setXkzid(xkzxx.getId());
+							}
+							if (StringUtils.isEmpty(cg.getYcgid())) {
+								ncg.setId("");
+								ncg.setSsjyr(njyr);
+								ncg.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
+								cgService.save(ncg);
+							} else {
+								ncg.setId(cg.getYcgid());
+								ncg.setSsjyr(njyr);
+								ncg.setYcgid("");
+								ncg.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
+								cgService.save(ncg);
+							}
+						}
+					}
+					// 仓库
+					// 原经营人仓库操作
+					List<CkEntity> ycklist = ckService.findByJyrid(njyr.getId());
+					if (ycklist != null && ycklist.size() > 0) {
+						for (CkEntity ck : ycklist) {
+							ck.setXkzid("");
+							ckService.logicDelete(ck.getId());
+						}
+					}
+
+					List<CkEntity> bgcklist = ckService.findByJyrid(bgjyr.getId());
+					if (bgcklist != null && bgcklist.size() > 0) {
+						List<XkzglbEntity> xkzglb = xkzglbService.findByCzid(bgid, "4");
+						for (CkEntity ck : bgcklist) {
+							CkEntity nck = new CkEntity();
+							BeanUtils.copyProperties(ck, nck);
+							// 判断是否关联许可证
+							boolean flag = false;
+							if (xkzglb != null && xkzglb.size() > 0) {
+								for (XkzglbEntity v : xkzglb) {
+									if (ck.getId().equals(v.getYwid())) {
+										flag = true;
+										break;
+									}
+								}
+							}
+							if (flag) {
+								nck.setXkzid(xkzxx.getId());
+							}
+							if (!StringUtils.isEmpty(ck.getSsmt())) {
+								MtEntity mt = mtService.findOne(ck.getSsmt().getYmtid());
+								nck.setSsmt(mt);
+							}
+							if (StringUtils.isEmpty(ck.getYckid())) {
+								nck.setId("");
+								nck.setSsjyr(njyr);
+								nck.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
+								ckService.save(nck);
+							} else {
+								nck.setId(ck.getYckid());
+								nck.setSsjyr(njyr);
+								nck.setYckid("");
+								nck.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
+								ckService.save(nck);
+							}
+						}
+					}
+					// 堆场
+
+					// 原经营人堆场操作
+					List<DcEntity> ydclist = dcService.findByJyrid(njyr.getId());
+					if (ydclist != null && ydclist.size() > 0) {
+						for (DcEntity dc : ydclist) {
+							dc.setXkzid("");
+							dcService.logicDelete(dc.getId());
+						}
+					}
+					List<DcEntity> bgdclist = dcService.findByJyrid(bgjyr.getId());
+					if (bgdclist != null && bgdclist.size() > 0) {
+						List<XkzglbEntity> xkzglb = xkzglbService.findByCzid(bgid, "5");
+						for (DcEntity dc : bgdclist) {
+							DcEntity ndc = new DcEntity();
+							BeanUtils.copyProperties(dc, ndc);
+							// 判断是否关联许可证
+							boolean flag = false;
+							if (xkzglb != null && xkzglb.size() > 0) {
+								for (XkzglbEntity v : xkzglb) {
+									if (dc.getId().equals(v.getYwid())) {
+										flag = true;
+										break;
+									}
+								}
+							}
+							if (flag) {
+								ndc.setXkzid(xkzxx.getId());
+							}
+							if (!StringUtils.isEmpty(dc.getSsmt())) {
+								MtEntity mt = mtService.findOne(dc.getSsmt().getYmtid());
+								ndc.setSsmt(mt);
+							}
+							if (StringUtils.isEmpty(dc.getYdcid())) {
+								ndc.setId("");
+								ndc.setSsjyr(njyr);
+								ndc.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
+								dcService.save(ndc);
+							} else {
+								ndc.setId(dc.getYdcid());
+								ndc.setSsjyr(njyr);
+								ndc.setYdcid("");
+								ndc.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
+								dcService.save(ndc);
+							}
+						}
+					}
+					// 人员
+					// 原经营人人员操作
+					List<RyEntity> yrylist = ryService.findByJyrid(njyr.getId());
+					if (yrylist != null && yrylist.size() > 0) {
+						for (RyEntity ry : yrylist) {
+							ry.setXkzid("");
+							ryService.logicDelete(ry.getId());
+						}
+					}
+
+					List<RyEntity> bgrylist = ryService.findByJyrid(bgjyr.getId());
+					if (bgrylist != null && bgrylist.size() > 0) {
+						List<XkzglbEntity> xkzglb = xkzglbService.findByCzid(bgid, "6");
+						for (RyEntity ry : bgrylist) {
+							RyEntity nry = new RyEntity();
+							BeanUtils.copyProperties(ry, nry);
+							// 判断是否关联许可证
+							boolean flag = false;
+							if (xkzglb != null && xkzglb.size() > 0) {
+								for (XkzglbEntity v : xkzglb) {
+									if (ry.getId().equals(v.getYwid())) {
+										flag = true;
+										break;
+									}
+								}
+							}
+							if (flag) {
+								nry.setXkzid(xkzxx.getId());
+							}
+							if (StringUtils.isEmpty(ry.getYryid())) {
+								nry.setId("");
+								nry.setSsjyr(njyr);
+								nry = ryService.save(nry);
+							} else {
+								nry.setId(ry.getYryid());
+								nry.setSsjyr(njyr);
+								nry.setYryid("");
+								nry = ryService.save(nry);
+							}
+							List<RyzsEntity> ryzslist = ryzsService.findZs(ry);
+							if (ryzslist != null && ryzslist.size() > 0) {
+								for (RyzsEntity ryzs : ryzslist) {
+									RyzsEntity nryzs = new RyzsEntity();
+									BeanUtils.copyProperties(ryzs, nryzs);
+									nryzs.setRyid(nry);
+									nryzs.setId(null);
+									ryzsService.save(nryzs);
+								}
+							}
+						}
+					}
+					// 设施设备
+					// 原经营人设施设备操作
+					List<SssbEntity> ysssblist = sssbService.findByJyrid(njyr.getId());
+					if (ysssblist != null && ysssblist.size() > 0) {
+						for (SssbEntity sssb : ysssblist) {
+							sssb.setXkzid("");
+							sssbService.logicDelete(sssb.getId());
+						}
+					}
+					List<SssbEntity> bgsssblist = sssbService.findByJyrid(bgjyr.getId());
+					if (bgsssblist != null && bgsssblist.size() > 0) {
+						List<XkzglbEntity> xkzglb = xkzglbService.findByCzid(bgid, "7");
+						for (SssbEntity sssb : bgsssblist) {
+							SssbEntity nsssb = new SssbEntity();
+							BeanUtils.copyProperties(sssb, nsssb);
+							// 判断是否关联许可证
+							boolean flag = false;
+							if (xkzglb != null && xkzglb.size() > 0) {
+								for (XkzglbEntity v : xkzglb) {
+									if (nsssb.getId().equals(v.getYwid())) {
+										flag = true;
+										break;
+									}
+								}
+							}
+							if (flag) {
+								nsssb.setXkzid(xkzxx.getId());
+							}
+							if (StringUtils.isEmpty(sssb.getYsssbid())) {
+								nsssb.setId("");
+								nsssb.setSsjyr(njyr);
+								sssbService.save(nsssb);
+							} else {
+								nsssb.setId(sssb.getYsssbid());
+								nsssb.setSsjyr(njyr);
+								nsssb.setYsssbid("");
+								sssbService.save(nsssb);
+							}
+						}
+					}
+					// 企业投资
+					// 原经营人企业投资操作
+					List<QytzEntity> yqytzlist = qytzService.findByJyrid(njyr.getId());
+					if (yqytzlist != null && yqytzlist.size() > 0) {
+						for (QytzEntity qytz : yqytzlist) {
+							qytz.setXkzid("");
+							qytzService.logicDelete(qytz.getId());
+						}
+					}
+					List<QytzEntity> bgqytzlist = qytzService.findByJyrid(bgjyr.getId());
+					if (bgqytzlist != null && bgqytzlist.size() > 0) {
+						List<XkzglbEntity> xkzglb = xkzglbService.findByCzid(bgid, "8");
+						for (QytzEntity qytz : bgqytzlist) {
+							QytzEntity nqytz = new QytzEntity();
+							BeanUtils.copyProperties(qytz, nqytz);
+							// 判断是否关联许可证
+							boolean flag = false;
+							if (xkzglb != null && xkzglb.size() > 0) {
+								for (XkzglbEntity v : xkzglb) {
+									if (qytz.getId().equals(v.getYwid())) {
+										flag = true;
+										break;
+									}
+								}
+							}
+							if (flag) {
+								nqytz.setXkzid(xkzxx.getId());
+							}
+							if (StringUtils.isEmpty(qytz.getYqytzid())) {
+								nqytz.setId("");
+								nqytz.setSsjyr(njyr);
+								qytzService.save(nqytz);
+							} else {
+								nqytz.setId(qytz.getYqytzid());
+								nqytz.setSsjyr(njyr);
+								nqytz.setYqytzid("");
+								qytzService.save(nqytz);
+							}
+						}
+					}
+
+					// 装卸机械
+					// 原经营人装卸机械操作
+					List<ZxjxEntity> yzxjxlist = zxjxService.findByJyrid(njyr.getId());
+					if (yzxjxlist != null && yzxjxlist.size() > 0) {
+						for (ZxjxEntity zxjx : yzxjxlist) {
+							zxjx.setXkzid("");
+							zxjxService.logicDelete(zxjx.getId());
+						}
+					}
+					List<ZxjxEntity> bgzxjxlist = zxjxService.findByJyrid(bgjyr.getId());
+					if (bgzxjxlist != null && bgzxjxlist.size() > 0) {
+						List<XkzglbEntity> xkzglb = xkzglbService.findByCzid(bgid, "9");
+						for (ZxjxEntity zxjx : bgzxjxlist) {
+							ZxjxEntity nzxjx = new ZxjxEntity();
+							BeanUtils.copyProperties(zxjx, nzxjx);
+							// 判断是否关联许可证
+							boolean flag = false;
+							if (xkzglb != null && xkzglb.size() > 0) {
+								for (XkzglbEntity v : xkzglb) {
+									if (zxjx.getId().equals(v.getYwid())) {
+										flag = true;
+										break;
+									}
+								}
+							}
+							if (flag) {
+								nzxjx.setXkzid(xkzxx.getId());
+							}
+							if (StringUtils.isEmpty(zxjx.getYzxjxid())) {
+								nzxjx.setId("");
+								nzxjx.setSsjyr(njyr);
+								zxjxService.save(nzxjx);
+							} else {
+								nzxjx.setId(zxjx.getYzxjxid());
+								nzxjx.setSsjyr(njyr);
+								nzxjx.setYzxjxid("");
+								zxjxService.save(nzxjx);
+							}
+						}
+					}
+
+				} else if ("13".equals(xkzxx.getSfyx())) {
+					xkzxx.setSfyx(Constants.XKZ_WSX);
+					xkzxx = xkzxxService.save(xkzxx);
+				}
+			}
+		} catch (Exception e) {
+			wr.setSuccess(false);
+			wr.setMessage("操作失败!");
+			e.printStackTrace();
+		}
+		return wr;
+	}
+
 	// @RequestMapping(value = "/exportExcelAll")
 	// public String exportExcelAll(HttpServletResponse response, final String
 	// gkjyr, final String szgqid, final String gkjyxkzh, final String szdid,

+ 3 - 0
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzxx/dao/XkzxxDao.java

@@ -17,6 +17,9 @@ public interface XkzxxDao extends SecRepository<XkzxxEntity, String> {
 	@Query("SELECT m from XkzxxEntity m where m.gkjyr =?1 and m.sfyx = ?2 and m.recordStatus<>9")
 	List<XkzxxEntity> findByJyrid(String jyrid, String status);
 	
+	@Query("SELECT m from XkzxxEntity m where m.opid =?1 and m.sfyx = ?2 and m.recordStatus<>9")
+	XkzxxEntity findByOpid(String opid, String status);
+	
 	@Query("SELECT m from XkzxxEntity m where m.gkjyr =?1 and m.recordStatus<>9")
 	List<XkzxxEntity> findByJyrid(String jyrid);
 

+ 18 - 0
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzxx/entity/XkzxxEntity.java

@@ -37,6 +37,7 @@ public class XkzxxEntity extends BaseEntity<String> implements Cloneable {
 	private String fzjg = null;
 	private Date fzrq = null;
 	private Date yxqz = null;
+	private Date yxqq = null;
 	private String qynbbh = null;
 	private String gkjyxkzh = null;
 	private String gkjyxkzsmj = null;
@@ -45,6 +46,15 @@ public class XkzxxEntity extends BaseEntity<String> implements Cloneable {
 	private String zmpicid = null;
 	private String fmpicid = null;
 	private String isflag = null;
+	private String opid= null;
+	
+	public String getOpid() {
+		return opid;
+	}
+
+	public void setOpid(String opid) {
+		this.opid = opid;
+	}
 
 	/**
 	 * ID主键
@@ -62,6 +72,14 @@ public class XkzxxEntity extends BaseEntity<String> implements Cloneable {
 		this.id = id;
 	}
 
+	public Date getYxqq() {
+		return yxqq;
+	}
+
+	public void setYxqq(Date yxqq) {
+		this.yxqq = yxqq;
+	}
+
 	public String getGkjyr() {
 		return gkjyr;
 	}

+ 2 - 0
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzxx/service/XkzxxService.java

@@ -16,6 +16,8 @@ public interface XkzxxService {
 	XkzxxEntity findOne(String id);
 
 	List<XkzxxEntity> findByJyrid(String jyrid, String status);
+	
+	XkzxxEntity findByOpid(String opid, String status);
 
 	List<XkzxxEntity> findByJyrid(String jyrid);
 	/***

+ 5 - 0
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzxx/service/impl/XkzxxServiceImpl.java

@@ -40,6 +40,11 @@ public class XkzxxServiceImpl extends JyglBaseService<XkzxxEntity, String> imple
 
 		return dao.selectCount(xkzbh);
 	}
+	
+	@Override
+	public XkzxxEntity findByOpid(String opid, String status) {
+		return dao.findByOpid(opid, status);
+	}
 
 	@Override
 	public List<XkzxxEntity> findByJyrid(String jyrid, String status) {

+ 28 - 0
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzxx/vo/XkzxxVo.java

@@ -22,6 +22,8 @@ public class XkzxxVo extends BaseVo {
 	private String fzjg = null;
 	private Date fzrq = null;
 	private String fzrqfmt = null;
+	private Date yxqq = null;
+	private String yxqqfmt = null;
 	private Date yxqz = null;
 	private String yxqzfmt = null;
 	private String qynbbh = null;
@@ -37,6 +39,32 @@ public class XkzxxVo extends BaseVo {
 	private String zmpicname= null;
 	private String fmpicname= null;
 	private String isflag = null;
+	private String opid = null;
+	
+	public String getOpid() {
+		return opid;
+	}
+
+	public void setOpid(String opid) {
+		this.opid = opid;
+	}
+
+	public Date getYxqq() {
+		return yxqq;
+	}
+
+	public void setYxqq(Date yxqq) {
+		this.yxqq = yxqq;
+	}
+
+	public String getYxqqfmt() {
+		return yxqqfmt;
+	}
+
+	public void setYxqqfmt(String yxqqfmt) {
+		this.yxqqfmt = yxqqfmt;
+	}
+
 	public String getZmpicname() {
 		return zmpicname;
 	}

+ 293 - 528
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkbg/ctl/XkzbgCtl.java

@@ -267,6 +267,12 @@ public class XkzbgCtl extends BaseWebCtl {
 							}
 						}
 					}
+					if (!isJyr()) {
+						XkzxxEntity xkz = xkzxxService.findByOpid(entity.getId(), "12");
+						if (xkz != null) {
+							vo.setOpflag("1");
+						}
+					}
 					voList.add(vo);
 				}
 			}
@@ -2824,136 +2830,108 @@ public class XkzbgCtl extends BaseWebCtl {
 				bgjyr.setJyfw(jyfwstr2);
 				bgjyr.setJyqy(jylzstr);
 			}
+			bgjyr.setRecordStatus(BaseEntity.RECORE_STATE_BGFLAG);
 			bgjyr = gkjyrService.save(bgjyr);
 			// 原数据操作
 			// 原经营人
 			GkjyrEntity njyr = gkjyrService.findOne(bgjyr.getYjyrid());
 
-			njyr.setAqbmfzr(bgjyr.getAqbmfzr());
-			njyr.setAqfzrlxdh(bgjyr.getAqfzrlxdh());
-			njyr.setAqfzrsj(bgjyr.getAqfzrsj());
-			njyr.setAqfzrzbdh(bgjyr.getAqfzrzbdh());
-			njyr.setAqgljg(bgjyr.getAqgljg());
-			njyr.setAqid(bgjyr.getAqid());
-			njyr.setAqzgbm(bgjyr.getAqzgbm());
-			njyr.setAxcd(bgjyr.getAxcd());
-			njyr.setBafzjg(bgjyr.getBafzjg());
-			njyr.setBafzrq(bgjyr.getBafzrq());
-			njyr.setBayxq(bgjyr.getBayxq());
-			njyr.setBgdz(bgjyr.getBgdz());
-			njyr.setBgyfmj(bgjyr.getBgyfmj());
-			njyr.setBwzcd(bgjyr.getBwzcd());
-			njyr.setCbzzzl(bgjyr.getCbzzzl());
-			njyr.setCgsl(bgjyr.getCgsl());
-			njyr.setCgzrl(bgjyr.getCgzrl());
-			njyr.setCkzmj(bgjyr.getCkzmj());
-			njyr.setCyrysl(bgjyr.getCyrysl());
-			njyr.setCz(bgjyr.getCz());
-			njyr.setDtsj(bgjyr.getDtsj());
-			njyr.setFddbr(bgjyr.getFddbr());
-			njyr.setFjsszmj(bgjyr.getFjsszmj());
-			njyr.setFscxbw(bgjyr.getFscxbw());
-			njyr.setFzjg(bgjyr.getFzjg());
-			njyr.setFzrq(bgjyr.getFzrq());
-			njyr.setFzyxq(bgjyr.getFzyxq());
-			njyr.setGddjgs(bgjyr.getGddjgs());
-			njyr.setGisStatus(bgjyr.getGisStatus());
-			njyr.setGjjgdm(bgjyr.getGjjgdm());
-			njyr.setGkjyr(bgjyr.getGkjyr());
-			njyr.setGkjyxkzh(bgjyr.getGkjyxkzh());
-			njyr.setGkssbafhzsbh(bgjyr.getGkssbafhzsbh());
-			njyr.setGkwxhwzyfzbh(bgjyr.getGkwxhwzyfzbh());
-			njyr.setGsyyzzbh(bgjyr.getGsyyzzbh());
-			njyr.setGygxcd(bgjyr.getGygxcd());
-			njyr.setGzcbgs(bgjyr.getGzcbgs());
-			njyr.setJyfw(bgjyr.getJyfw());
-			njyr.setJyqy(bgjyr.getJyqy());
-			njyr.setJzx(bgjyr.getJzx());
-			njyr.setLtqzjgs(bgjyr.getLtqzjgs());
-			njyr.setLxdh(bgjyr.getLxdh());
-			njyr.setLymj(bgjyr.getLymj());
-			njyr.setMtbwzs(bgjyr.getMtbwzs());
-			njyr.setMtjgxs(bgjyr.getMtjgxs());
-			njyr.setMtqyhdgc(bgjyr.getMtqyhdgc());
-			njyr.setMzdjgs(bgjyr.getMzdjgs());
-			njyr.setParentJyrId(bgjyr.getParentJyrId());
-			njyr.setQcqzjgs(bgjyr.getQcqzjgs());
-			njyr.setQtjxgs(bgjyr.getQtjxgs());
-			njyr.setQyaqdj(bgjyr.getQyaqdj());
-			njyr.setQylx(bgjyr.getQylx());
-			njyr.setQyxz(bgjyr.getQyxz());
-			njyr.setQyzzjgdm(bgjyr.getQyzzjgdm());
-			njyr.setRs(bgjyr.getRs());
-			njyr.setScxbw(bgjyr.getScxbw());
-			njyr.setSftb(bgjyr.getSftb());
-			njyr.setSfwhqy(bgjyr.getSfwhqy());
-			njyr.setSfzdsp(bgjyr.getSfzdsp());
-			njyr.setSjntgnl(bgjyr.getSjntgnl());
-			njyr.setSndwmjzx(bgjyr.getSndwmjzx());
-			njyr.setSndwmttl(bgjyr.getSndwmttl());
-			njyr.setSndzjzx(bgjyr.getSndzjzx());
-			njyr.setSndzttl(bgjyr.getSndzttl());
-			njyr.setSsgkglbm(bgjyr.getSsgkglbm());
-			njyr.setSshydl(bgjyr.getSshydl());
-			njyr.setSshyz(bgjyr.getSshyz());
-			njyr.setSssbgs(bgjyr.getSssbgs());
-			njyr.setSzd(bgjyr.getSzd());
-			njyr.setSzgk(bgjyr.getSzgk());
-			njyr.setSzgq(bgjyr.getSzgq());
-			njyr.setTbzt(bgjyr.getTbzt());
-			njyr.setTczmj(bgjyr.getTczmj());
-			njyr.setTlzyxcd(bgjyr.getTlzyxcd());
-			njyr.setTzze(bgjyr.getTzze());
-			njyr.setWdjysbwsl(bgjyr.getWdjysbwsl());
-			njyr.setXcglpxrysl(bgjyr.getXcglpxrysl());
-			njyr.setXcglrysl(bgjyr.getXcglrysl());
-			njyr.setXczyrypxsl(bgjyr.getXczyrypxsl());
-			njyr.setXczyrysl(bgjyr.getXczyrysl());
-			njyr.setXsje(bgjyr.getXsje());
-			njyr.setXzqh(bgjyr.getXzqh());
-			njyr.setYwcqzm(bgjyr.getYwcqzm());
-			njyr.setYwjgys(bgjyr.getYwjgys());
-			njyr.setYzbm(bgjyr.getYzbm());
-			njyr.setZczb(bgjyr.getZczb());
-			njyr.setZcze(bgjyr.getZcze());
-			njyr.setZdkbnl(bgjyr.getZdkbnl());
-			njyr.setZxsbgs(bgjyr.getZxsbgs());
-			njyr.setZyhz(bgjyr.getZyhz());
-			njyr.setZyid(bgjyr.getZyid());
-			njyr.setZyjspxrysl(bgjyr.getZyjspxrysl());
-			njyr.setZyjsrysl(bgjyr.getZyjspxrysl());
-			njyr.setZywxhwpm(bgjyr.getZywxhwpm());
-			njyr.setZzagrysl(bgjyr.getZzagrysl());
-			njyr.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
-			gkjyrService.save(njyr);
-
-			// 原经营范围操作
-			if (!StringUtils.isEmpty(xkzbg.getXjydy())) {
-				xkzjyfwService.deleteByJyrid(njyr.getId());
-				// 删除后同步修改更新时间
-				List<XkzjyfwEntity> xkzjys = xkzjyfwService.findByJyrid(njyr.getId());
-				for (XkzjyfwEntity xkzjy : xkzjys) {
-					xkzjy.setUpdateDateTime(new Timestamp(new Date().getTime()));
-					xkzjyfwService.save(xkzjy);
-				}
-				if (list != null && list.size() > 0) {
-					for (int i = 0; i < list.size(); i++) {
-						XkzjyfwEntity entity = list.get(i);
-						entity.setJyrid(njyr.getId());
-						xkzjyfwService.save(entity);
-					}
-				}
-			}
+			/*
+			 * njyr.setAqbmfzr(bgjyr.getAqbmfzr());
+			 * njyr.setAqfzrlxdh(bgjyr.getAqfzrlxdh());
+			 * njyr.setAqfzrsj(bgjyr.getAqfzrsj());
+			 * njyr.setAqfzrzbdh(bgjyr.getAqfzrzbdh());
+			 * njyr.setAqgljg(bgjyr.getAqgljg()); njyr.setAqid(bgjyr.getAqid());
+			 * njyr.setAqzgbm(bgjyr.getAqzgbm()); njyr.setAxcd(bgjyr.getAxcd());
+			 * njyr.setBafzjg(bgjyr.getBafzjg());
+			 * njyr.setBafzrq(bgjyr.getBafzrq());
+			 * njyr.setBayxq(bgjyr.getBayxq()); njyr.setBgdz(bgjyr.getBgdz());
+			 * njyr.setBgyfmj(bgjyr.getBgyfmj());
+			 * njyr.setBwzcd(bgjyr.getBwzcd());
+			 * njyr.setCbzzzl(bgjyr.getCbzzzl()); njyr.setCgsl(bgjyr.getCgsl());
+			 * njyr.setCgzrl(bgjyr.getCgzrl()); njyr.setCkzmj(bgjyr.getCkzmj());
+			 * njyr.setCyrysl(bgjyr.getCyrysl()); njyr.setCz(bgjyr.getCz());
+			 * njyr.setDtsj(bgjyr.getDtsj()); njyr.setFddbr(bgjyr.getFddbr());
+			 * njyr.setFjsszmj(bgjyr.getFjsszmj());
+			 * njyr.setFscxbw(bgjyr.getFscxbw()); njyr.setFzjg(bgjyr.getFzjg());
+			 * njyr.setFzrq(bgjyr.getFzrq()); njyr.setFzyxq(bgjyr.getFzyxq());
+			 * njyr.setGddjgs(bgjyr.getGddjgs());
+			 * njyr.setGisStatus(bgjyr.getGisStatus());
+			 * njyr.setGjjgdm(bgjyr.getGjjgdm());
+			 * njyr.setGkjyr(bgjyr.getGkjyr());
+			 * njyr.setGkjyxkzh(bgjyr.getGkjyxkzh());
+			 * njyr.setGkssbafhzsbh(bgjyr.getGkssbafhzsbh());
+			 * njyr.setGkwxhwzyfzbh(bgjyr.getGkwxhwzyfzbh());
+			 * njyr.setGsyyzzbh(bgjyr.getGsyyzzbh());
+			 * njyr.setGygxcd(bgjyr.getGygxcd());
+			 * njyr.setGzcbgs(bgjyr.getGzcbgs()); njyr.setJyfw(bgjyr.getJyfw());
+			 * njyr.setJyqy(bgjyr.getJyqy()); njyr.setJzx(bgjyr.getJzx());
+			 * njyr.setLtqzjgs(bgjyr.getLtqzjgs());
+			 * njyr.setLxdh(bgjyr.getLxdh()); njyr.setLymj(bgjyr.getLymj());
+			 * njyr.setMtbwzs(bgjyr.getMtbwzs());
+			 * njyr.setMtjgxs(bgjyr.getMtjgxs());
+			 * njyr.setMtqyhdgc(bgjyr.getMtqyhdgc());
+			 * njyr.setMzdjgs(bgjyr.getMzdjgs());
+			 * njyr.setParentJyrId(bgjyr.getParentJyrId());
+			 * njyr.setQcqzjgs(bgjyr.getQcqzjgs());
+			 * njyr.setQtjxgs(bgjyr.getQtjxgs());
+			 * njyr.setQyaqdj(bgjyr.getQyaqdj()); njyr.setQylx(bgjyr.getQylx());
+			 * njyr.setQyxz(bgjyr.getQyxz());
+			 * njyr.setQyzzjgdm(bgjyr.getQyzzjgdm()); njyr.setRs(bgjyr.getRs());
+			 * njyr.setScxbw(bgjyr.getScxbw()); njyr.setSftb(bgjyr.getSftb());
+			 * njyr.setSfwhqy(bgjyr.getSfwhqy());
+			 * njyr.setSfzdsp(bgjyr.getSfzdsp());
+			 * njyr.setSjntgnl(bgjyr.getSjntgnl());
+			 * njyr.setSndwmjzx(bgjyr.getSndwmjzx());
+			 * njyr.setSndwmttl(bgjyr.getSndwmttl());
+			 * njyr.setSndzjzx(bgjyr.getSndzjzx());
+			 * njyr.setSndzttl(bgjyr.getSndzttl());
+			 * njyr.setSsgkglbm(bgjyr.getSsgkglbm());
+			 * njyr.setSshydl(bgjyr.getSshydl());
+			 * njyr.setSshyz(bgjyr.getSshyz());
+			 * njyr.setSssbgs(bgjyr.getSssbgs()); njyr.setSzd(bgjyr.getSzd());
+			 * njyr.setSzgk(bgjyr.getSzgk()); njyr.setSzgq(bgjyr.getSzgq());
+			 * njyr.setTbzt(bgjyr.getTbzt()); njyr.setTczmj(bgjyr.getTczmj());
+			 * njyr.setTlzyxcd(bgjyr.getTlzyxcd());
+			 * njyr.setTzze(bgjyr.getTzze());
+			 * njyr.setWdjysbwsl(bgjyr.getWdjysbwsl());
+			 * njyr.setXcglpxrysl(bgjyr.getXcglpxrysl());
+			 * njyr.setXcglrysl(bgjyr.getXcglrysl());
+			 * njyr.setXczyrypxsl(bgjyr.getXczyrypxsl());
+			 * njyr.setXczyrysl(bgjyr.getXczyrysl());
+			 * njyr.setXsje(bgjyr.getXsje()); njyr.setXzqh(bgjyr.getXzqh());
+			 * njyr.setYwcqzm(bgjyr.getYwcqzm());
+			 * njyr.setYwjgys(bgjyr.getYwjgys()); njyr.setYzbm(bgjyr.getYzbm());
+			 * njyr.setZczb(bgjyr.getZczb()); njyr.setZcze(bgjyr.getZcze());
+			 * njyr.setZdkbnl(bgjyr.getZdkbnl());
+			 * njyr.setZxsbgs(bgjyr.getZxsbgs()); njyr.setZyhz(bgjyr.getZyhz());
+			 * njyr.setZyid(bgjyr.getZyid());
+			 * njyr.setZyjspxrysl(bgjyr.getZyjspxrysl());
+			 * njyr.setZyjsrysl(bgjyr.getZyjspxrysl());
+			 * njyr.setZywxhwpm(bgjyr.getZywxhwpm());
+			 * njyr.setZzagrysl(bgjyr.getZzagrysl());
+			 * njyr.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
+			 * gkjyrService.save(njyr);
+			 * 
+			 * // 原经营范围操作 if (!StringUtils.isEmpty(xkzbg.getXjydy())) {
+			 * xkzjyfwService.deleteByJyrid(njyr.getId()); // 删除后同步修改更新时间
+			 * List<XkzjyfwEntity> xkzjys =
+			 * xkzjyfwService.findByJyrid(njyr.getId()); for (XkzjyfwEntity
+			 * xkzjy : xkzjys) { xkzjy.setUpdateDateTime(new Timestamp(new
+			 * Date().getTime())); xkzjyfwService.save(xkzjy); } if (list !=
+			 * null && list.size() > 0) { for (int i = 0; i < list.size(); i++)
+			 * { XkzjyfwEntity entity = list.get(i);
+			 * entity.setJyrid(njyr.getId()); xkzjyfwService.save(entity); } } }
+			 */
 
 			// 原许可证操作
-			List<XkzxxEntity> yxkzlist = xkzxxService.findByJyrid(njyr.getId());
-			if (yxkzlist != null && yxkzlist.size() > 0) {
-				for (XkzxxEntity xkzxx : yxkzlist) {
-					xkzxx.setSfyx(Constants.XKZ_WX);
-					xkzxx.setIsflag("0");
-					xkzxxService.save(xkzxx);
-				}
-			}
+			/*
+			 * List<XkzxxEntity> yxkzlist =
+			 * xkzxxService.findByJyrid(njyr.getId()); if (yxkzlist != null &&
+			 * yxkzlist.size() > 0) { for (XkzxxEntity xkzxx : yxkzlist) {
+			 * xkzxx.setSfyx(Constants.XKZ_WX); xkzxx.setIsflag("0");
+			 * xkzxxService.save(xkzxx); } }
+			 */
 			XkzxxEntity xkz = new XkzxxEntity();
 			xkz.setGkjyr(njyr.getId());
 			xkz.setSpr(user.getName());
@@ -2964,9 +2942,9 @@ public class XkzbgCtl extends BaseWebCtl {
 				xkz.setDz(xkzbg.getXbgdz());
 			}
 			if (StringUtils.isEmpty(xkzbg.getXfddbr())) {
-				xkz.setDz(xkzbg.getYfddbr());
+				xkz.setFddbr(xkzbg.getYfddbr());
 			} else {
-				xkz.setDz(xkzbg.getXfddbr());
+				xkz.setFddbr(xkzbg.getXfddbr());
 			}
 			if (!StringUtils.isEmpty(njyr.getSzgq())) {
 				xkz.setSsgq(njyr.getSzgq().getId());
@@ -2988,12 +2966,14 @@ public class XkzbgCtl extends BaseWebCtl {
 			}
 			xkz.setGkjyxkzh(xkzbg.getXkzbh());
 			xkz.setFzrq(new Date());
+			xkz.setYxqq(new Date());
 			dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd");
 			String date = dateTimeFormat.format(xkz.getFzrq());
 			String t = (Integer.parseInt(date.substring(0, 4)) + 3) + date.substring(4);
 			xkz.setYxqz(dateTimeFormat.parse(t));
-			xkz.setSfyx(Constants.XKZ_SX);
+			xkz.setSfyx("12");
 			xkz.setIsflag("0");
+			xkz.setOpid(bgid);
 			xkzxxService.save(xkz);
 
 			// xkzglb表操作
@@ -3008,408 +2988,193 @@ public class XkzbgCtl extends BaseWebCtl {
 			}
 			// 码头
 			// 原经营人码头操作
-			List<MtEntity> ymtlist = mtService.findByJyrid(njyr.getId());
-			if (ymtlist != null && ymtlist.size() > 0) {
-				for (MtEntity mt : ymtlist) {
-					mt.setXkzid("");
-					mtService.logicDelete(mt.getId());
-				}
-			}
-
-			List<MtEntity> bgmtlist = mtService.findByJyrid(bgjyr.getId());
-			if (bgmtlist != null && bgmtlist.size() > 0) {
-				List<XkzglbEntity> xkzglb = xkzglbService.findByCzid(bgid, "1");
-				for (MtEntity mt : bgmtlist) {
-					MtEntity nmt = new MtEntity();
-					BeanUtils.copyProperties(mt, nmt);
-					// 判断是否关联许可证
-					boolean flag = false;
-					if (xkzglb != null && xkzglb.size() > 0) {
-						for (XkzglbEntity v : xkzglb) {
-							if (mt.getId().equals(v.getYwid())) {
-								flag = true;
-								break;
-							}
-						}
-					}
-					if (flag) {
-						nmt.setXkzid(xkz.getId());
-					}
-
-					if (StringUtils.isEmpty(mt.getYmtid())) {
-						nmt.setId("");
-						nmt.setSsjyr(njyr);
-						nmt.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
-						nmt = mtService.save(nmt);
-						mt.setYmtid(nmt.getId());
-						mtService.save(mt);
-					} else {
-						nmt.setId(mt.getYmtid());
-						nmt.setSsjyr(njyr);
-						nmt.setYmtid("");
-						nmt.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
-						mtService.save(nmt);
-					}
-				}
-			}
-			// 泊位
-
-			// 原经营人泊位操作
-			List<BwEntity> ybwlist = bwService.findByJyrid(njyr.getId());
-			if (ybwlist != null && ybwlist.size() > 0) {
-				for (BwEntity bw : ybwlist) {
-					bw.setXkzid("");
-					bwService.logicDelete(bw.getId());
-				}
-			}
-
-			List<BwEntity> bgbwlist = bwService.findByJyrid(bgjyr.getId());
-			if (bgbwlist != null && bgbwlist.size() > 0) {
-				List<XkzglbEntity> xkzglb = xkzglbService.findByCzid(bgid, "2");
-				for (BwEntity bw : bgbwlist) {
-					BwEntity nbw = new BwEntity();
-					BeanUtils.copyProperties(bw, nbw);
-					// 判断是否关联许可证
-					boolean flag = false;
-					if (xkzglb != null && xkzglb.size() > 0) {
-						for (XkzglbEntity v : xkzglb) {
-							if (bw.getId().equals(v.getYwid())) {
-								flag = true;
-								break;
-							}
-						}
-					}
-					if (flag) {
-						nbw.setXkzid(xkz.getId());
-					}
-					if (!StringUtils.isEmpty(bw.getSsmt())) {
-						MtEntity mt = mtService.findOne(bw.getSsmt().getYmtid());
-						nbw.setSsmt(mt);
-					}
-					if (StringUtils.isEmpty(bw.getYbwid())) {
-						nbw.setId("");
-						nbw.setSsjyr(njyr);
-						nbw.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
-						bwService.save(nbw);
-					} else {
-						nbw.setId(bw.getYbwid());
-						nbw.setSsjyr(njyr);
-						nbw.setYbwid("");
-						nbw.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
-						bwService.save(nbw);
-					}
-				}
-			}
-			// 储罐
-
-			// 原经营人储罐操作
-			List<CgEntity> ycglist = cgService.findByJyrid(njyr.getId());
-			if (ycglist != null && ycglist.size() > 0) {
-				for (CgEntity cg : ycglist) {
-					cg.setXkzid("");
-					cgService.logicDelete(cg.getId());
-				}
-			}
-
-			List<CgEntity> bgcglist = cgService.findByJyrid(bgjyr.getId());
-			if (bgcglist != null && bgcglist.size() > 0) {
-				List<XkzglbEntity> xkzglb = xkzglbService.findByCzid(bgid, "3");
-				for (CgEntity cg : bgcglist) {
-					CgEntity ncg = new CgEntity();
-					BeanUtils.copyProperties(cg, ncg);
-					// 判断是否关联许可证
-					boolean flag = false;
-					if (xkzglb != null && xkzglb.size() > 0) {
-						for (XkzglbEntity v : xkzglb) {
-							if (cg.getId().equals(v.getYwid())) {
-								flag = true;
-								break;
-							}
-						}
-					}
-					if (flag) {
-						ncg.setXkzid(xkz.getId());
-					}
-					if (StringUtils.isEmpty(cg.getYcgid())) {
-						ncg.setId("");
-						ncg.setSsjyr(njyr);
-						ncg.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
-						cgService.save(ncg);
-					} else {
-						ncg.setId(cg.getYcgid());
-						ncg.setSsjyr(njyr);
-						ncg.setYcgid("");
-						ncg.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
-						cgService.save(ncg);
-					}
-				}
-			}
-			// 仓库
-			// 原经营人仓库操作
-			List<CkEntity> ycklist = ckService.findByJyrid(njyr.getId());
-			if (ycklist != null && ycklist.size() > 0) {
-				for (CkEntity ck : ycklist) {
-					ck.setXkzid("");
-					ckService.logicDelete(ck.getId());
-				}
-			}
-
-			List<CkEntity> bgcklist = ckService.findByJyrid(bgjyr.getId());
-			if (bgcklist != null && bgcklist.size() > 0) {
-				List<XkzglbEntity> xkzglb = xkzglbService.findByCzid(bgid, "4");
-				for (CkEntity ck : bgcklist) {
-					CkEntity nck = new CkEntity();
-					BeanUtils.copyProperties(ck, nck);
-					// 判断是否关联许可证
-					boolean flag = false;
-					if (xkzglb != null && xkzglb.size() > 0) {
-						for (XkzglbEntity v : xkzglb) {
-							if (ck.getId().equals(v.getYwid())) {
-								flag = true;
-								break;
-							}
-						}
-					}
-					if (flag) {
-						nck.setXkzid(xkz.getId());
-					}
-					if (!StringUtils.isEmpty(ck.getSsmt())) {
-						MtEntity mt = mtService.findOne(ck.getSsmt().getYmtid());
-						nck.setSsmt(mt);
-					}
-					if (StringUtils.isEmpty(ck.getYckid())) {
-						nck.setId("");
-						nck.setSsjyr(njyr);
-						nck.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
-						ckService.save(nck);
-					} else {
-						nck.setId(ck.getYckid());
-						nck.setSsjyr(njyr);
-						nck.setYckid("");
-						nck.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
-						ckService.save(nck);
-					}
-				}
-			}
-			// 堆场
-
-			// 原经营人堆场操作
-			List<DcEntity> ydclist = dcService.findByJyrid(njyr.getId());
-			if (ydclist != null && ydclist.size() > 0) {
-				for (DcEntity dc : ydclist) {
-					dc.setXkzid("");
-					dcService.logicDelete(dc.getId());
-				}
-			}
-			List<DcEntity> bgdclist = dcService.findByJyrid(bgjyr.getId());
-			if (bgdclist != null && bgdclist.size() > 0) {
-				List<XkzglbEntity> xkzglb = xkzglbService.findByCzid(bgid, "5");
-				for (DcEntity dc : bgdclist) {
-					DcEntity ndc = new DcEntity();
-					BeanUtils.copyProperties(dc, ndc);
-					// 判断是否关联许可证
-					boolean flag = false;
-					if (xkzglb != null && xkzglb.size() > 0) {
-						for (XkzglbEntity v : xkzglb) {
-							if (dc.getId().equals(v.getYwid())) {
-								flag = true;
-								break;
-							}
-						}
-					}
-					if (flag) {
-						ndc.setXkzid(xkz.getId());
-					}
-					if (!StringUtils.isEmpty(dc.getSsmt())) {
-						MtEntity mt = mtService.findOne(dc.getSsmt().getYmtid());
-						ndc.setSsmt(mt);
-					}
-					if (StringUtils.isEmpty(dc.getYdcid())) {
-						ndc.setId("");
-						ndc.setSsjyr(njyr);
-						ndc.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
-						dcService.save(ndc);
-					} else {
-						ndc.setId(dc.getYdcid());
-						ndc.setSsjyr(njyr);
-						ndc.setYdcid("");
-						ndc.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
-						dcService.save(ndc);
-					}
-				}
-			}
-			// 人员
-			// 原经营人人员操作
-			List<RyEntity> yrylist = ryService.findByJyrid(njyr.getId());
-			if (yrylist != null && yrylist.size() > 0) {
-				for (RyEntity ry : yrylist) {
-					ry.setXkzid("");
-					ryService.logicDelete(ry.getId());
-				}
-			}
-
-			List<RyEntity> bgrylist = ryService.findByJyrid(bgjyr.getId());
-			if (bgrylist != null && bgrylist.size() > 0) {
-				List<XkzglbEntity> xkzglb = xkzglbService.findByCzid(bgid, "6");
-				for (RyEntity ry : bgrylist) {
-					RyEntity nry = new RyEntity();
-					BeanUtils.copyProperties(ry, nry);
-					// 判断是否关联许可证
-					boolean flag = false;
-					if (xkzglb != null && xkzglb.size() > 0) {
-						for (XkzglbEntity v : xkzglb) {
-							if (ry.getId().equals(v.getYwid())) {
-								flag = true;
-								break;
-							}
-						}
-					}
-					if (flag) {
-						nry.setXkzid(xkz.getId());
-					}
-					if (StringUtils.isEmpty(ry.getYryid())) {
-						nry.setId("");
-						nry.setSsjyr(njyr);
-						nry = ryService.save(nry);
-					} else {
-						nry.setId(ry.getYryid());
-						nry.setSsjyr(njyr);
-						nry.setYryid("");
-						nry = ryService.save(nry);
-					}
-					List<RyzsEntity> ryzslist = ryzsService.findZs(ry);
-					if (ryzslist != null && ryzslist.size() > 0) {
-						for (RyzsEntity ryzs : ryzslist) {
-							RyzsEntity nryzs = new RyzsEntity();
-							BeanUtils.copyProperties(ryzs, nryzs);
-							nryzs.setRyid(nry);
-							nryzs.setId(null);
-							ryzsService.save(nryzs);
-						}
-					}
-				}
-			}
-			// 设施设备
-			// 原经营人设施设备操作
-			List<SssbEntity> ysssblist = sssbService.findByJyrid(njyr.getId());
-			if (ysssblist != null && ysssblist.size() > 0) {
-				for (SssbEntity sssb : ysssblist) {
-					sssb.setXkzid("");
-					sssbService.logicDelete(sssb.getId());
-				}
-			}
-			List<SssbEntity> bgsssblist = sssbService.findByJyrid(bgjyr.getId());
-			if (bgsssblist != null && bgsssblist.size() > 0) {
-				List<XkzglbEntity> xkzglb = xkzglbService.findByCzid(bgid, "7");
-				for (SssbEntity sssb : bgsssblist) {
-					SssbEntity nsssb = new SssbEntity();
-					BeanUtils.copyProperties(sssb, nsssb);
-					// 判断是否关联许可证
-					boolean flag = false;
-					if (xkzglb != null && xkzglb.size() > 0) {
-						for (XkzglbEntity v : xkzglb) {
-							if (nsssb.getId().equals(v.getYwid())) {
-								flag = true;
-								break;
-							}
-						}
-					}
-					if (flag) {
-						nsssb.setXkzid(xkz.getId());
-					}
-					if (StringUtils.isEmpty(sssb.getYsssbid())) {
-						nsssb.setId("");
-						nsssb.setSsjyr(njyr);
-						sssbService.save(nsssb);
-					} else {
-						nsssb.setId(sssb.getYsssbid());
-						nsssb.setSsjyr(njyr);
-						nsssb.setYsssbid("");
-						sssbService.save(nsssb);
-					}
-				}
-			}
-			// 企业投资
-			// 原经营人企业投资操作
-			List<QytzEntity> yqytzlist = qytzService.findByJyrid(njyr.getId());
-			if (yqytzlist != null && yqytzlist.size() > 0) {
-				for (QytzEntity qytz : yqytzlist) {
-					qytz.setXkzid("");
-					qytzService.logicDelete(qytz.getId());
-				}
-			}
-			List<QytzEntity> bgqytzlist = qytzService.findByJyrid(bgjyr.getId());
-			if (bgqytzlist != null && bgqytzlist.size() > 0) {
-				List<XkzglbEntity> xkzglb = xkzglbService.findByCzid(bgid, "8");
-				for (QytzEntity qytz : bgqytzlist) {
-					QytzEntity nqytz = new QytzEntity();
-					BeanUtils.copyProperties(qytz, nqytz);
-					// 判断是否关联许可证
-					boolean flag = false;
-					if (xkzglb != null && xkzglb.size() > 0) {
-						for (XkzglbEntity v : xkzglb) {
-							if (qytz.getId().equals(v.getYwid())) {
-								flag = true;
-								break;
-							}
-						}
-					}
-					if (flag) {
-						nqytz.setXkzid(xkz.getId());
-					}
-					if (StringUtils.isEmpty(qytz.getYqytzid())) {
-						nqytz.setId("");
-						nqytz.setSsjyr(njyr);
-						qytzService.save(nqytz);
-					} else {
-						nqytz.setId(qytz.getYqytzid());
-						nqytz.setSsjyr(njyr);
-						nqytz.setYqytzid("");
-						qytzService.save(nqytz);
-					}
-				}
-			}
-
-			// 装卸机械
-			// 原经营人装卸机械操作
-			List<ZxjxEntity> yzxjxlist = zxjxService.findByJyrid(njyr.getId());
-			if (yzxjxlist != null && yzxjxlist.size() > 0) {
-				for (ZxjxEntity zxjx : yzxjxlist) {
-					zxjx.setXkzid("");
-					zxjxService.logicDelete(zxjx.getId());
-				}
-			}
-			List<ZxjxEntity> bgzxjxlist = zxjxService.findByJyrid(bgjyr.getId());
-			if (bgzxjxlist != null && bgzxjxlist.size() > 0) {
-				List<XkzglbEntity> xkzglb = xkzglbService.findByCzid(bgid, "9");
-				for (ZxjxEntity zxjx : bgzxjxlist) {
-					ZxjxEntity nzxjx = new ZxjxEntity();
-					BeanUtils.copyProperties(zxjx, nzxjx);
-					// 判断是否关联许可证
-					boolean flag = false;
-					if (xkzglb != null && xkzglb.size() > 0) {
-						for (XkzglbEntity v : xkzglb) {
-							if (zxjx.getId().equals(v.getYwid())) {
-								flag = true;
-								break;
-							}
-						}
-					}
-					if (flag) {
-						nzxjx.setXkzid(xkz.getId());
-					}
-					if (StringUtils.isEmpty(zxjx.getYzxjxid())) {
-						nzxjx.setId("");
-						nzxjx.setSsjyr(njyr);
-						zxjxService.save(nzxjx);
-					} else {
-						nzxjx.setId(zxjx.getYzxjxid());
-						nzxjx.setSsjyr(njyr);
-						nzxjx.setYzxjxid("");
-						zxjxService.save(nzxjx);
-					}
-				}
-			}
+			/*
+			 * List<MtEntity> ymtlist = mtService.findByJyrid(njyr.getId()); if
+			 * (ymtlist != null && ymtlist.size() > 0) { for (MtEntity mt :
+			 * ymtlist) { mt.setXkzid(""); mtService.logicDelete(mt.getId()); }
+			 * }
+			 * 
+			 * List<MtEntity> bgmtlist = mtService.findByJyrid(bgjyr.getId());
+			 * if (bgmtlist != null && bgmtlist.size() > 0) { List<XkzglbEntity>
+			 * xkzglb = xkzglbService.findByCzid(bgid, "1"); for (MtEntity mt :
+			 * bgmtlist) { MtEntity nmt = new MtEntity();
+			 * BeanUtils.copyProperties(mt, nmt); // 判断是否关联许可证 boolean flag =
+			 * false; if (xkzglb != null && xkzglb.size() > 0) { for
+			 * (XkzglbEntity v : xkzglb) { if (mt.getId().equals(v.getYwid())) {
+			 * flag = true; break; } } } if (flag) { nmt.setXkzid(xkz.getId());
+			 * }
+			 * 
+			 * if (StringUtils.isEmpty(mt.getYmtid())) { nmt.setId("");
+			 * nmt.setSsjyr(njyr);
+			 * nmt.setRecordStatus(BaseEntity.RECORD_STATE_VALID); nmt =
+			 * mtService.save(nmt); mt.setYmtid(nmt.getId());
+			 * mtService.save(mt); } else { nmt.setId(mt.getYmtid());
+			 * nmt.setSsjyr(njyr); nmt.setYmtid("");
+			 * nmt.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
+			 * mtService.save(nmt); } } } // 泊位
+			 * 
+			 * // 原经营人泊位操作 List<BwEntity> ybwlist =
+			 * bwService.findByJyrid(njyr.getId()); if (ybwlist != null &&
+			 * ybwlist.size() > 0) { for (BwEntity bw : ybwlist) {
+			 * bw.setXkzid(""); bwService.logicDelete(bw.getId()); } }
+			 * 
+			 * List<BwEntity> bgbwlist = bwService.findByJyrid(bgjyr.getId());
+			 * if (bgbwlist != null && bgbwlist.size() > 0) { List<XkzglbEntity>
+			 * xkzglb = xkzglbService.findByCzid(bgid, "2"); for (BwEntity bw :
+			 * bgbwlist) { BwEntity nbw = new BwEntity();
+			 * BeanUtils.copyProperties(bw, nbw); // 判断是否关联许可证 boolean flag =
+			 * false; if (xkzglb != null && xkzglb.size() > 0) { for
+			 * (XkzglbEntity v : xkzglb) { if (bw.getId().equals(v.getYwid())) {
+			 * flag = true; break; } } } if (flag) { nbw.setXkzid(xkz.getId());
+			 * } if (!StringUtils.isEmpty(bw.getSsmt())) { MtEntity mt =
+			 * mtService.findOne(bw.getSsmt().getYmtid()); nbw.setSsmt(mt); } if
+			 * (StringUtils.isEmpty(bw.getYbwid())) { nbw.setId("");
+			 * nbw.setSsjyr(njyr);
+			 * nbw.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
+			 * bwService.save(nbw); } else { nbw.setId(bw.getYbwid());
+			 * nbw.setSsjyr(njyr); nbw.setYbwid("");
+			 * nbw.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
+			 * bwService.save(nbw); } } } // 储罐
+			 * 
+			 * // 原经营人储罐操作 List<CgEntity> ycglist =
+			 * cgService.findByJyrid(njyr.getId()); if (ycglist != null &&
+			 * ycglist.size() > 0) { for (CgEntity cg : ycglist) {
+			 * cg.setXkzid(""); cgService.logicDelete(cg.getId()); } }
+			 * 
+			 * List<CgEntity> bgcglist = cgService.findByJyrid(bgjyr.getId());
+			 * if (bgcglist != null && bgcglist.size() > 0) { List<XkzglbEntity>
+			 * xkzglb = xkzglbService.findByCzid(bgid, "3"); for (CgEntity cg :
+			 * bgcglist) { CgEntity ncg = new CgEntity();
+			 * BeanUtils.copyProperties(cg, ncg); // 判断是否关联许可证 boolean flag =
+			 * false; if (xkzglb != null && xkzglb.size() > 0) { for
+			 * (XkzglbEntity v : xkzglb) { if (cg.getId().equals(v.getYwid())) {
+			 * flag = true; break; } } } if (flag) { ncg.setXkzid(xkz.getId());
+			 * } if (StringUtils.isEmpty(cg.getYcgid())) { ncg.setId("");
+			 * ncg.setSsjyr(njyr);
+			 * ncg.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
+			 * cgService.save(ncg); } else { ncg.setId(cg.getYcgid());
+			 * ncg.setSsjyr(njyr); ncg.setYcgid("");
+			 * ncg.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
+			 * cgService.save(ncg); } } } // 仓库 // 原经营人仓库操作 List<CkEntity>
+			 * ycklist = ckService.findByJyrid(njyr.getId()); if (ycklist !=
+			 * null && ycklist.size() > 0) { for (CkEntity ck : ycklist) {
+			 * ck.setXkzid(""); ckService.logicDelete(ck.getId()); } }
+			 * 
+			 * List<CkEntity> bgcklist = ckService.findByJyrid(bgjyr.getId());
+			 * if (bgcklist != null && bgcklist.size() > 0) { List<XkzglbEntity>
+			 * xkzglb = xkzglbService.findByCzid(bgid, "4"); for (CkEntity ck :
+			 * bgcklist) { CkEntity nck = new CkEntity();
+			 * BeanUtils.copyProperties(ck, nck); // 判断是否关联许可证 boolean flag =
+			 * false; if (xkzglb != null && xkzglb.size() > 0) { for
+			 * (XkzglbEntity v : xkzglb) { if (ck.getId().equals(v.getYwid())) {
+			 * flag = true; break; } } } if (flag) { nck.setXkzid(xkz.getId());
+			 * } if (!StringUtils.isEmpty(ck.getSsmt())) { MtEntity mt =
+			 * mtService.findOne(ck.getSsmt().getYmtid()); nck.setSsmt(mt); } if
+			 * (StringUtils.isEmpty(ck.getYckid())) { nck.setId("");
+			 * nck.setSsjyr(njyr);
+			 * nck.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
+			 * ckService.save(nck); } else { nck.setId(ck.getYckid());
+			 * nck.setSsjyr(njyr); nck.setYckid("");
+			 * nck.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
+			 * ckService.save(nck); } } } // 堆场
+			 * 
+			 * // 原经营人堆场操作 List<DcEntity> ydclist =
+			 * dcService.findByJyrid(njyr.getId()); if (ydclist != null &&
+			 * ydclist.size() > 0) { for (DcEntity dc : ydclist) {
+			 * dc.setXkzid(""); dcService.logicDelete(dc.getId()); } }
+			 * List<DcEntity> bgdclist = dcService.findByJyrid(bgjyr.getId());
+			 * if (bgdclist != null && bgdclist.size() > 0) { List<XkzglbEntity>
+			 * xkzglb = xkzglbService.findByCzid(bgid, "5"); for (DcEntity dc :
+			 * bgdclist) { DcEntity ndc = new DcEntity();
+			 * BeanUtils.copyProperties(dc, ndc); // 判断是否关联许可证 boolean flag =
+			 * false; if (xkzglb != null && xkzglb.size() > 0) { for
+			 * (XkzglbEntity v : xkzglb) { if (dc.getId().equals(v.getYwid())) {
+			 * flag = true; break; } } } if (flag) { ndc.setXkzid(xkz.getId());
+			 * } if (!StringUtils.isEmpty(dc.getSsmt())) { MtEntity mt =
+			 * mtService.findOne(dc.getSsmt().getYmtid()); ndc.setSsmt(mt); } if
+			 * (StringUtils.isEmpty(dc.getYdcid())) { ndc.setId("");
+			 * ndc.setSsjyr(njyr);
+			 * ndc.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
+			 * dcService.save(ndc); } else { ndc.setId(dc.getYdcid());
+			 * ndc.setSsjyr(njyr); ndc.setYdcid("");
+			 * ndc.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
+			 * dcService.save(ndc); } } } // 人员 // 原经营人人员操作 List<RyEntity>
+			 * yrylist = ryService.findByJyrid(njyr.getId()); if (yrylist !=
+			 * null && yrylist.size() > 0) { for (RyEntity ry : yrylist) {
+			 * ry.setXkzid(""); ryService.logicDelete(ry.getId()); } }
+			 * 
+			 * List<RyEntity> bgrylist = ryService.findByJyrid(bgjyr.getId());
+			 * if (bgrylist != null && bgrylist.size() > 0) { List<XkzglbEntity>
+			 * xkzglb = xkzglbService.findByCzid(bgid, "6"); for (RyEntity ry :
+			 * bgrylist) { RyEntity nry = new RyEntity();
+			 * BeanUtils.copyProperties(ry, nry); // 判断是否关联许可证 boolean flag =
+			 * false; if (xkzglb != null && xkzglb.size() > 0) { for
+			 * (XkzglbEntity v : xkzglb) { if (ry.getId().equals(v.getYwid())) {
+			 * flag = true; break; } } } if (flag) { nry.setXkzid(xkz.getId());
+			 * } if (StringUtils.isEmpty(ry.getYryid())) { nry.setId("");
+			 * nry.setSsjyr(njyr); nry = ryService.save(nry); } else {
+			 * nry.setId(ry.getYryid()); nry.setSsjyr(njyr); nry.setYryid("");
+			 * nry = ryService.save(nry); } List<RyzsEntity> ryzslist =
+			 * ryzsService.findZs(ry); if (ryzslist != null && ryzslist.size() >
+			 * 0) { for (RyzsEntity ryzs : ryzslist) { RyzsEntity nryzs = new
+			 * RyzsEntity(); BeanUtils.copyProperties(ryzs, nryzs);
+			 * nryzs.setRyid(nry); nryzs.setId(null); ryzsService.save(nryzs); }
+			 * } } } // 设施设备 // 原经营人设施设备操作 List<SssbEntity> ysssblist =
+			 * sssbService.findByJyrid(njyr.getId()); if (ysssblist != null &&
+			 * ysssblist.size() > 0) { for (SssbEntity sssb : ysssblist) {
+			 * sssb.setXkzid(""); sssbService.logicDelete(sssb.getId()); } }
+			 * List<SssbEntity> bgsssblist =
+			 * sssbService.findByJyrid(bgjyr.getId()); if (bgsssblist != null &&
+			 * bgsssblist.size() > 0) { List<XkzglbEntity> xkzglb =
+			 * xkzglbService.findByCzid(bgid, "7"); for (SssbEntity sssb :
+			 * bgsssblist) { SssbEntity nsssb = new SssbEntity();
+			 * BeanUtils.copyProperties(sssb, nsssb); // 判断是否关联许可证 boolean flag
+			 * = false; if (xkzglb != null && xkzglb.size() > 0) { for
+			 * (XkzglbEntity v : xkzglb) { if
+			 * (nsssb.getId().equals(v.getYwid())) { flag = true; break; } } }
+			 * if (flag) { nsssb.setXkzid(xkz.getId()); } if
+			 * (StringUtils.isEmpty(sssb.getYsssbid())) { nsssb.setId("");
+			 * nsssb.setSsjyr(njyr); sssbService.save(nsssb); } else {
+			 * nsssb.setId(sssb.getYsssbid()); nsssb.setSsjyr(njyr);
+			 * nsssb.setYsssbid(""); sssbService.save(nsssb); } } } // 企业投资 //
+			 * 原经营人企业投资操作 List<QytzEntity> yqytzlist =
+			 * qytzService.findByJyrid(njyr.getId()); if (yqytzlist != null &&
+			 * yqytzlist.size() > 0) { for (QytzEntity qytz : yqytzlist) {
+			 * qytz.setXkzid(""); qytzService.logicDelete(qytz.getId()); } }
+			 * List<QytzEntity> bgqytzlist =
+			 * qytzService.findByJyrid(bgjyr.getId()); if (bgqytzlist != null &&
+			 * bgqytzlist.size() > 0) { List<XkzglbEntity> xkzglb =
+			 * xkzglbService.findByCzid(bgid, "8"); for (QytzEntity qytz :
+			 * bgqytzlist) { QytzEntity nqytz = new QytzEntity();
+			 * BeanUtils.copyProperties(qytz, nqytz); // 判断是否关联许可证 boolean flag
+			 * = false; if (xkzglb != null && xkzglb.size() > 0) { for
+			 * (XkzglbEntity v : xkzglb) { if (qytz.getId().equals(v.getYwid()))
+			 * { flag = true; break; } } } if (flag) {
+			 * nqytz.setXkzid(xkz.getId()); } if
+			 * (StringUtils.isEmpty(qytz.getYqytzid())) { nqytz.setId("");
+			 * nqytz.setSsjyr(njyr); qytzService.save(nqytz); } else {
+			 * nqytz.setId(qytz.getYqytzid()); nqytz.setSsjyr(njyr);
+			 * nqytz.setYqytzid(""); qytzService.save(nqytz); } } }
+			 * 
+			 * // 装卸机械 // 原经营人装卸机械操作 List<ZxjxEntity> yzxjxlist =
+			 * zxjxService.findByJyrid(njyr.getId()); if (yzxjxlist != null &&
+			 * yzxjxlist.size() > 0) { for (ZxjxEntity zxjx : yzxjxlist) {
+			 * zxjx.setXkzid(""); zxjxService.logicDelete(zxjx.getId()); } }
+			 * List<ZxjxEntity> bgzxjxlist =
+			 * zxjxService.findByJyrid(bgjyr.getId()); if (bgzxjxlist != null &&
+			 * bgzxjxlist.size() > 0) { List<XkzglbEntity> xkzglb =
+			 * xkzglbService.findByCzid(bgid, "9"); for (ZxjxEntity zxjx :
+			 * bgzxjxlist) { ZxjxEntity nzxjx = new ZxjxEntity();
+			 * BeanUtils.copyProperties(zxjx, nzxjx); // 判断是否关联许可证 boolean flag
+			 * = false; if (xkzglb != null && xkzglb.size() > 0) { for
+			 * (XkzglbEntity v : xkzglb) { if (zxjx.getId().equals(v.getYwid()))
+			 * { flag = true; break; } } } if (flag) {
+			 * nzxjx.setXkzid(xkz.getId()); } if
+			 * (StringUtils.isEmpty(zxjx.getYzxjxid())) { nzxjx.setId("");
+			 * nzxjx.setSsjyr(njyr); zxjxService.save(nzxjx); } else {
+			 * nzxjx.setId(zxjx.getYzxjxid()); nzxjx.setSsjyr(njyr);
+			 * nzxjx.setYzxjxid(""); zxjxService.save(nzxjx); } } }
+			 */
 
 		} catch (Exception e) {
 			e.printStackTrace();

+ 2 - 2
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkbg/service/impl/XkzbgServiceImpl.java

@@ -234,10 +234,10 @@ public class XkzbgServiceImpl extends BaseWorkFlowServiceImpl<XkzbgEntity, Strin
 			if (jyr != null) {
 				GkjyrEntity njyr = gkjyrService.findOne(jyr.getYjyrid());
 				if (njyr != null) {
-					njyr.setRecordStatus(BaseEntity.RECORD_STATE_BG);
+					//njyr.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
 					gkjyrService.save(njyr);
 					// 改变状态
-					changStatus(njyr.getId(), BaseEntity.RECORD_STATE_BG);
+					//changStatus(njyr.getId(), BaseEntity.RECORD_STATE_VALID);
 				}
 			}
 			return true;

+ 7 - 0
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkbg/vo/XkzbgVo.java

@@ -76,7 +76,14 @@ public class XkzbgVo extends BaseVo{
 	// 审批经办人
 	private String spry = null;
 	private String taskState = null;
+	private String opflag = null;
 	
+	public String getOpflag() {
+		return opflag;
+	}
+	public void setOpflag(String opflag) {
+		this.opflag = opflag;
+	}
 	public String getTaskState() {
 		return taskState;
 	}

+ 17 - 7
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxksq/ctl/XkzsqCtl.java

@@ -326,10 +326,14 @@ public class XkzsqCtl extends BaseWebCtl {
 								vo.setTaskState("TH");
 							} else {
 								vo.setTaskState(Constants.IS_MY_TASK);
-
 							}
 						}
-
+					}
+					if(!isJyr()){
+						XkzxxEntity xkz = xkzxxService.findByOpid(entity.getId(), "11");
+						if (xkz != null) {
+							vo.setOpflag("1");
+						}
 					}
 					voList.add(vo);
 				}
@@ -2643,17 +2647,21 @@ public class XkzsqCtl extends BaseWebCtl {
 			}
 			xkz.setGkjyxkzh(xkzbh);
 			xkz.setFzrq(new Date());
+			xkz.setYxqq(new Date());
+			xkz.setLxdh(xkzsq.getLxdh());
 			dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd");
 			String date = dateTimeFormat.format(xkz.getFzrq());
 
 			String t = (Integer.parseInt(date.substring(0, 4)) + 1) + date.substring(4);
 			xkz.setYxqz(dateTimeFormat.parse(t));
-			xkz.setSfyx(Constants.XKZ_SX);
+			// xkz.setSfyx(Constants.XKZ_SX);
+			xkz.setSfyx("11");
 			xkz.setIsflag("0");
+			xkz.setOpid(sqid);
 			xkz = xkzxxService.save(xkz);
 
 			// 经营人许可证更新
-			jyr.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
+			/*jyr.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
 			jyr.setFddbr(xkzsq.getFddbr());
 			jyr.setLxdh(xkzsq.getLxdh());
 			jyr.setCz(xkzsq.getCz());
@@ -2663,11 +2671,11 @@ public class XkzsqCtl extends BaseWebCtl {
 			jyr.setFzrq(dateTimeFormat.parse(date));
 			jyr.setFzrq(xkz.getFzrq());
 			jyr.setFzjg(xkz.getFzjg());
-			gkjyrService.save(jyr);
+			gkjyrService.save(jyr);*/
 
 			// xkzglb表操作
 			// 码头泊位储罐仓库堆场人员设备信息企业投资
-			List<XkzglbEntity> xkzglblist = xkzglbService.findByCzid(sqid);
+			/*List<XkzglbEntity> xkzglblist = xkzglbService.findByCzid(sqid);
 			if (xkzglblist != null && xkzglblist.size() > 0) {
 				for (XkzglbEntity xkzglb : xkzglblist) {
 					xkzglb.setXkzid(xkz.getId());
@@ -2729,7 +2737,7 @@ public class XkzsqCtl extends BaseWebCtl {
 						}
 					}
 				}
-			}
+			}*/
 
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -2854,4 +2862,6 @@ public class XkzsqCtl extends BaseWebCtl {
 		WebJsonResult wr = success();
 		return wr;
 	}
+
+	
 }

+ 10 - 0
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxksq/vo/XkzsqVo.java

@@ -56,6 +56,16 @@ public class XkzsqVo extends BaseVo {
 
 	private String taskState;
 
+	private String opflag = null;
+
+	public String getOpflag() {
+		return opflag;
+	}
+
+	public void setOpflag(String opflag) {
+		this.opflag = opflag;
+	}
+
 	public String getId() {
 		return id;
 	}

+ 9 - 1
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkyx/ctl/XkzyxCtl.java

@@ -230,6 +230,12 @@ public class XkzyxCtl extends BaseWebCtl {
 						}
 
 					}
+					if(!isJyr()){
+						XkzxxEntity xkz = xkzxxService.findByOpid(entity.getId(), "13");
+						if (xkz != null) {
+							vo.setOpflag("1");
+						}
+					}
 					voList.add(vo);
 				}
 			}
@@ -1730,6 +1736,7 @@ public class XkzyxCtl extends BaseWebCtl {
 							xkzxx.setFddbr(xkz.getFddbr());
 							xkzxx.setFzjg(xkz.getFzjg());
 							xkzxx.setFzrq(new Date());
+							xkzxx.setYxqq(new Date());
 							xkzxx.setGkjyr(xkz.getGkjyr());
 							xkzxx.setGkjyxkzh(xkz.getGkjyxkzh());
 							xkzxx.setGkjyxkzsmj(xkz.getGkjyxkzsmj());
@@ -1749,8 +1756,9 @@ public class XkzyxCtl extends BaseWebCtl {
 								String t = (Integer.parseInt(date.substring(0, 4)) + 3) + date.substring(4);
 								xkzxx.setYxqz(dateTimeFormat.parse(t));
 							}
-							xkzxx.setSfyx(Constants.XKZ_WSX);// 未生效
+							xkzxx.setSfyx("13");// 未生效
 							xkzxx.setIsflag("0");
+							xkzxx.setOpid(id);
 							xkzxxService.save(xkzxx);
 						}
 					}

+ 9 - 0
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkyx/vo/XkzyxVo.java

@@ -51,6 +51,15 @@ public class XkzyxVo extends BaseVo {
 	private String bz = null;
 	private String xkzbh = null;
 	private String taskState;
+	private String opflag = null;
+
+	public String getOpflag() {
+		return opflag;
+	}
+
+	public void setOpflag(String opflag) {
+		this.opflag = opflag;
+	}
 
 	public String getTaskState() {
 		return taskState;