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

gkjsjy/trunk/WebContent/WEB-INF/pages/gkyxtjyfx/hxhbtj/hxhbtj.jsp

@@ -106,12 +106,14 @@
 							        <a class="btn btn-default btn-xs" href="#" onclick="hxhbtj.main.view('${list.id}')" title="查看">
 							            <i class="glyphicon glyphicon-search"></i>
 							        </a>
-									<a class="btn btn-default btn-xs" href="#"  onclick="hxhbtj.main.edit('${list.id}')" title="编辑">
-								   		<i class="glyphicon glyphicon-pencil"></i>
-								   	</a>
-								    <a class="btn btn-default btn-xs" href="#" onclick="hxhbtj.main.del('${list.id}')" title="删除">
-								   		<i class="glyphicon glyphicon-trash"></i>
-								   	</a>
+							        <c:if test="${list.recordStatus == 1 }">
+										<a class="btn btn-default btn-xs" href="#"  onclick="hxhbtj.main.edit('${list.id}')" title="编辑">
+									   		<i class="glyphicon glyphicon-pencil"></i>
+									   	</a>
+									    <a class="btn btn-default btn-xs" href="#" onclick="hxhbtj.main.del('${list.id}')" title="删除">
+									   		<i class="glyphicon glyphicon-trash"></i>
+									   	</a>
+								   	</c:if>
 						        </td>
 						    </tr>
 					    </c:forEach>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkyxtjyfx/hxhbtj/hxhbtjEdit.jsp

@@ -141,7 +141,7 @@
             	<a class="btn btn-default btn-sm" href="#" onclick="hxhbtj.detail.save()">
 			   		<i class="glyphicon glyphicon-floppy-disk"></i>保存
 			   	</a>
-			   	<a class="btn btn-default btn-sm" href="#" onclick="hxhbtj.detail.submit()">
+			   	<a class="btn btn-default btn-sm" href="#" onclick="hxhbtj.detail.saveTbzt()">
 					<i class="glyphicon glyphicon-share"></i>提交
 				</a>
 				<a class="btn btn-default btn-sm" href="#"  onclick="hxhbtj.detail.back()">

gkjsjy/trunk/WebContent/static/biz/js/gkyxtjyfx/hxhbtj/hxhbtjdetail.js

@@ -87,27 +87,31 @@ hxhbtj.detail.stat=function(){
 
 hxhbtj.detail.saveTbzt=function(data){
 	 $(".btn").attr("disabled",true);
-	 $.post($.app + "/hxhbtj/saveTbzt", {
-        id : data
-    }, function(data) {
-        if (data.success) {
-       	 $.alert({
-       		    title: '提示',
-       		    content: '提交成功',
-       		    confirm: function(){
-       		    	location.href=$.app+'/hxhbtj/main';
-       		    }
-       	 });
-        } else {
-       	 $.alert({
-    		    title: '提示',
-    		    content: data.message,
-    		    confirm: function(){
-    		    	 $(".btn").attr("disabled",false);
-    		    }
-    	 });
-        }
-    }, "json");
+	 $.ajax({
+			url:$.app + "/hxhbtj/saveTbzt",
+			data:$("#addform").serialize(),
+			type:"post",
+			dataType:"json",
+			success:function(data){//ajax返回的数据
+				if (data.success) {
+					$.alert({
+		       		    title: '提示',
+		       		    content: '提交成功',
+		       		    confirm: function(){
+		       		    	location.href=$.app+'/hxhbtj/main';
+		       		    }
+		       	 });
+				}else {
+					$.alert({
+		    		    title: '提示',
+		    		    content: data.message,
+		    		    confirm: function(){
+		    		    	 $(".btn").attr("disabled",false);
+		    		    }
+		    	 });
+				}
+			}
+		});
 };
 	 
 //验证不为空

gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/hxhbtj/ctl/HxhbtjCtl.java

@@ -87,6 +87,7 @@ public class HxhbtjCtl extends BaseWebCtl {
 				vo.setBnljl(entity.getBnljl() != null ? entity.getBnljl().toString() : "");
 				vo.setTbzzs(entity.getTbzzs() != null ? entity.getTbzzs().toString() : "");
 				vo.setRq(entity.getRq() != null ? entity.getRq().toString() : "");
+				vo.setRecordStatus(entity.getRecordStatus());
 				voList.add(vo);
 			}
 		}
@@ -331,12 +332,8 @@ public class HxhbtjCtl extends BaseWebCtl {
 			szgk.setId(szgkid);
 			entity.setSzgk(szgk);
 			
-			if (!StringUtils.isEmpty(path) && path.indexOf("bg") > 0) {
-				if (path.indexOf("add") > 0) {
-					entity.setRecordStatus(BaseEntity.RECORE_STATE_COPY);
-				} else {
-					entity.setRecordStatus(BaseEntity.RECORE_STATE_BGFLAG);
-				}
+			if("1".equals(path)){
+				entity.setRecordStatus(code.getRecordStatus());
 			}
 			hxhbtjService.save(entity);
 		} catch (Exception e) {
@@ -478,29 +475,44 @@ public class HxhbtjCtl extends BaseWebCtl {
 	//同步省级数据 
 	@RequestMapping(value = "/saveTbzt")
 	@ResponseBody
-	public WebJsonResult saveTbzt(Model model, String id, String spflag) {
+	public WebJsonResult saveTbzt(Model model,String path, String spflag, String szgkid, String rq, HxhbtjEntity code ) {
 		WebJsonResult wr = success();
-		HxhbtjEntity entity = hxhbtjService.findOne(id);
-
-		entity.setSftb(Constants.YES);
-		hxhbtjService.save(entity);
-
-		String url = "GK_OPERATION_JSJY_HXHBTJ_ONE_CP?condition=ID=" + id;
-
-		boolean flag = getTbStatus(url, null);
-		if (flag) {
-//				entity.setFlowstatus("0");
-			entity.setTbzt(Constants.YES);
-			hxhbtjService.save(entity);
-		} else {
-//				entity.setFlowstatus(null);
-			entity.setSftb(Constants.NO);
-			hxhbtjService.save(entity);
+		try {
+//			HxhbtjEntity entity = hxhbtjService.findOne(id);
+			code.setRecordStatus(2);
+			save(model, "1", szgkid, rq, code );
+		} catch (Exception e) {
 			wr.setSuccess(false);
 			wr.setMessage("提交失败");
+			e.printStackTrace();
 		}
 		return wr;
 	}
+//	@RequestMapping(value = "/saveTbzt")
+//	@ResponseBody
+//	public WebJsonResult saveTbzt(Model model, String id, String spflag) {
+//		WebJsonResult wr = success();
+//		HxhbtjEntity entity = hxhbtjService.findOne(id);
+//		
+//		entity.setSftb(Constants.YES);
+//		hxhbtjService.save(entity);
+//		
+//		String url = "GK_OPERATION_JSJY_HXHBTJ_ONE_CP?condition=ID=" + id;
+//		
+//		boolean flag = getTbStatus(url, null);
+//		if (flag) {
+////				entity.setFlowstatus("0");
+//			entity.setTbzt(Constants.YES);
+//			hxhbtjService.save(entity);
+//		} else {
+////				entity.setFlowstatus(null);
+//			entity.setSftb(Constants.NO);
+//			hxhbtjService.save(entity);
+//			wr.setSuccess(false);
+//			wr.setMessage("提交失败");
+//		}
+//		return wr;
+//	}