Home Explore Help
Register Sign In
hs
/
jsgkj
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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

ld_xuhx 8 years ago
parent
58ad6e93ea
commit
1e17cb2d3f
21 changed files with 1023 additions and 161 deletions
Split View Show Diff Stats
  1. 2 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/ggfwxxgl/jdtxxx/jdtxxxadd.jsp
  2. 197 0
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/xkzxx/editLhxkz.jsp
  3. 6 0
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhbg/lhbgmain.jsp
  4. 5 5
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhsq/lhsqadd.jsp
  5. 8 0
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhsq/lhsqmain.jsp
  6. 7 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhyx/lhyxmain.jsp
  7. 69 0
      gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gkjyr/xkzxx/xkzxxdetail.js
  8. 4 2
      gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gkjyxkgl/gkjyzksq/xkzsqdetail.js
  9. 9 3
      gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gklhxkgl/gkjylhbg/lhbgdetail.js
  10. 18 4
      gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gklhxkgl/gkjylhbg/lhbgmain.js
  11. 22 1
      gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gklhxkgl/gkjylhsq/lhsqmain.js
  12. 22 2
      gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gklhxkgl/gkjylhyx/lhyxmain.js
  13. 303 36
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzxx/ctl/XkzxxCtl.java
  14. 9 0
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzxx/entity/XkzxxEntity.java
  15. 14 7
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzxx/vo/XkzxxVo.java
  16. 145 65
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhbg/ctl/LhbgCtl.java
  17. 9 0
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhbg/vo/LhbgVo.java
  18. 83 17
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhsq/ctl/LhsqCtl.java
  19. 8 0
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhsq/vo/LhsqVo.java
  20. 67 16
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhyx/ctl/LhyxCtl.java
  21. 16 0
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhyx/vo/LhyxVo.java

+ 2 - 2
gkjsjy/trunk/WebContent/WEB-INF/pages/ggfwxxgl/jdtxxx/jdtxxxadd.jsp
View File 

@@ -200,12 +200,12 @@
 
 		                        <textarea class="form-control" rows="3" cols="3" name="bz"></textarea>

 	                        </td>

 	                    </tr> 

-	                      <tr>

+	                    <!--   <tr>

 	                        <th>整改后附件说明：&nbsp;</th>

 	                        <td colspan="3">

 		                        上传

 	                        </td>

-	                    </tr>

+	                    </tr> -->

 					</table>

 </form>

 					<div  id="buttons">

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

@@ -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"   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"   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.saveLhFz()">

+			   		<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/gklhxkgl/gkjylhbg/lhbgmain.jsp
View File 

@@ -154,6 +154,12 @@
 
 									   <i class="glyphicon glyphicon-check"></i> 

 									          </a>

 							 </c:if>

+							  <c:if test="${lhbg.opflag == 1   && ssFlag ==0}">

+							 <a class="btn btn-default btn-xs" href="#"

+									onclick="parent.main.menuClick('xkzxx','许可证信息','/xkzxx/editLhxkz?id=${lhbg.id}&status=122')"  title="发证"> <i

+										class="glyphicon glyphicon-search"></i>

+										</a>

+							 </c:if>

 							</td>

 						</tr>

 					</c:forEach>

+ 5 - 5
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhsq/lhsqadd.jsp
View File 

@@ -256,17 +256,17 @@
 
 						<tr>

 							<th><span class="needwrite">*</span>注册地址：&nbsp;</th>

 							<td colspan="3">

-								<input type="text" class="form-control" readonly="readonly" style="width:85%" id="zcdz" name="zcdz" value="${gkjyr.bgdz }">

+								<input type="text" class="form-control"  style="width:85%" id="zcdz" name="zcdz" value="${gkjyr.bgdz }">

 							</td>

 						</tr>

 						<tr>

 							<th><span class="needwrite">*</span>法定代表人：&nbsp;</th>

 							<td >

-								<input type="text" class="form-control" readonly="readonly"  id="fddbr" name="fddbr" value="${gkjyr.fddbr }">

+								<input type="text" class="form-control"   id="fddbr" name="fddbr" value="${gkjyr.fddbr }">

 							</td>

 							<th><span class="needwrite">*</span>工商营业执照编号：&nbsp;</th>

 							<td colspan="3">

-								<input type="text" class="form-control" readonly="readonly" style="width:61%"" id="gsyyzzbh" name="gsyyzzbh" value="${gkjyr.gsyyzzbh }">

+								<input type="text" class="form-control"  style="width:61%"" id="gsyyzzbh" name="gsyyzzbh" value="${gkjyr.gsyyzzbh }">

 							</td>

 						</tr>

 						<tr>

@@ -276,7 +276,7 @@
 
 							</td>

 							<th><span class="needwrite">*</span>注册资本：&nbsp;</th>

 							<td>

-								<input type="text" class="form-control" readonly="readonly" style="width:61%"  id="zczb" name="zczb" value="${gkjyr.zczb }">

+								<input type="text" class="form-control"  style="width:61%"  id="zczb" name="zczb" value="${gkjyr.zczb }">

 							</td>

 						</tr>

 						<tr>

@@ -286,7 +286,7 @@
 
 							</td>

 							<th><span class="needwrite">*</span>经营地域：&nbsp;</th>

 							<td>

-								<input type="text" class="form-control" readonly="readonly" style="width:61%"  id="jydy" name="jydy" value="${gkjyr.jyqy }">

+								<input type="text" class="form-control"  style="width:61%"  id="jydy" name="jydy" value="${gkjyr.jyqy }">

 							</td>

 						</tr>

 						 <tr>

+ 8 - 0
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhsq/lhsqmain.jsp
View File 

@@ -154,6 +154,14 @@
 
 									   <i class="glyphicon glyphicon-check"></i> 

 									          </a>

 							 </c:if>

+							 

+							 <c:if test="${lhsq.opflag == 1   && ssFlag ==0}">

+							 <a class="btn btn-default btn-xs" href="#"

+									onclick="parent.main.menuClick('xkzxx','许可证信息','/xkzxx/editLhxkz?id=${lhsq.id}&status=111')"  title="发证"> <i

+										class="glyphicon glyphicon-search"></i>

+										</a>

+							 </c:if>

+							 

 							</td>

 						</tr>

 					</c:forEach>

+ 7 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhyx/lhyxmain.jsp
View File 

@@ -151,11 +151,17 @@
 
 									   <i class="glyphicon glyphicon-check"></i> 

 									          </a>

 							 </c:if>

-							  <c:if test="${lhsq.taskState =='TH'}">

+							  <c:if test="${lhyx.taskState =='TH'}">

 							 <a class="btn btn-default btn-xs" href="#"  onclick="lhyx.main.back('${lhyx.id}')" title="办理">

 									   <i class="glyphicon glyphicon-check"></i> 

 									          </a>

 							 </c:if>

+							   <c:if test="${lhyx.opflag == 1   && ssFlag ==0}">

+							 <a class="btn btn-default btn-xs" href="#"

+									onclick="parent.main.menuClick('xkzxx','许可证信息','/xkzxx/editLhxkz?id=${lhyx.id}&status=133')"  title="发证"> <i

+										class="glyphicon glyphicon-search"></i>

+										</a>

