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

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

@@ -160,7 +160,7 @@
    
    	<a class="btn btn-default btn-sm" href="#" onclick="lhbg.detail.saveTb()">
   <i class="glyphicon glyphicon-check"></i> 
-           转报省级</a>        
+           提交</a>        
            
   <!-- 	<a class="btn btn-default btn-sm" href="#" onclick="lhbg.detail.submit()">
   <i class="glyphicon glyphicon-share"></i> 

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

@@ -161,12 +161,15 @@
            保存</a>
            	<a class="btn btn-default btn-sm" href="#" onclick="lhbg.detail.saveTb()">
   <i class="glyphicon glyphicon-check"></i> 
-           转报省级</a>     
+           提交</a>     
            </c:if>
            <c:if test="${ssFlag ==0 }">
   	<a class="btn btn-default btn-sm" href="#" onclick="lhbg.detail.submit()">
   <i class="glyphicon glyphicon-share"></i> 
            提交</a>
+    <a class="btn btn-default btn-sm" href="#" onclick="lhbg.detail.editReturn('${record.id}')">
+   <i class="glyphicon glyphicon-ban-circle"></i> 
+            退回</a>
            </c:if>
             <a class="btn btn-default btn-sm" href="#"  onclick="lhbg.detail.back()">
   <i class="glyphicon glyphicon-arrow-left"></i> 

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

@@ -365,7 +365,7 @@
 							
 							<a class="btn btn-default btn-sm" href="#"
 								onclick="lhsq.detail.saveTb()"> <i
-								class="glyphicon glyphicon-check"></i> 转报省局
+								class="glyphicon glyphicon-check"></i> 提交
 							</a> 
 							
 							<a class="btn btn-default btn-sm" href="#"

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

@@ -219,6 +219,9 @@
 								<i
 								class="glyphicon glyphicon-share"></i> 提交
 							</a>
+							<a class="btn btn-default btn-sm" href="#"  onclick="lhsq.detail.editReturn('${record.id}')">
+							   <i class="glyphicon glyphicon-ban-circle"></i> 
+							            退回</a>
 							</c:if>
 							 <a class="btn btn-default btn-sm" href="#"
 								onclick="lhsq.detail.back()"> 
@@ -368,7 +371,7 @@
 							</a> 
 								<a class="btn btn-default btn-sm" href="#"
 								onclick="lhsq.detail.saveTb()"> <i
-								class="glyphicon glyphicon-check"></i> 转报省局
+								class="glyphicon glyphicon-check"></i> 提交
 							</a> 
 							</c:if>
 							 <c:if test="${ssFlag == 0 }"> 
@@ -377,6 +380,9 @@
 								<i
 								class="glyphicon glyphicon-share"></i> 提交
 							</a>
+							<a class="btn btn-default btn-sm" href="#" onclick="lhsq.detail.editReturn('${record.id}')">
+							   <i class="glyphicon glyphicon-ban-circle"></i> 
+							            退回</a>
 							</c:if>
 							 <a class="btn btn-default btn-sm" href="#"
 								onclick="lhsq.detail.back()"> 

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

@@ -197,7 +197,7 @@
            
            <a class="btn btn-default btn-sm" href="#"
 								onclick="lhyx.detail.saveTb()"> <i
-								class="glyphicon glyphicon-check"></i> 转报省局
+								class="glyphicon glyphicon-check"></i> 提交
 							</a> 
  <!--  	<a class="btn btn-default btn-sm" href="#" onclick="lhyx.detail.submit()">
   <i class="glyphicon glyphicon-share"></i> 

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

@@ -172,15 +172,19 @@
            保存</a>
             <a class="btn btn-default btn-sm" href="#"
 								onclick="lhyx.detail.saveTb()"> <i
-								class="glyphicon glyphicon-check"></i> 转报省局
+								class="glyphicon glyphicon-check"></i> 提交
 							</a> 
            </c:if>
            	<c:if test="${ssFlag ==0 }">
   	<a class="btn btn-default btn-sm" href="#" onclick="lhyx.detail.submit()">
   <i class="glyphicon glyphicon-share"></i> 
            提交</a>
+  <a class="btn btn-default btn-sm" href="#" onclick="lhyx.detail.editReturn('${record.id}')">
+							   <i class="glyphicon glyphicon-ban-circle"></i> 
+							            退回</a>
            </c:if>
             <a class="btn btn-default btn-sm" href="#"  onclick="lhyx.detail.back()">
+  
   <i class="glyphicon glyphicon-arrow-left"></i> 
            返回</a>
   			</div>

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

@@ -452,4 +452,32 @@ lhbg.detail.submitAudit=function(){
             }
 	     }
     }); 
