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

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

@@ -178,7 +178,7 @@
 								</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
+									onclick="xkzbg.main.fz('${xkz.id}')"  title="发证"> <i
 										class="glyphicon glyphicon-th-list"></i>
 										</a>
 								</c:if>

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

@@ -172,7 +172,7 @@
 								</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
+									onclick="xkzsq.main.fz('${xkz.id}')"  title="发证"> <i
 										class="glyphicon glyphicon-th-list"></i>
 										</a>
 								</c:if>

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

@@ -161,7 +161,7 @@
 								</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
+									onclick="xkzyx.main.fz('${xkz.id}')"  title="发证"> <i
 										class="glyphicon glyphicon-th-list"></i>
 										</a>
 								</c:if>   

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

@@ -10,7 +10,7 @@
 		$.post($.app + "/gkjyr/bwxx2", {
 			id : $('#jyrid').val(),
 			czid:$('#id').val(),
-			recordStatus:11
+			recordStatus:0
 		}, function(data) {
 			if (data) {
 				var str =""

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

@@ -11,7 +11,7 @@
 		$.post($.app + "/gkjyr/cgxx", {
 			id : $('#jyrid').val(),
 			czid:$('#id').val(),
-			recordStatus:11
+			recordStatus:0
 		}, function(data) {
 			if (data) {
 				var str =""

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

@@ -10,7 +10,7 @@
 		$.post($.app + "/gkjyr/ckxx", {
 			id : $('#jyrid').val(),
 			czid:$('#id').val(),
-			recordStatus:11
+			recordStatus:0
 		}, function(data) {
 			if (data) {
 				var str =""

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

@@ -12,7 +12,7 @@
 		$.post($.app + "/gkjyr/dcxx", {
 			id : $('#jyrid').val(),
 			czid:$('#id').val(),
-			recordStatus:11
+			recordStatus:0
 		}, function(data) {
 			if (data) {
 				var str =""

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

@@ -11,7 +11,7 @@ function mtxxview(mtid){
 		$.post($.app + "/gkjyr/mtxx", {
 			id : $('#jyrid').val(),
 			czid:$('#id').val(),
-			recordStatus:11
+			recordStatus:0
 		}, function(data) {
 			if (data) {
 				var str =""

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

@@ -12,7 +12,7 @@
 		$.post($.app + "/gkjyr/qytzxx", {
 			id : $('#jyrid').val(),
 			czid:$('#id').val(),
-			recordStatus:11
+			recordStatus:0
 		}, function(data) {
 			if (data) {
 				var str =""

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

@@ -43,7 +43,7 @@
 		$.post($.app + "/gkjyr/ryxx2", {
 			id : $('#jyrid').val(),
 			czid:$('#id').val(),
-			recordStatus:11
+			recordStatus:0
 		}, function(data) {
 			if (data) {
 				var str =""

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

@@ -12,7 +12,7 @@
 		$.post($.app + "/gkjyr/sssbxx", {
 			id : $('#jyrid').val(),
 			czid:$('#id').val(),
-			recordStatus:11
+			recordStatus:0
 		}, function(data) {
 			if (data) {
 				var str =""

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

@@ -289,7 +289,7 @@
 			</td>
 			<th>有效日期：&nbsp;</th>
 			<td >
-				<input type="text" class="form-control" readonly="readonly" id="yxrq" name="yxrq" value="${fn:substring(gkjyr.fzrq,0,10)}" style="width: 72%"> 
+				<input type="text" class="form-control" readonly="readonly" id="yxrq" name="yxrq" value="${gkjyr.xkzyxqfmt}" style="width: 72%"> 
 			</td>
 		</tr>
 		<tr>

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

@@ -10,7 +10,7 @@
 		$.post($.app + "/gkjyr/zxjxxx", {
 			id : $('#jyrid').val(),
 			czid:$('#id').val(),
-			recordStatus:11
+			recordStatus:0
 		}, function(data) {
 			if (data) {
 				var str =""

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhbg/lhbgmain.jsp

@@ -161,7 +161,7 @@
 							 </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
+									onclick="lhbg.main.fz('${lhbg.id}')"  title="发证"> <i
 										class="glyphicon glyphicon-search"></i>
 										</a>
 							 </c:if>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhsq/lhsqmain.jsp

@@ -162,7 +162,7 @@
 							 
 							 <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
+									onclick="lhsq.main.fz('${lhsq.id}')"  title="发证"> <i
 										class="glyphicon glyphicon-th-list"></i>
 										</a>
 							 </c:if>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhyx/lhyxmain.jsp

@@ -163,7 +163,7 @@
 							 </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
+									onclick="lhyx.main.fz('${lhyx.id}')"  title="发证"> <i
 										class="glyphicon glyphicon-search"></i>
 										</a>
 							 </c:if>

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

@@ -8,33 +8,32 @@ xkzbg.main.szd = null;
 xkzbg.main.szgq = null;
 xkzbg.main.szgk = null;
 
-
 xkzbg.main.init = function() {
-	
+
 	xkzbg.main.sel();
 	// 把form传入，构造翻页控件
 	pageinfo($("#xkzbgform"));
 }
 
-xkzbg.main.sel = function(){
+xkzbg.main.sel = function() {
 	initszdSelect('szdsel', xkzbg.main.szd, 'showgk', '80%');
-	initgkSelect('gksel', xkzbg.main.szgk,  xkzbg.main.szd,'showgq', '80%');
-	initgqSelect('gqsel', xkzbg.main.szgq,  xkzbg.main.szd,xkzbg.main.szgk, null, '80%');
+	initgkSelect('gksel', xkzbg.main.szgk, xkzbg.main.szd, 'showgq', '80%');
+	initgqSelect('gqsel', xkzbg.main.szgq, xkzbg.main.szd, xkzbg.main.szgk,
+			null, '80%');
 }
 
 function showgk() {
-	initgqSelect('gqsel','','','',null,'80%');
+	initgqSelect('gqsel', '', '', '', null, '80%');
 	initgkSelect('gksel', xkzbg.main.szgk, $('.szdselectpicker').val(),
 			'showgq', '80%');
 }
 
 function showgq() {
-	initgqSelect('gqsel', xkzbg.main.szgq, $('.szdselectpicker').val(),
-			$('.gkselectpicker').val(), null, '80%');
+	initgqSelect('gqsel', xkzbg.main.szgq, $('.szdselectpicker').val(), $(
+			'.gkselectpicker').val(), null, '80%');
 }
 
-
-//新增
+// 新增
 xkzbg.main.add = function() {
 	$.ajax({
 		async : true,
@@ -43,7 +42,7 @@ xkzbg.main.add = function() {
 		dataType : "json",
 		success : function(data) {// ajax返回的数据
 			if (data.success) {
-				location.href=$.app+"/xkzbg/addmain";
+				location.href = $.app + "/xkzbg/addmain";
 			} else {
 				$.alert({
 					title : '提示',
@@ -54,62 +53,66 @@ xkzbg.main.add = function() {
 			}
 		}
 	});
-	
+
 }
 
-xkzbg.main.search=function(){
+xkzbg.main.search = function() {
 	$('#pagejump').val(1);
 	$("#xkzbgform").submit();
 }
 
-xkzbg.main.del=function(data){
+xkzbg.main.del = function(data) {
 	$.confirm({
-	    title: '确认框',
-	    content: '确认删除吗',
-	    confirm: function(){
-	    	 $.post($.app + "/xkzbg/delete", {
-                 id : data
-             }, function(data) {
-                 if (data.success) {
-                	 $.alert({
-                		    title: '提示',
-                		    content: '删除成功',
-                		    confirm: function(){
-                		    	$("#xkzbgform").submit();
-                		    }
-                	 });
-                 } else {
-                	 $.alert({
-             		    title: '提示',
-             		    content: data.message,
-             		    confirm: function(){
-             		        
-             		    }
-             	 });
-                 }
-             }, "json");
-	    },
-	    cancel: function(){
-	    }
+		title : '确认框',
+		content : '确认删除吗',
+		confirm : function() {
+			$.post($.app + "/xkzbg/delete", {
+				id : data
+			}, function(data) {
+				if (data.success) {
+					$.alert({
+						title : '提示',
+						content : '删除成功',
+						confirm : function() {
+							$("#xkzbgform").submit();
+						}
+					});
+				} else {
+					$.alert({
+						title : '提示',
+						content : data.message,
+						confirm : function() {
+
+						}
+					});
+				}
+			}, "json");
+		},
+		cancel : function() {
+		}
 	});
 }
 
-xkzbg.main.edit=function(data){
-	location.href=$.app+"/xkzbg/editmain?id="+data;
+xkzbg.main.edit = function(data) {
+	location.href = $.app + "/xkzbg/editmain?id=" + data;
+}
+
+xkzbg.main.fz = function(data) {
+	location.href = $.app + "/xkzxx/editxkz?status=12&id=" + data;
 }
 
-xkzbg.main.back=function(data){
-	location.href=$.app+"/xkzbg/editmain?flag=th&id="+data;
+xkzbg.main.back = function(data) {
+	location.href = $.app + "/xkzbg/editmain?flag=th&id=" + data;
 }
 
-xkzbg.main.banli=function(data){
-	location.href=$.app+"/xkzbg/viewmain?flag=audit&id="+data;
+xkzbg.main.banli = function(data) {
+	location.href = $.app + "/xkzbg/viewmain?flag=audit&id=" + data;
 }
 
-xkzbg.main.view=function(data){
-	location.href=$.app+"/xkzbg/viewmain?id="+data;
+xkzbg.main.view = function(data) {
+	location.href = $.app + "/xkzbg/viewmain?id=" + data;
 }
 
-xkzbg.main.showxkzjds=function(data){
-	location.href=$.app+"/xkzbg/showXkzjds?bgid="+data;
+xkzbg.main.showxkzjds = function(data) {
+	location.href = $.app + "/xkzbg/showXkzjds?bgid=" + data;
 }

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

@@ -100,6 +100,10 @@ xkzsq.main.edit = function(data) {
 	location.href = $.app + "/xkzsq/editmain?id=" + data;
 }
 
+xkzsq.main.fz = function(data) {
+	location.href = $.app + "/xkzxx/editxkz?status=11&id=" + data;
+}
+
 xkzsq.main.back = function(data) {
 	location.href = $.app + "/xkzsq/editmain?flag=th&id=" + data;
 }

gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gkjyxkgl/gkjyzkyx/xkzyxmain.js

@@ -101,6 +101,10 @@ xkzyx.main.edit=function(data){
 	location.href=$.app+"/xkzyx/editmain?id="+data;
 }
 
+xkzyx.main.fz=function(data){
+	location.href=$.app+"/xkzxx/editxkz?status=13&id="+data;
+}
+
 xkzyx.main.view=function(data){
 	location.href=$.app+"/xkzyx/viewmain?id="+data;
 }

gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gkjyxkgl/gkjyzkzx/xkzzxdetail.js

@@ -321,6 +321,7 @@ xkzzx.detail.audit=function(auditpass,id){
 	}else{
 		audit=false;
 	}
+	$(".btn").attr("disabled",true);
 	$.post($.app + "/xkzzx/audit", {
 		id:id,
         shyj:shyj,
@@ -344,7 +345,7 @@ xkzzx.detail.audit=function(auditpass,id){
        		    title: '提示',
        		    content: data.message,
        		    confirm: function(){
-       		    	
+       		    	$(".btn").attr("disabled",false);
        		    }
            	});
        }

gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gklhxkgl/gkjylhbg/lhbgmain.js

@@ -97,6 +97,10 @@ lhbg.main.edit=function(data){
 	location.href=$.app+"/lhbg/edit?id="+data;
 }
 
+lhbg.main.fz=function(data){
+	location.href=$.app+"/xkzxx/editLhxkz?status=122&id="+data;
+}
+
 lhbg.main.back=function(data){
 	location.href=$.app+"/lhbg/edit?flag=th&id="+data;
 }

gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gklhxkgl/gkjylhsq/lhsqmain.js

@@ -41,6 +41,11 @@ lhsq.main.edit = function(data) {
 	location.href = $.app + "/lhsq/edit?id=" + data;
 }
 
+lhsq.main.fz = function(data) {
+	location.href = $.app + "/xkzxx/editLhxkz?status=111&id=" + data;
+}
+
+
 lhsq.main.back = function(data) {
 	location.href = $.app + "/gklhsq/editmain?flag=th&id=" + data;
 }

gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gklhxkgl/gkjylhyx/lhyxmain.js

@@ -97,6 +97,10 @@ lhyx.main.del = function(data) {
 	});
 }
 
+lhyx.main.fz = function(data) {
+	location.href = $.app + "/xkzxx/editLhxkz?status=133&id=" + data;
+}
+
 lhyx.main.edit = function(data) {
 	location.href = $.app + "/lhyx/edit?id=" + data;
 }

gkjsjy/trunk/src/com/xt/jygl/ggfwxxgl/jdtxxx/ctl/JdtxxxCtl.java

@@ -36,6 +36,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.ggfwxxgl.jdjc.entity.JdjcfjEntity;
 import com.xt.jygl.ggfwxxgl.jdjc.service.JdjcfjService;
 import com.xt.jygl.ggfwxxgl.jdtxxx.entity.JdtxxxEntity;
@@ -78,6 +80,7 @@ public class JdtxxxCtl extends BaseWebCtl {
 
 	/**
 	 * 一览信息
+	 * 
 	 * @param page
 	 * @param model
 	 * @param request
@@ -180,14 +183,19 @@ public class JdtxxxCtl extends BaseWebCtl {
 								vo.setTaskState(Constants.IS_MY_TASK);
 							}
 						}
-					} else if (entity.getRecordStatus() == BaseEntity.RECORD_STATE_VALID) {
+					} else {
 						if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
 							if ("0".equals(entity.getFlowstatus())) {
-								vo.setCurrentname("下发");
+								vo.setCurrentname("省级下发");
 							} else if ("1".equals(entity.getFlowstatus())) {
 								vo.setCurrentname("地市已同步到省");
 							} else {
-								vo.setCurrentname("");
+								if (entity.getRecordStatus() == BaseEntity.RECORD_STATE_COMPLETED) {
+									vo.setCurrentname("完成");
+								} else {
+									vo.setCurrentname("未提交");
+								}
+
 							}
 						} else {
 							if ("0".equals(entity.getFlowstatus())) {
@@ -199,8 +207,6 @@ public class JdtxxxCtl extends BaseWebCtl {
 							}
 						}
 					}
-				} else if (entity.getRecordStatus() == BaseEntity.RECORD_STATE_COMPLETED) {
-					vo.setCurrentname("完成");
 				}
 
 				vo.setSzd(entity.getSzd() != null ? entity.getSzd().getId() : "");
@@ -215,7 +221,7 @@ public class JdtxxxCtl extends BaseWebCtl {
 		}
 		if (isPOST(request)) {
 			SearchCondition.jdtxpage = page.getPage();
-			//cacheSCmap.put("jdtxpage", page.getPage());
+			// cacheSCmap.put("jdtxpage", page.getPage());
 			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);
 		}
 		model.addAttribute("list", voList);
@@ -234,7 +240,7 @@ public class JdtxxxCtl extends BaseWebCtl {
 		return "ggfwxxgl/jdtxxx/jdtxxxmain";
 	}
 
-	//删除
+	// 删除
 	@RequestMapping(value = "/delete")
 	@ResponseBody
 	@RequiresPermissions("jdtxxx:delete")
@@ -250,7 +256,7 @@ public class JdtxxxCtl extends BaseWebCtl {
 		return wr;
 	}
 
-	//保存数据
+	// 保存数据
 	@RequestMapping(value = "/save")
 	@ResponseBody
 	public WebJsonResult save(Model model, JdtxxxEntity code, String szdid, String szgkid, String accid, String szgqid, String jyrid) {
@@ -336,7 +342,7 @@ public class JdtxxxCtl extends BaseWebCtl {
 		return wr;
 	}
 
-	//下发保存
+	// 下发保存
 	@RequestMapping(value = "/savexf")
 	@ResponseBody
 	public WebJsonResult savexf(Model model, JdtxxxEntity code, String szdid, String szgkid, String accid, String szgqid, String jyrid) {
@@ -423,7 +429,7 @@ public class JdtxxxCtl extends BaseWebCtl {
 		return wr;
 	}
 
-	//同步 数据 
+	// 同步 数据
 	@RequestMapping(value = "/saveTb")
 	@ResponseBody
 	public WebJsonResult saveTb(Model model, String id) {
@@ -431,6 +437,7 @@ public class JdtxxxCtl extends BaseWebCtl {
 		JdtxxxEntity entity = jdtxxxService.findOne(id);
 
 		entity.setSftb(Constants.YES);
+		entity.setFlowstatus("0");
 		jdtxxxService.save(entity);
 
 		List<JdjcfjEntity> fjlist = jdjcfjService.findByJdjcid(id, "1");
@@ -447,7 +454,6 @@ public class JdtxxxCtl extends BaseWebCtl {
 
 		boolean flag = getTbStatus(url, entity.getSzd().getId());
 		if (flag) {
-			entity.setFlowstatus("0");
 			entity.setTbzt(Constants.YES);
 			jdtxxxService.save(entity);
 		} else {
@@ -460,7 +466,7 @@ public class JdtxxxCtl extends BaseWebCtl {
 		return wr;
 	}
 
-	//提交数据
+	// 提交数据
 	@RequestMapping(value = "/submit")
 	@ResponseBody
 	public WebJsonResult submit(Model model, JdtxxxEntity code, String accid, String szdid, String szgkid, String szgqid, String jyrid) {
@@ -545,7 +551,7 @@ public class JdtxxxCtl extends BaseWebCtl {
 		return wr;
 	}
 
-	//退回提交
+	// 退回提交
 	@RequestMapping(value = "/submitAudit")
 	@ResponseBody
 	public WebJsonResult submitAudit(JdtxxxEntity code, String accid) {
@@ -583,7 +589,7 @@ public class JdtxxxCtl extends BaseWebCtl {
 		return wr;
 	}
 
-	//审核流程
+	// 审核流程
 	@RequestMapping(value = "/audit")
 	@ResponseBody
 	public WebJsonResult audit(String shyj, String id, String dqzt, String zghtzje, String flag, String accid) {
@@ -652,13 +658,13 @@ public class JdtxxxCtl extends BaseWebCtl {
 		return wr;
 	}
 
-	//编辑信息
+	// 编辑信息
 	@RequestMapping(value = "/edit")
 	@RequiresPermissions("jdtxxx:edit")
-	public String edit(Model model, String id, String flag,String path,String type) {
+	public String edit(Model model, String id, String flag, String path, String type) {
 		model.addAttribute("flag", flag);
-		model.addAttribute("path",path);
-		model.addAttribute("type",type);
+		model.addAttribute("path", path);
+		model.addAttribute("type", type);
 		JdtxxxEntity entity = jdtxxxService.findOne(id);
 		JdtxxxVo vo = new JdtxxxVo();
 		BeanUtils.copyProperties(entity, vo);
@@ -671,6 +677,38 @@ public class JdtxxxCtl extends BaseWebCtl {
 
 		List<JdjcfjEntity> list = jdjcfjService.findByJdjcid(id, "1");
 		if (list != null && list.size() > 0) {
+			if ("0".equals(entity.getFlowstatus())) {
+				for (JdjcfjEntity fj : list) {
+					if (!StringUtils.isEmpty(fj.getFjid())) {
+						if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && GlobalData.FTP_FLAG.equals(Constants.YES)) {
+							AccessoryEntity acc = accessoryService.findOne(fj.getFjid());
+							if (acc != null) {
+								try {
+									Ftp f = getftp();
+									// 本地目录
+									String localBaseDir = GlobalData.UPLOAD_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();
+								}
+							}
+						}
+					}
+				}
+			}
 			model.addAttribute("fjlist", list);
 		}
 		if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
@@ -681,12 +719,12 @@ public class JdtxxxCtl extends BaseWebCtl {
 		return "ggfwxxgl/jdtxxx/jdtxxxedit";
 	}
 
-	//查看
+	// 查看
 	@RequestMapping(value = "/view")
-	public String view(Model model, String id, String flag, String opflag,String path,String type) {
+	public String view(Model model, String id, String flag, String opflag, String path, String type) {
 		model.addAttribute("flag", flag);
-		model.addAttribute("path",path);
-		model.addAttribute("type",type);
+		model.addAttribute("path", path);
+		model.addAttribute("type", type);
 		JdtxxxEntity entity = jdtxxxService.findOne(id);
 		JdtxxxVo vo = new JdtxxxVo();
 		BeanUtils.copyProperties(entity, vo);
@@ -738,16 +776,77 @@ public class JdtxxxCtl extends BaseWebCtl {
 
 		List<JdjcfjEntity> zgfjlist = jdjcfjService.findByJdjcid(id, "1");
 		if (zgfjlist != null && zgfjlist.size() > 0) {
+			for (JdjcfjEntity fj : zgfjlist) {
+				if (!StringUtils.isEmpty(fj.getFjid())) {
+					if (!GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && GlobalData.FTP_FLAG.equals(Constants.YES)) {
+						AccessoryEntity acc = accessoryService.findOne(fj.getFjid());
+						if (acc != null) {
+							try {
+								Ftp f = getftp();
+								// 本地目录
+								String localBaseDir = GlobalData.UPLOAD_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();
+							}
+						}
+					}
+				}
+			}
+
 			model.addAttribute("zgfjlist", zgfjlist);
 		}
 		List<JdjcfjEntity> zghfjlist = jdjcfjService.findByJdjcid(id, "2");
 		if (zghfjlist != null && zghfjlist.size() > 0) {
+			for (JdjcfjEntity fj : zghfjlist) {
+				if (!StringUtils.isEmpty(fj.getFjid())) {
+					if (!GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && GlobalData.FTP_FLAG.equals(Constants.YES)) {
+						AccessoryEntity acc = accessoryService.findOne(fj.getFjid());
+						if (acc != null) {
+							try {
+								Ftp f = getftp();
+								// 本地目录
+								String localBaseDir = GlobalData.UPLOAD_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();
+							}
+						}
+					}
+				}
+			}
 			model.addAttribute("zghfjlist", zghfjlist);
 		}
 		return "ggfwxxgl/jdtxxx/jdtxxxview";
 	}
 
-	//新增
+	// 新增
 	@RequestMapping(value = "/add")
 	@RequiresPermissions("jdtxxx:add")
 	public String add(Model model) {
@@ -802,7 +901,7 @@ public class JdtxxxCtl extends BaseWebCtl {
 		return wr;
 	}
 
-	//删除附件
+	// 删除附件
 	@RequestMapping(value = "/delFile")
 	@ResponseBody
 	public WebJsonResult delFile(String accid, Model model) {

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzxx/ctl/XkzxxCtl.java

@@ -1135,16 +1135,14 @@ public class XkzxxCtl extends BaseWebCtl {
 	@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(); } }
-		 */
+		String path="";
+		if("11".equals(status)){
+			path="/xkzsq/main";
+		}else if("12".equals(status)){
+			path="/xkzbg/main";
+		}else if("13".equals(status)){
+			path="/xkzyx/main";
+		}
 
 		XkzxxEntity xkzxx = xkzxxService.findByOpid(id, status);
 
@@ -1185,6 +1183,7 @@ public class XkzxxCtl extends BaseWebCtl {
 			} else {
 				vo.setFmpicid("");
 			}
+			model.addAttribute("path", path);
 			model.addAttribute("record", vo);
 			model.addAttribute("opId", id);
 		}
@@ -1329,6 +1328,15 @@ public class XkzxxCtl extends BaseWebCtl {
 	@RequestMapping(value = "/editLhxkz")
 	public String editLhxkz(Model model, String id, String status, String menuid) {
 		model.addAttribute("menuid", menuid);
+		String path="";
+		if("111".equals(status)){
+			path="/lhsq/main";
+		}else if("122".equals(status)){
+			path="/lhbg/main";
+		}else if("133".equals(status)){
+			path="/lhyx/main";
+		}
+		model.addAttribute("path", path);
 		XkzxxEntity xkzxx = xkzxxService.findByOpid(id, status);
 
 		if (xkzxx != null) {

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

@@ -478,7 +478,7 @@ public class XkzzxCtl extends BaseWebCtl {
 		}
 		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(gkjyr.getId());
 		for (XkzxxEntity xkz : xkzs) {
-			if (BaseEntity.RECORD_STATE_VALID == xkz.getRecordStatus() && Constants.XKZ_SX.equals(xkz.getSfyx())) {
+			if (Constants.XKZ_SX.equals(xkz.getSfyx())) {
 				gkjyrVo.setXkzyxq(xkz.getYxqz());
 				gkjyrVo.setXkzyxqfmt(DateTime.toString(xkz.getYxqz()));
 				gkjyrVo.setGkjyxkzh(xkz.getGkjyxkzh());