+							 </c:if>

 							</td>

 						</tr>

 					</c:forEach>

+ 69 - 0
gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gkjyr/xkzxx/xkzxxdetail.js
View File 

@@ -203,6 +203,75 @@ xkzxx.detail.saveFzxkz=function(){
 
     }); 

 };

 

+xkzxx.detail.saveLhFz=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/saveLhFz",

+         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;

+ 4 - 2
gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gkjyxkgl/gkjyzksq/xkzsqdetail.js
View File 

@@ -885,6 +885,7 @@ function initjyfwmcSelect(divid, existVal, fjdmc, jyfwid, changefunc, width) {
 
 }

 

 xkzsq.detail.audit = function(auditpass, id) {

+	$(".btn").attr("disabled",true);

 	var opflag = $('#opflag').val();

 	var shyj = "";

 	if (opflag == 1) {

@@ -925,7 +926,7 @@ xkzsq.detail.audit = function(auditpass, id) {
 
 				title : '提示',

 				content : data.message,

 				confirm : function() {

-

+					$(".btn").attr("disabled",false);

 				}

 			});

 		}

@@ -934,6 +935,7 @@ xkzsq.detail.audit = function(auditpass, id) {
 
 }

 

 xkzsq.detail.submitAudit = function() {

+	$(".btn").attr("disabled",true);

 	$.ajax({

 		url : $.app + "/xkzsq/submitAudit",

 		data : $("#addform").serialize(),

@@ -958,7 +960,7 @@ xkzsq.detail.submitAudit = function() {
 
 					title : '提示',

 					content : data.message,

 					confirm : function() {

-

+						$(".btn").attr("disabled",false);

 					}

 				});

 			}

+ 9 - 3
gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gklhxkgl/gkjylhbg/lhbgdetail.js
View File 

@@ -133,7 +133,9 @@ lhbg.detail.save = function(){
 
 	if($('#fddbrChe').is(':checked')){

 		if(vae($('#addform input[name=xfddbr]'),"变更后法定代表人")==false){return false;}

 	}

-	

+	if($('#tyyyChe').is(':checked')){

+		if(vae($('#addform input[name=tyyy]'),"停业歇业原因")==false){return false;}

+	}

 	$(".btn").attr("disabled",true);

 	 $.ajax({

          url:$.app+"/lhbg/save",

@@ -183,7 +185,9 @@ lhbg.detail.saveTb = function(){
 
 	if($('#fddbrChe').is(':checked')){

 		if(vae($('#addform input[name=xfddbr]'),"变更后法定代表人")==false){return false;}

 	}

-	

+	if($('#tyyyChe').is(':checked')){

+		if(vae($('#addform input[name=tyyy]'),"停业歇业原因")==false){return false;}

+	}

 	$(".btn").attr("disabled",true);

 	 $.ajax({

          url:$.app+"/lhbg/saveTb",

@@ -244,7 +248,9 @@ lhbg.detail.submit = function(){
 
 	if($('#fddbrChe').is(':checked')){

 		if(vae($('#addform input[name=xfddbr]'),"变更后法定代表人")==false){return false;}

 	}

-	

+	if($('#tyyyChe').is(':checked')){

+		if(vae($('#addform input[name=tyyy]'),"停业歇业原因")==false){return false;}

+	}

 	$(".btn").attr("disabled",true);

 	 $.ajax({

 		 url:$.app+"/lhbg/submit",

+ 18 - 4
gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gklhxkgl/gkjylhbg/lhbgmain.js
View File 

@@ -36,10 +36,24 @@ function showgq() {
 
 

 //新增

 lhbg.main.add = function() {

-	

-	location.href=$.app+"/lhbg/add";

-			

-	

+	$.ajax({

+		async : true,

+		url : $.app + "/xkzxx/findByjyrid",

+		type : "post",

+		dataType : "json",

+		success : function(data) {// ajax返回的数据

+			if (data.success) {

+				location.href=$.app+"/lhbg/add";

+			} else {

+				$.alert({

+					title : '提示',

+					content : data.message,

+					confirm : function() {

+					}

+				});

+			}

+		}

+	});

 }

 

 lhbg.main.search=function(){

+ 22 - 1
gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gklhxkgl/gkjylhsq/lhsqmain.js
View File 

@@ -84,7 +84,28 @@ lhsq.main.del = function(data) {
 
 

 //新增

 lhsq.main.add = function() {

-	location.href = $.app + "/lhsq/add";

+	$.ajax({

+		async : true,

+		url : $.app + "/xkzxx/findByjyrid",

+		type : "post",

+		dataType : "json",

+		data:{

+			flag :1

+		},

+		success : function(data) {// ajax返回的数据

+			if (data.success) {

+				location.href = $.app + "/lhsq/add";

+			} else {

+				$.alert({

+					title : '提示',

+					content : data.message,

+					confirm : function() {

+					}

+				});

+			}

+		}

+	});

+	

 }

 

 lhsq.main.banli=function(data){

+ 22 - 2
gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gklhxkgl/gkjylhyx/lhyxmain.js
View File 

@@ -35,8 +35,28 @@ function showgq() {
 
 

 // 新增

 lhyx.main.add = function() {

-

-	location.href = $.app + "/lhyx/add";

+	$.ajax({

+		async : true,

+		url : $.app + "/xkzxx/findByjyrid",

+		type : "post",

+		dataType : "json",

+		data:{

+			flag :2

+		},

+		success : function(data) {// ajax返回的数据

+			if (data.success) {

+				location.href = $.app + "/lhyx/add";

+			} else {

+				$.alert({

+					title : '提示',

+					content : data.message,

+					confirm : function() {

+					}

+				});

+			}

+		}

+	});

+	

 

 }

+ 303 - 36
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzxx/ctl/XkzxxCtl.java
View File 

@@ -4,6 +4,7 @@ import java.awt.Color;
 
 import java.awt.Font;

 import java.awt.Graphics2D;

 import java.awt.image.BufferedImage;

+import java.io.File;

 import java.io.FileInputStream;

 import java.io.IOException;

 import java.io.InputStream;

@@ -53,6 +54,8 @@ import com.xt.jygl.common.Constants;
 
 import com.xt.jygl.common.GlobalData;

 import com.xt.jygl.common.SearchCondition;

 import com.xt.jygl.common.Utils;

+import com.xt.jygl.ftp.Ftp;

+import com.xt.jygl.ftp.FtpUtil;

 import com.xt.jygl.gkjcxx.gk.entity.GkEntity;

 import com.xt.jygl.gkjcxx.gk.service.GkService;

 import com.xt.jygl.gkjcxx.gq.entity.GqEntity;

@@ -100,6 +103,18 @@ 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.xt.jygl.gkjygl.gklhxkgl.gkjylhbg.entity.LhbgEntity;

+import com.xt.jygl.gkjygl.gklhxkgl.gkjylhbg.entity.LhbgfjEntity;

+import com.xt.jygl.gkjygl.gklhxkgl.gkjylhbg.service.LhbgService;

+import com.xt.jygl.gkjygl.gklhxkgl.gkjylhbg.service.LhbgfjService;

+import com.xt.jygl.gkjygl.gklhxkgl.gkjylhsq.entity.LhsqEntity;

+import com.xt.jygl.gkjygl.gklhxkgl.gkjylhsq.entity.LhsqfjEntity;

+import com.xt.jygl.gkjygl.gklhxkgl.gkjylhsq.service.LhsqService;

+import com.xt.jygl.gkjygl.gklhxkgl.gkjylhsq.service.LhsqfjService;

+import com.xt.jygl.gkjygl.gklhxkgl.gkjylhyx.entity.LhyxEntity;

+import com.xt.jygl.gkjygl.gklhxkgl.gkjylhyx.entity.LhyxfjEntity;

+import com.xt.jygl.gkjygl.gklhxkgl.gkjylhyx.service.LhyxService;

+import com.xt.jygl.gkjygl.gklhxkgl.gkjylhyx.service.LhyxfjService;

 import com.xtframe.core.anon.auth.RequiresPermissions;

 import com.xtframe.core.base.ctl.WebJsonResult;

 import com.xtframe.core.support.SecurityMgr;

@@ -170,6 +185,18 @@ public class XkzxxCtl extends BaseWebCtl {
 
 	private RyzsService ryzsService;

 	@Autowired

 	private ZxjxService zxjxService;

+	@Autowired

+	private LhsqService lhsqService;

+	@Autowired

+	private LhsqfjService lhsqfjService;

+	@Autowired

+	private LhyxService lhyxService;

+	@Autowired

+	private LhyxfjService lhyxfjService;

+	@Autowired

+	private LhbgService lhbgService;

+	@Autowired

+	private LhbgfjService lhbgfjService;

 

 	/**

 	 * 许可证管理

@@ -469,7 +496,6 @@ public class XkzxxCtl extends BaseWebCtl {
 
 		}

 

 		if (vo.getGkjyr() != null) {

-

 			GkjyrEntity gkjyr = gkjyrService.findOne(vo.getGkjyr());

 			if (null != gkjyr) {

 				vo.setGkjyrzw(gkjyr.getGkjyr());

@@ -484,11 +510,54 @@ public class XkzxxCtl extends BaseWebCtl {
 
 			}

 		}

 

+		if ("1".equals(vo.getStype())) {

+			if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {

+				if (!StringUtils.isEmpty(entity.getZmpicid())) {

+					AccessoryEntity acc = accessoryService.findOne(entity.getZmpicid());

+					ftpDown(acc);

+				}

+				if (!StringUtils.isEmpty(entity.getFmpicid())) {

+					AccessoryEntity acc = accessoryService.findOne(entity.getFmpicid());

+					ftpDown(acc);

+				}

+			}

+		}

+

 		model.addAttribute("record", vo);

 		model.addAttribute("menuid", menuid);

 		return "gkjygl/gkjyr/xkzxx/xkzxxview";

 	}

 

+	public void ftpDown(AccessoryEntity acc) {

+		try {

+			Ftp f = new Ftp();

+			f.setIpAddr(GlobalData.FTP_IP);

+			f.setPort(Integer.parseInt(GlobalData.FTP_PORT));

+			f.setUserName(GlobalData.FTP_XK_USER);

+			f.setPwd(GlobalData.FTP_XK_USER);

+			f.setPath("");

+			// 本地目录

+			String localBaseDir = GlobalData.VIEW_FILE_PATH + acc.getFilepath();

+			File newfile = new File(localBaseDir);

+			// 如果文件夹不存在则创建

+			if (!newfile.exists() && !newfile.isDirectory()) {

+				newfile.mkdirs();

+			}

+			// 远程目录

+			String remoteBaseDir = acc.getFilepath();

+			// 下载ftp文件

+			boolean downflag = FtpUtil.startDown(f, localBaseDir, remoteBaseDir, acc.getFilename());

+			if (downflag) {

+				System.out.println("ok");

+				acc.setFjbz("1");

+				accessoryService.save(acc);

+			}

+

+		} catch (Exception e) {

+			e.printStackTrace();

+		}

+	}

+

 	@RequestMapping(value = "/twoCode")

 	public String twoCode(HttpServletRequest request, HttpServletResponse response) {

 		String path = request.getSession().getServletContext().getRealPath("") + "\\static\\biz\\image\\";

@@ -512,7 +581,7 @@ public class XkzxxCtl extends BaseWebCtl {
 
 		if (acc != null) {

 			try {

 				OutputStream toClient = response.getOutputStream(); // 得到向客户端输出二进制数据的对象

-				FileInputStream is = new FileInputStream(GlobalData.VIEW_FILE_PATH+acc.getFilepath() + acc.getFilename());

+				FileInputStream is = new FileInputStream(GlobalData.VIEW_FILE_PATH + acc.getFilepath() + acc.getFilename());

 				int ii = is.available(); // 得到文件大小

 				byte[] data = new byte[ii];

 				is.read(data); // 读数据

@@ -585,7 +654,7 @@ public class XkzxxCtl extends BaseWebCtl {
 
 					wr.setSuccess(false);

 					if (gkjyr.getRecordStatus() == 5) {

 						wr.setMessage("该经营人正在许可申请中，不可操作！！！");

-					} else if (gkjyr.getRecordStatus() == 6 ) {

+					} else if (gkjyr.getRecordStatus() == 6) {

 						wr.setMessage("该经营人正在许可延续中，不可操作！！！");

 					} else if (gkjyr.getRecordStatus() == 7 || gkjyr.getRecordStatus() == 11) {

 						wr.setMessage("该经营人正在许可注销中，不可操作！！！");

@@ -598,21 +667,45 @@ public class XkzxxCtl extends BaseWebCtl {
 
 					}

 				} else {

 					List<XkzxxEntity> xkzlist = xkzxxService.findByJyrid(gkjyr.getId(), Constants.XKZ_SX);

-					if ("1".equals(flag)) {// 申请

-						if (xkzlist != null && xkzlist.size() > 0) {

-							wr.setSuccess(false);

-							wr.setMessage("该经营人已经申请过，请勿再申请！！！");

-						}

-					} else if ("2".equals(flag)) {

-						xkzlist = xkzxxService.findByJyrid(gkjyr.getId(), Constants.XKZ_WSX);

-						if (xkzlist != null && xkzlist.size() > 0) {

-							wr.setSuccess(false);

-							wr.setMessage("该经营人已经延续过，请勿再申请！！！");

+					XkzxxEntity xkzxx = new XkzxxEntity();

+					if (xkzlist != null && xkzlist.size() > 0) {

+						xkzxx = xkzlist.get(0);

+					}

+					if (StringUtils.isEmpty(xkzxx.getStype())) {

+						if ("1".equals(flag)) {// 申请

+							if (xkzlist != null && xkzlist.size() > 0) {

+								wr.setSuccess(false);

+								wr.setMessage("该经营人已经许可证申请过，请勿再申请！！！");

+							}

+						} else if ("2".equals(flag)) {

+							xkzlist = xkzxxService.findByJyrid(gkjyr.getId(), Constants.XKZ_WSX);

+							if (xkzlist != null && xkzlist.size() > 0) {

+								wr.setSuccess(false);

+								wr.setMessage("该经营人已经许可证延续过，请勿再申请！！！");

+							}

+						} else {

+							if (xkzlist == null || xkzlist.size() < 1) {

+								wr.setSuccess(false);

+								wr.setMessage("请经营人填写许可证信息后再操作！！！");

+							}

 						}

-					} else {

-						if (xkzlist == null || xkzlist.size() < 1) {

-							wr.setSuccess(false);

-							wr.setMessage("请经营人填写许可证信息后再操作！！！");

+					}else if("1".equals(xkzxx.getStype())){

+						if ("1".equals(flag)) {// 申请

+							if (xkzlist != null && xkzlist.size() > 0) {

+								wr.setSuccess(false);

+								wr.setMessage("该经营人已经理货申请过，请勿再申请！！！");

+							}

+						} else if ("2".equals(flag)) {

+							xkzlist = xkzxxService.findByJyrid(gkjyr.getId(), Constants.XKZ_WSX);

+							if (xkzlist != null && xkzlist.size() > 0) {

+								wr.setSuccess(false);

+								wr.setMessage("该经营人已经理货延续过，请勿再申请！！！");

+							}

+						} else {

+							if (xkzlist == null || xkzlist.size() < 1) {

+								wr.setSuccess(false);

+								wr.setMessage("请经营人填写理货许可证信息后再操作！！！");

+							}

 						}

 					}

 				}

@@ -1045,28 +1138,202 @@ public class XkzxxCtl extends BaseWebCtl {
 
 	}

 

 	@RequestMapping(value = "/editxkz")

-	public String editxkz(Model model, String id, String status,String menuid) {

+	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();

+		/*

+		 * 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);

 			}

-		} else if ("12".equals(status)) {

-			XkzbgEntity xkzbg = xkzbgService.findOne(id);

-			if (xkzbg != null) {

-				// 变更经营人

-				GkjyrEntity bgjyr = gkjyrService.findOne(xkzbg.getJyrid());

-				jyrid = bgjyr.getYjyrid();

+			if (null != xkzxx.getYxqq()) {

+				String yxqq = DateTime.toString(xkzxx.getYxqq());

+				vo.setYxqqfmt(yxqq);

 			}

-		} else if ("13".equals(status)) {

-			XkzyxEntity xkzyx = xkzyxService.findOne(id);

-			if (xkzyx != null) {

-				jyrid = xkzyx.getJyrid();

+			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 = "/saveLhFz")

+	@ResponseBody

+	public WebJsonResult saveLhFz(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.setZmpicid(zmpicid);

+				xkzxx.setFmpicid(fmpicid);

+				String fjid = "";

+				if (!StringUtils.isEmpty(xkzxx.getZmpicid())) {

+					fjid = xkzxx.getZmpicid() + ",";

+				}

+				if (!StringUtils.isEmpty(xkzxx.getFmpicid())) {

+					fjid = xkzxx.getFmpicid() + ",";

+				}

+				System.out.println(fjid);

+				if ("111".equals(xkzxx.getSfyx())) {

+					xkzxx.setSfyx("1");

+					xkzxx = xkzxxService.save(xkzxx);

+

+					LhsqEntity entity = lhsqService.findOne(opId);

+					entity.setSftb(Constants.YES);

+					lhsqService.save(entity);

+					try {

+						List<LhsqfjEntity> fjlist = lhsqfjService.findBySqid(opId);

+

+						if (fjlist != null && fjlist.size() > 0) {

+							for (LhsqfjEntity fj : fjlist) {

+								fjid = fjid + fj.getFjid() + ",";

+							}

+							fjid = fjid.substring(0, fjid.length() - 1);

+						}

+

+						String url = "GK_OPERATION_JSJY_LHSQ_ONE_PC?condition=ID=" + entity.getId() + ";FJID=" + fjid;

+						System.out.println(url);

+						boolean tbflag = getTbStatus(url, entity.getSzd().getId());

+						if (tbflag) {

+							entity.setTbzt("Y");

+							lhsqService.save(entity);

+						}

+					} catch (Exception e) {

+						e.printStackTrace();

+					}

+

+				} else if ("122".equals(xkzxx.getSfyx())) {

+					LhbgEntity entity = lhbgService.findOne(opId);

+					// 许可证操作

+					List<XkzxxEntity> list = xkzxxService.findByJyrid(entity.getJyrid());

+					if (list != null && list.size() > 0) {

+						for (XkzxxEntity xkzxxentity : list) {

+							if ("1".equals(xkzxxentity.getSfyx())) {

+								xkzxxentity.setSfyx(Constants.XKZ_WX);

+								xkzxxentity.setIsflag("0");

+								xkzxxService.save(xkzxxentity);

+							}

+						}

+					}

+

+					xkzxx.setSfyx("1");

+					xkzxx = xkzxxService.save(xkzxx);

+

+					entity.setSftb(Constants.YES);

+					entity = lhbgService.save(entity);

+					// 如果是省级审核通过或不通过后同步到市级

+					try {

+						List<LhbgfjEntity> fjlist = lhbgfjService.findByBgid(opId);

+						if (fjlist != null && fjlist.size() > 0) {

+							for (LhbgfjEntity fj : fjlist) {

+								fjid = fjid + fj.getFjid() + ",";

+							}

+							fjid = fjid.substring(0, fjid.length() - 1);

+						}

+						String url = "GK_OPERATION_JSJY_LHBG_ONE_PC?condition=ID=" + entity.getId() + ";FJID=" + fjid + ";JYRID=" + entity.getJyrid();

+						boolean tbflag = getTbStatus(url, entity.getSzd().getId());

+						if (tbflag) {

+							entity.setTbzt("Y");

+							lhbgService.save(entity);

+						}

+					} catch (Exception e) {

+						e.printStackTrace();

+					}

+				} else if ("133".equals(xkzxx.getSfyx())) {

+					xkzxx.setSfyx(Constants.XKZ_WSX);

+					xkzxx = xkzxxService.save(xkzxx);

+

+					LhyxEntity entity = lhyxService.findOne(opId);

+					// entity.setSftb(Constants.YES);

+					entity = lhyxService.save(entity);

+					// 如果是省级审核通过或不通过后同步到市级

+					try {

+						List<LhyxfjEntity> fjlist = lhyxfjService.findByYxid(opId);

+						if (fjlist != null && fjlist.size() > 0) {

+							for (LhyxfjEntity fj : fjlist) {

+								fjid = fjid + fj.getFjid() + ",";

+							}

+							fjid = fjid.substring(0, fjid.length() - 1);

+						}

+

+						String url = "GK_OPERATION_JSJY_LHYX_ONE_PC?condition=ID=" + entity.getId() + ";FJID=" + fjid + ";JYRID=" + entity.getJyrid();

+						boolean tbflag = getTbStatus(url, entity.getSzd().getId());

+						if (tbflag) {

+							entity.setTbzt("Y");

+							lhyxService.save(entity);

+						}

+					} catch (Exception e) {

+						e.printStackTrace();

+					}

+				}

 			}

-		}*/

+		} catch (Exception e) {

+			wr.setSuccess(false);

+			wr.setMessage("操作失败！");

+			e.printStackTrace();

+		}

+		return wr;

+	}

 

+	@RequestMapping(value = "/editLhxkz")

+	public String editLhxkz(Model model, String id, String status, String menuid) {

+		model.addAttribute("menuid", menuid);

 		XkzxxEntity xkzxx = xkzxxService.findByOpid(id, status);

 

 		if (xkzxx != null) {

@@ -1075,7 +1342,7 @@ public class XkzxxCtl extends BaseWebCtl {
 
 			if (null != xkzxx.getGkjyr()) {

 				if (null != getSsjyr()) {

 					vo.setGkjyrzw(getSsjyr().getGkjyr());

-				}else{

+				} else {

 					vo.setGkjyrzw(gkjyrService.findOne(xkzxx.getGkjyr()).getGkjyr());

 				}

 

@@ -1110,7 +1377,7 @@ public class XkzxxCtl extends BaseWebCtl {
 
 			model.addAttribute("opId", id);

 		}

 

-		return "gkjygl/gkjyr/xkzxx/editxkz";

+		return "gkjygl/gkjyr/xkzxx/editLhxkz";

 	}

 

 	@RequestMapping(value = "/saveFzxkz")

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

@@ -47,7 +47,16 @@ public class XkzxxEntity extends BaseEntity<String> implements Cloneable {
 
 	private String fmpicid = null;

 	private String isflag = null;

 	private String opid= null;

+	private String stype= null;

 	

+	public String getStype() {

+		return stype;

+	}

+

+	public void setStype(String stype) {

+		this.stype = stype;

+	}

+

 	public String getOpid() {

 		return opid;

 	}

+ 14 - 7
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzxx/vo/XkzxxVo.java
View File 

@@ -32,15 +32,24 @@ public class XkzxxVo extends BaseVo {
 
 	private String szgk = null;

 	private String szgkzw = null;

 	private String sfyx = null;

-	private String sfred = null;/*背景是否为红色*/

+	private String sfred = null;/* 背景是否为红色 */

 	private String zmpicid = null;

 	private String fmpicid = null;

-	

-	private String zmpicname= null;

-	private String fmpicname= null;

+

+	private String zmpicname = null;

+	private String fmpicname = null;

 	private String isflag = null;

 	private String opid = null;

-	

+	private String stype = null;

+

+	public String getStype() {

+		return stype;

+	}

+

+	public void setStype(String stype) {

+		this.stype = stype;

+	}

+

 	public String getOpid() {

 		return opid;

 	}

@@ -304,7 +313,5 @@ public class XkzxxVo extends BaseVo {
 
 	public void setIsflag(String isflag) {

 		this.isflag = isflag;

 	}

-	

-	

 

 }

+ 145 - 65
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhbg/ctl/LhbgCtl.java
View File 

@@ -35,8 +35,12 @@ import com.xt.jygl.ftp.Ftp;
 
 import com.xt.jygl.ftp.FtpUtil;

 import com.xt.jygl.gkjcxx.gk.service.GkService;

 import com.xt.jygl.gkjcxx.gq.service.GqService;

+import com.xt.jygl.gkjcxx.xzdwxxgl.xzglbmxx.entity.XzglbmxxEntity;

+import com.xt.jygl.gkjcxx.xzdwxxgl.xzglbmxx.service.XzglbmxxService;

 import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.GkjyrEntity;

 import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.service.GkjyrService;

+import com.xt.jygl.gkjygl.gkjyr.xkzxx.entity.XkzxxEntity;

+import com.xt.jygl.gkjygl.gkjyr.xkzxx.service.XkzxxService;

 import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.service.XzjydyService;

 import com.xt.jygl.gkjygl.gklhxkgl.gkjylhbg.entity.LhbgEntity;

 import com.xt.jygl.gkjygl.gklhxkgl.gkjylhbg.entity.LhbgfjEntity;

@@ -82,7 +86,10 @@ public class LhbgCtl extends BaseWebCtl {
 
 	private LhbgfjService lhbgfjService;

 	@Autowired

 	private AccessoryService accessoryService;

-

+	@Autowired

+	private XkzxxService xkzxxService;

+	@Autowired

+	private XzglbmxxService xzglbmxxService;

 	@RequestMapping(value = "/main")

 	@RequiresPermissions("lhbg:main")

 	public String main(SimplePageRequest page, Model model, final String lczt, final String szdid, final String szgkid, final String szgqid, final String gkjyr, final String fddbr, final String bgdd, String menuid) throws JsonProcessingException {

@@ -154,7 +161,7 @@ public class LhbgCtl extends BaseWebCtl {
 
 							vo.setCurrentname("退回地市");

 						} else if ("2".equals(entity.getFlowstatus())) {

 							vo.setCurrentname("省局同意");

-						}else if("0".equals(entity.getFlowstatus())){

+						} else if ("0".equals(entity.getFlowstatus())) {

 							vo.setCurrentname("转报省局");

 						}

 					}

@@ -162,6 +169,10 @@ public class LhbgCtl extends BaseWebCtl {
 
 				} else if (entity.getRecordStatus() == BaseEntity.RECORD_STATE_COMPLETED) {

 					vo.setCurrentname("完成");

 				}

+				XkzxxEntity xkz = xkzxxService.findByOpid(entity.getId(), "122");

+				if (xkz != null) {

+					vo.setOpflag("1");

+				}

 				voList.add(vo);

 			}

 		}

@@ -249,10 +260,11 @@ public class LhbgCtl extends BaseWebCtl {
 
 		String currName = "";

 		TaskInfoEntity taskinfo = taskInfoService.findByStep(id, LhbgEntity.PROCESS_DEFINITION_KEY);

 		if (taskinfo != null) {

-			if("sljbr".equals(taskinfo.getTaskKey())) {

+			if ("sljbr".equals(taskinfo.getTaskKey())) {

 				roleCode = Constants.ROLE_KS;

 				currName = "科室审查";

-			}if ("kssc".equals(taskinfo.getTaskKey())) {

+			}

+			if ("kssc".equals(taskinfo.getTaskKey())) {

 				roleCode = Constants.ROLE_FGLD;

 				currName = "分管领导审批";

 			} else if ("fgldsp".equals(taskinfo.getTaskKey())) {

@@ -330,7 +342,7 @@ public class LhbgCtl extends BaseWebCtl {
 
 	// 保存

 	@RequestMapping(value = "/save")

 	@ResponseBody

-	public WebJsonResult save(Model model, LhbgEntity code, String accid ) {

+	public WebJsonResult save(Model model, LhbgEntity code, String accid) {

 		WebJsonResult wr = success();

 		LhbgEntity lhbgEntity = new LhbgEntity();

 		try {

@@ -376,54 +388,54 @@ public class LhbgCtl extends BaseWebCtl {
 
 	}

 

 	// 保存

-		@RequestMapping(value = "/saveTb")

-		@ResponseBody

-		public WebJsonResult saveTb(Model model, LhbgEntity code, String accid ) {

-			WebJsonResult wr = success();

-			LhbgEntity lhbgEntity = new LhbgEntity();

-			try {

-				if (!StringUtils.isEmpty(code.getId())) {

-					lhbgEntity = lhbgService.findOne(code.getId());

-					lhbgEntity.setLxr(code.getLxr());

-					lhbgEntity.setDh(code.getDh());

-					lhbgEntity.setCz(code.getCz());

-					lhbgEntity.setXbgdz(code.getXbgdz());

-					lhbgEntity.setXfddbr(code.getXfddbr());

-					lhbgEntity.setSftb(Constants.NO);

-					lhbgEntity.setTyyy(code.getTyyy());

-					lhbgEntity = lhbgService.save(lhbgEntity);

-				} else {

-					code.setId(null);

-					code.setSqrq(new Date());

-					GkjyrEntity jyr = gkjyrService.findOne(code.getJyrid());

-					if (jyr != null) {

-						code.setSzgk(jyr.getSzgk());

-						code.setSzgq(jyr.getSzgq());

-						code.setSzd(jyr.getSzd());

-					}

-					code.setSftb(Constants.NO);

-					lhbgEntity = lhbgService.save(code);

+	@RequestMapping(value = "/saveTb")

+	@ResponseBody

+	public WebJsonResult saveTb(Model model, LhbgEntity code, String accid) {

+		WebJsonResult wr = success();

+		LhbgEntity lhbgEntity = new LhbgEntity();

+		try {

+			if (!StringUtils.isEmpty(code.getId())) {

+				lhbgEntity = lhbgService.findOne(code.getId());

+				lhbgEntity.setLxr(code.getLxr());

+				lhbgEntity.setDh(code.getDh());

+				lhbgEntity.setCz(code.getCz());

+				lhbgEntity.setXbgdz(code.getXbgdz());

+				lhbgEntity.setXfddbr(code.getXfddbr());

+				lhbgEntity.setSftb(Constants.NO);

+				lhbgEntity.setTyyy(code.getTyyy());

+				lhbgEntity = lhbgService.save(lhbgEntity);

+			} else {

+				code.setId(null);

+				code.setSqrq(new Date());

+				GkjyrEntity jyr = gkjyrService.findOne(code.getJyrid());

+				if (jyr != null) {

+					code.setSzgk(jyr.getSzgk());

+					code.setSzgq(jyr.getSzgq());

+					code.setSzd(jyr.getSzd());

 				}

-				if (!StringUtils.isEmpty(accid)) {

-					// 关联附件

-					String[] ssids = accid.split(",");

-					for (String ssid : ssids) {

-						LhbgfjEntity fj = lhbgfjService.findOne(ssid);

-						if (fj != null) {

-							fj.setBgid(lhbgEntity.getId());

-							lhbgfjService.save(fj);

-						}

+				code.setSftb(Constants.NO);

+				lhbgEntity = lhbgService.save(code);

+			}

+			if (!StringUtils.isEmpty(accid)) {

+				// 关联附件

+				String[] ssids = accid.split(",");

+				for (String ssid : ssids) {

+					LhbgfjEntity fj = lhbgfjService.findOne(ssid);

+					if (fj != null) {

+						fj.setBgid(lhbgEntity.getId());

+						lhbgfjService.save(fj);

 					}

 				}

-				wr = saveTbzt(model, lhbgEntity.getId());

-			} catch (Exception e) {

-				wr.setSuccess(false);

-				wr.setMessage("操作失败！");

-				e.printStackTrace();

 			}

-			return wr;

+			wr = saveTbzt(model, lhbgEntity.getId());

+		} catch (Exception e) {

+			wr.setSuccess(false);

+			wr.setMessage("操作失败！");

+			e.printStackTrace();

 		}

-	

+		return wr;

+	}

+

 	@RequestMapping(value = "/saveTbzt")

 	@ResponseBody

 	public WebJsonResult saveTbzt(Model model, String id) {

@@ -442,7 +454,7 @@ public class LhbgCtl extends BaseWebCtl {
 
 		lhbgService.save(entity);

 		String url = "GK_OPERATION_JSJY_LHBG_ONE_CP?condition=ID=" + id + ";FJID=" + fjid;

 

-		boolean flag = getTbStatus(url,null);

+		boolean flag = getTbStatus(url, null);

 		if (flag) {

 			entity.setFlowstatus("0");

 			entity.setTbzt(Constants.YES);

@@ -648,26 +660,94 @@ public class LhbgCtl extends BaseWebCtl {
 
 						entity.setFlowstatus("1");

 					}

 				}

-				entity.setSftb(Constants.YES);

+				// entity.setSftb(Constants.YES);

 				entity = lhbgService.save(entity);

-				// 如果是省级审核通过或不通过后同步到市级

-				try {

-					List<LhbgfjEntity> fjlist = lhbgfjService.findByBgid(id);

-					String fjid = "";

-					if (fjlist != null && fjlist.size() > 0) {

-						for (LhbgfjEntity fj : fjlist) {

-							fjid = fjid + fj.getFjid() + ",";

+				if (flag && StringUtils.isEmpty(entity.getTyyy())) {

+					if(StringUtils.isEmpty(entity.getTyyy())){

+						UserEntity user = securityMgr.getCurrUser();

+						GkjyrEntity jyr = gkjyrService.findOne(entity.getJyrid());

+						XkzxxEntity xkz = new XkzxxEntity();

+						xkz.setGkjyr(entity.getJyrid());

+						xkz.setSpr(user.getName());

+						xkz.setFddbr(jyr.getFddbr());

+						if (StringUtils.isEmpty(entity.getXbgdz())) {

+							xkz.setDz(entity.getYbgdz());

+						} else {

+							xkz.setDz(entity.getXbgdz());

+						}

+						if (StringUtils.isEmpty(entity.getXfddbr())) {

+							xkz.setFddbr(entity.getYfddbr());

+						} else {

+							xkz.setFddbr(entity.getXfddbr());

+						}

+						if (!StringUtils.isEmpty(jyr.getSzgq())) {

+							xkz.setSsgq(jyr.getSzgq().getId());

+						}

+						if (!StringUtils.isEmpty(jyr.getSzgk())) {

+							xkz.setSzgk(jyr.getSzgk().getId());

+							xkz.setSzd(jyr.getSzd());

+						}

+						

+						xkz.setLxdh(entity.getLxr());

+						xkz.setZyqyfw(jyr.getJyfw());

+						xkz.setCq(jyr.getJyqy());

+						if (!StringUtils.isEmpty(user.getSsglbm())) {

+							XzglbmxxEntity glbm = user.getSsglbm();

+							if ("00".equals(glbm.getPid())) {

+								xkz.setFzjg(glbm.getGkglbmqc());

+							} else {

+								XzglbmxxEntity pglbm = xzglbmxxService.getPglbm(glbm.getPid());

+								xkz.setFzjg(pglbm.getGkglbmqc());

+							}

+						}

+						xkz.setGkjyxkzh("");

+						xkz.setFzrq(new Date());

+						xkz.setYxqq(new Date());

+						SimpleDateFormat 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("122");

+						xkz.setIsflag("0");

+						xkz.setStype("1");

+						xkz.setOpid(id);

+						xkzxxService.save(xkz);

+					}

+				}

+				if (!flag || !StringUtils.isEmpty(entity.getTyyy())) {

+					entity.setSftb(Constants.YES);

+					entity = lhbgService.save(entity);

+					

+					List<XkzxxEntity> list = xkzxxService.findByJyrid(entity.getJyrid());

+					if (list != null && list.size() > 0) {

+						for (XkzxxEntity xkzxxentity : list) {

+							if("1".equals(xkzxxentity.getSfyx())){

+								xkzxxentity.setSfyx(Constants.XKZ_WX);

+								xkzxxentity.setIsflag("0");

+								xkzxxService.save(xkzxxentity);

+							}

 						}

-						fjid = fjid.substring(0, fjid.length() - 1);

 					}

-					String url = "GK_OPERATION_JSJY_LHBG_ONE_PC?condition=ID=" + entity.getId()+";FJID="+fjid;

-					boolean tbflag = getTbStatus(url,entity.getSzd().getId());

-					if (tbflag) {

-						entity.setTbzt("Y");

-						lhbgService.save(entity);

+					

+					// 如果是省级审核通过或不通过后同步到市级

+					try {

+						List<LhbgfjEntity> fjlist = lhbgfjService.findByBgid(id);

+						String fjid = "";

+						if (fjlist != null && fjlist.size() > 0) {

+							for (LhbgfjEntity fj : fjlist) {

+								fjid = fjid + fj.getFjid() + ",";

+							}

+							fjid = fjid.substring(0, fjid.length() - 1);

+						}

+						String url = "GK_OPERATION_JSJY_LHBG_ONE_PC?condition=ID=" + entity.getId() + ";FJID=" + fjid+";JYRID="+entity.getJyrid();

+						boolean tbflag = getTbStatus(url, entity.getSzd().getId());

+						if (tbflag) {

+							entity.setTbzt("Y");

+							lhbgService.save(entity);

+						}

+					} catch (Exception e) {

+						e.printStackTrace();

 					}

-				} catch (Exception e) {

-					e.printStackTrace();

 				}

 			} else {

 				// rtx提醒

+ 9 - 0
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhbg/vo/LhbgVo.java
View File 

@@ -46,6 +46,15 @@ public class LhbgVo extends BaseVo {
 
 	private String flowstatus = null;

 

 	private String tyyy = null;

+	private String opflag = null;

+

+	public String getOpflag() {

+		return opflag;

+	}

+

+	public void setOpflag(String opflag) {

+		this.opflag = opflag;

+	}

 

 	public String getFlowstatus() {

 		return flowstatus;

+ 83 - 17
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhsq/ctl/LhsqCtl.java
View File 

@@ -34,6 +34,8 @@ import com.xt.jygl.common.GlobalData;
 
 import com.xt.jygl.ftp.Ftp;

 import com.xt.jygl.ftp.FtpUtil;

 import com.xt.jygl.gkjcxx.gq.service.GqService;

+import com.xt.jygl.gkjcxx.xzdwxxgl.xzglbmxx.entity.XzglbmxxEntity;

+import com.xt.jygl.gkjcxx.xzdwxxgl.xzglbmxx.service.XzglbmxxService;

 import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.GkjyrEntity;

 import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.service.GkjyrService;

 import com.xt.jygl.gkjygl.gkjyr.xkzxx.entity.XkzxxEntity;

@@ -49,6 +51,7 @@ import com.xt.jygl.workflow.service.TaskInfoService;
 
 import com.xt.jygl.workflow.vo.TaskInfoVo;

 import com.xtframe.core.anon.auth.RequiresPermissions;

 import com.xtframe.core.base.ctl.WebJsonResult;

+import com.xtframe.sec.code.entity.CodeEntity;

 import com.xtframe.sec.common.BaseEntity;

 import com.xtframe.sec.common.SimplePageRequest;

 import com.xtframe.sec.user.entity.UserEntity;

@@ -73,6 +76,8 @@ public class LhsqCtl extends BaseWebCtl {
 
 	private XkzxxService xkzxxService;

 	@Autowired

 	private AccessoryService accessoryService;

+	@Autowired

+	private XzglbmxxService xzglbmxxService;

 

 	@RequestMapping(value = "/main")

 	@RequiresPermissions("lhsq:main")

@@ -152,6 +157,10 @@ public class LhsqCtl extends BaseWebCtl {
 
 				} else if (entity.getRecordStatus() == BaseEntity.RECORD_STATE_COMPLETED) {

 					vo.setCurrentname("完成");

 				}

+				XkzxxEntity xkz = xkzxxService.findByOpid(entity.getId(), "111");

+				if (xkz != null) {

+					vo.setOpflag("1");

+				}

 				voList.add(vo);

 			}

 		}

@@ -591,7 +600,7 @@ public class LhsqCtl extends BaseWebCtl {
 
 		lhsqService.save(entity);

 		String url = "GK_OPERATION_JSJY_LHSQ_ONE_CP?condition=ID=" + id + ";FJID=" + fjid;

 

-		boolean flag = getTbStatus(url,null);

+		boolean flag = getTbStatus(url, null);

 		if (flag) {

 			entity.setFlowstatus("0");

 			entity.setTbzt(Constants.YES);

@@ -741,27 +750,84 @@ public class LhsqCtl extends BaseWebCtl {
 
 						entity.setFlowstatus("1");

 					}

 				}

-				entity.setSftb(Constants.YES);

+				// entity.setSftb(Constants.YES);

 				entity = lhsqService.save(entity);

-				// 如果是省级审核通过或不通过后同步到市级

-				try {

-					List<LhsqfjEntity> fjlist = lhsqfjService.findBySqid(id);

-					String fjid = "";

-					if (fjlist != null && fjlist.size() > 0) {

-						for (LhsqfjEntity fj : fjlist) {

-							fjid = fjid + fj.getFjid() + ",";

+				if (flag) {

+					UserEntity user = securityMgr.getCurrUser();

+

+					// 许可证信息

+					GkjyrEntity jyr = gkjyrService.findOne(entity.getJyrid());

+					if(jyr != null){

+						XkzxxEntity xkz = new XkzxxEntity();

+						xkz.setGkjyr(jyr.getId());

+						// xkz.setZyqyfw(jyfwstr2);

+						xkz.setSpr(user.getName());

+						xkz.setDz(entity.getZcdz());

+						xkz.setFddbr(jyr.getFddbr());

+						if (!StringUtils.isEmpty(jyr.getSzgq())) {

+							xkz.setSsgq(jyr.getSzgq().getId());

 						}

-						fjid = fjid.substring(0, fjid.length() - 1);

+						xkz.setSzd(jyr.getSzd());

+						xkz.setLxdh(entity.getLxdh());

+						xkz.setCq(entity.getJydy());

+						if (!StringUtils.isEmpty(user.getSsglbm())) {

+							XzglbmxxEntity glbm = user.getSsglbm();

+							if ("00".equals(glbm.getPid())) {

+								xkz.setFzjg(glbm.getGkglbmqc());

+							} else {

+								XzglbmxxEntity pglbm = xzglbmxxService.getPglbm(glbm.getPid());

+								xkz.setFzjg(pglbm.getGkglbmqc());

+							}

+						}

+						String szd = jyr.getSzd().getBz();

+						CodeEntity code = securityMgr.codeService().findOne(jyr.getSzd().getPid());

+						while (!"00".equals(code.getPid())) {

+							szd = "苏" + szd;

+							code = securityMgr.codeService().findOne(code.getPid());

+						}

+						szd = szd + "港经证";

+						

+						xkz.setGkjyxkzh("");

+						xkz.setFzrq(new Date());

+						xkz.setYxqq(new Date());

+						xkz.setLxdh(entity.getLxdh());

+						SimpleDateFormat 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("111");

+						xkz.setIsflag("0");

+						xkz.setStype("1");

+						xkz.setOpid(entity.getId());

+						xkz = xkzxxService.save(xkz);

 					}

+					

+				}

+				//退回地市，同步

+				if (!flag) {

+					entity.setSftb(Constants.YES);

+					entity = lhsqService.save(entity);

+					// 如果是省级审核通过或不通过后同步到市级

+					try {

+						List<LhsqfjEntity> fjlist = lhsqfjService.findBySqid(id);

+						String fjid = "";

+						if (fjlist != null && fjlist.size() > 0) {

+							for (LhsqfjEntity fj : fjlist) {

+								fjid = fjid + fj.getFjid() + ",";

+							}

+							fjid = fjid.substring(0, fjid.length() - 1);

+						}

 

-					String url = "GK_OPERATION_JSJY_LHSQ_ONE_PC?condition=ID=" + entity.getId() + ";FJID=" + fjid;

-					boolean tbflag = getTbStatus(url,entity.getSzd().getId());

-					if (tbflag) {

-						entity.setTbzt("Y");

-						lhsqService.save(entity);

+						String url = "GK_OPERATION_JSJY_LHSQ_ONE_PC?condition=ID=" + entity.getId() + ";FJID=" + fjid;

+						boolean tbflag = getTbStatus(url, entity.getSzd().getId());

+						if (tbflag) {

+							entity.setTbzt("Y");

+							lhsqService.save(entity);

+						}

+					} catch (Exception e) {

+						e.printStackTrace();

 					}

-				} catch (Exception e) {

-					e.printStackTrace();

 				}

 			} else {

 				// rtx提醒

+ 8 - 0
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhsq/vo/LhsqVo.java
View File 

@@ -67,7 +67,15 @@ public class LhsqVo extends BaseVo {
 
 	private String tbzt = null;

 	private String currentname = null;

 	private String flowstatus = null;

+	private String opflag = null;

 

+	public String getOpflag() {

+		return opflag;

+	}

+

+	public void setOpflag(String opflag) {

+		this.opflag = opflag;

+	}

 	public String getFlowstatus() {

 		return flowstatus;

 	}

+ 67 - 16
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhyx/ctl/LhyxCtl.java
View File 

@@ -167,6 +167,10 @@ public class LhyxCtl extends BaseWebCtl {
 
 				} else if (entity.getRecordStatus() == BaseEntity.RECORD_STATE_COMPLETED) {

 					vo.setCurrentname("完成");

 				}

+				XkzxxEntity xkz = xkzxxService.findByOpid(entity.getId(), "133");

+				if (xkz != null) {

+					vo.setOpflag("1");

+				}

 				voList.add(vo);

 			}

 		}

@@ -644,27 +648,74 @@ public class LhyxCtl extends BaseWebCtl {
 
 						entity.setFlowstatus("1");

 					}

 				}

-				entity.setSftb(Constants.YES);

+				// entity.setSftb(Constants.YES);

 				entity = lhyxService.save(entity);

-				// 如果是省级审核通过或不通过后同步到市级

-				try {

-					List<LhyxfjEntity> fjlist = lhyxfjService.findByYxid(id);

-					String fjid = "";

-					if (fjlist != null && fjlist.size() > 0) {

-						for (LhyxfjEntity fj : fjlist) {

-							fjid = fjid + fj.getFjid() + ",";

+				if(flag){

+					List<XkzxxEntity> list = xkzxxService.findByJyrid(entity.getJyrid());

+					if(list != null && list.size()>0){

+						for(XkzxxEntity xkz:list){

+							if("1".equals(xkz.getSfyx())){

+								xkz.setIsflag("0");

+								xkz = xkzxxService.save(xkz);

+								XkzxxEntity xkzxx = new XkzxxEntity();

+								xkzxx.setCq(xkz.getCq());

+								xkzxx.setDz(xkz.getDz());

+								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());

+								xkzxx.setLxdh(xkz.getLxdh());

+								xkzxx.setQynbbh(xkz.getQynbbh());

+								xkzxx.setSpr(securityMgr.getCurrUser().getName());

+								xkzxx.setSsgq(xkz.getSsgq());

+								xkzxx.setSzd(xkz.getSzd());

+								xkzxx.setZyfs(xkz.getZyfs());

+								xkzxx.setZyhwpm(xkz.getZyhwpm());

+								xkzxx.setZyqyfw(xkz.getZyqyfw());

+								xkzxx.setSzgk(xkz.getSzgk());

+								//xkzxx.setZmpicid(xkz.getZmpicid());

+								if (xkz.getYxqz() != null) {

+									SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd");

+									String date = dateTimeFormat.format(xkz.getYxqz());

+									String t = (Integer.parseInt(date.substring(0, 4)) + 3) + date.substring(4);

+									xkzxx.setYxqz(dateTimeFormat.parse(t));

+								}

+								xkzxx.setSfyx("133");

+								xkzxx.setIsflag("0");

+								xkzxx.setStype("1");

+								xkzxx.setOpid(id);

+								xkzxxService.save(xkzxx);

+							}

 						}

-						fjid = fjid.substring(0, fjid.length() - 1);

 					}

+				}

+				

+				if (!flag) {

+					entity.setSftb(Constants.YES);

+					entity = lhyxService.save(entity);

+					// 如果是省级审核通过或不通过后同步到市级

+					try {

+						List<LhyxfjEntity> fjlist = lhyxfjService.findByYxid(id);

+						String fjid = "";

+						if (fjlist != null && fjlist.size() > 0) {

+							for (LhyxfjEntity fj : fjlist) {

+								fjid = fjid + fj.getFjid() + ",";

+							}

+							fjid = fjid.substring(0, fjid.length() - 1);

+						}

 

-					String url = "GK_OPERATION_JSJY_LHYX_ONE_PC?condition=ID=" + entity.getId() + ";FJID=" + fjid;

-					boolean tbflag = getTbStatus(url, entity.getSzd().getId());

-					if (tbflag) {

-						entity.setTbzt("Y");

-						lhyxService.save(entity);

+						String url = "GK_OPERATION_JSJY_LHYX_ONE_PC?condition=ID=" + entity.getId() + ";FJID=" + fjid + ";JYRID=1";

+						boolean tbflag = getTbStatus(url, entity.getSzd().getId());

+						if (tbflag) {

+							entity.setTbzt("Y");

+							lhyxService.save(entity);

+						}

+					} catch (Exception e) {

+						e.printStackTrace();

 					}

-				} catch (Exception e) {

-					e.printStackTrace();

 				}

 			} else {

 				// rtx提醒

+ 16 - 0
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhyx/vo/LhyxVo.java
View File 

@@ -46,7 +46,23 @@ public class LhyxVo extends BaseVo {
 
 	private String sftb = null;

 	private String tbzt = null;

 	private String currentname = null;

+	private String flowstatus = null;

+	private String opflag = null;

 

+	public String getOpflag() {

+		return opflag;

+	}

+

+	public void setOpflag(String opflag) {

+		this.opflag = opflag;

+	}

+	public String getFlowstatus() {

+		return flowstatus;

+	}

+

+	public void setFlowstatus(String flowstatus) {

+		this.flowstatus = flowstatus;

+	}

 	public String getSftb() {

 		return sftb;

 	}