-}
+}
+
+//退回
+lhbg.detail.editReturn=function(id){
+	$.post($.app + "/lhbg/editReturn", {
+		id:id
+	}, function(data) {
+		if (data.success) {
+			
+			$.alert({
+				title: '提示',
+				content: '操作成功',
+				confirm: function(){
+					lhbg.detail.back();
+				}
+			});
+			
+		}else {
+			$.alert({
+				title: '提示',
+				content: data.message,
+				confirm: function(){
+					$(".btn").attr("disabled",false);
+				}
+			});
+		}
+		
+	}, "json");
+}

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

@@ -373,7 +373,6 @@ lhsq.detail.audit=function(auditpass,id){
     }, "json");
 }
 
-
 lhsq.detail.submitAudit=function(){
 	if (isEmpty($('#userids').val())) {
 		$.alert({
@@ -412,3 +411,31 @@ lhsq.detail.submitAudit=function(){
 	     }
     }); 
 }
+
+//退回
+lhsq.detail.editReturn=function(id){
+	$.post($.app + "/lhsq/editReturn", {
+		id:id
+	}, function(data) {
+		if (data.success) {
+			
+			$.alert({
+				title: '提示',
+				content: '操作成功',
+				confirm: function(){
+					lhsq.detail.back();
+				}
+			});
+			
+		}else {
+			$.alert({
+				title: '提示',
+				content: data.message,
+				confirm: function(){
+					$(".btn").attr("disabled",false);
+				}
+			});
+		}
+		
+	}, "json");
+}

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

@@ -447,4 +447,32 @@ lhyx.detail.submitAudit=function(){
             }
 	     }
     }); 
+}
+
+//退回
+lhyx.detail.editReturn=function(id){
+	$.post($.app + "/lhyx/editReturn", {
+		id:id
+	}, function(data) {
+		if (data.success) {
+			
+			$.alert({
+				title: '提示',
+				content: '操作成功',
+				confirm: function(){
+					lhyx.detail.back();
+				}
+			});
+			
+		}else {
+			$.alert({
+				title: '提示',
+				content: data.message,
+				confirm: function(){
+					$(".btn").attr("disabled",false);
+				}
+			});
+		}
+		
+	}, "json");
 }

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhbg/ctl/LhbgCtl.java

@@ -903,5 +903,47 @@ public class LhbgCtl extends BaseWebCtl {
 			e.printStackTrace();
 		}
 	}
+	
+	/**
+	 * 退回
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "/editReturn")
+	@ResponseBody
+	public WebJsonResult editReturn(String id) {
+		WebJsonResult wr = success();
+		LhbgEntity entity = new LhbgEntity();
+		try {
+			entity = lhbgService.findOne(id);
+			entity.setFlowstatus("1");
+			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() + ",";
+					}
+					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) {
+			wr.setSuccess(false);
+			wr.setMessage("操作失败！");
+			e.printStackTrace();
+		}
+		return wr;
+	}
 
 }

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhsq/ctl/LhsqCtl.java

@@ -944,6 +944,50 @@ public class LhsqCtl extends BaseWebCtl {
 		}
 		return wr;
 	}
+	
+	/**
+	 * 退回
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "/editReturn")
+	@ResponseBody
+	public WebJsonResult editReturn(String id) {
+		WebJsonResult wr = success();
+		LhsqEntity entity = new LhsqEntity();
+		try {
+			entity = lhsqService.findOne(id);
+			entity.setFlowstatus("1");
+			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);
+				}
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		} catch (Exception e) {
+			wr.setSuccess(false);
+			wr.setMessage("操作失败！");
+			e.printStackTrace();
+		}
+		return wr;
+	}
+	
 
 	/**
 	 * 签收

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhyx/ctl/LhyxCtl.java

@@ -46,6 +46,7 @@ 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.gkjylhsq.entity.LhsqEntity;
+import com.xt.jygl.gkjygl.gklhxkgl.gkjylhsq.entity.LhsqfjEntity;
 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;
@@ -895,5 +896,48 @@ public class LhyxCtl extends BaseWebCtl {
 			e.printStackTrace();
 		}
 	}
+	
+	/**
+	 * 退回
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "/editReturn")
+	@ResponseBody
+	public WebJsonResult editReturn(String id) {
+		WebJsonResult wr = success();
+		LhyxEntity entity = new LhyxEntity();
+		try {
+			entity = lhyxService.findOne(id);
+			entity.setFlowstatus("1");
+			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 + ";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) {
+			wr.setSuccess(false);
+			wr.setMessage("操作失败！");
+			e.printStackTrace();
+		}
+		return wr;
+	}
 
 }