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

gkjsjy/trunk/WebContent/static/biz/js/gkjsgl/jsjdbg/jsjdbgdetail.js

@@ -603,4 +603,169 @@ jsjdbg.detail.submitAudit=function(){
 	           }
 	     }
   }); 
-}
+}
+
+function pageinfo4(){
+    $("#pagesize").change(function() {
+        $("#pagejump").val(1);
+        jsjdbg.detail.xmxxxz();
+    });
+    $("#pagesize").val($("#pagesize").attr("num"));
+    $("#pagefirst").click(function() {
+        if ($("#pagecur").val() == 1) {
+        	$.alert({
+    		    title: '提示',
+    		    content: '已到第一页'
+    	 });
+            return;
+        }
+        else {
+            $("#pagejump").val(1);
+            jsjdbg.detail.xmxxxz();
+        }
+    });
+    $("#pageprev").click(function() {
+        if ($("#pagecur").val() == 1) {
+        	$.alert({
+    		    title: '提示',
+    		    content: '已到第一页'
+    	 });
+            return;
+        }
+        else {
+            $("#pagejump").val(parseInt($("#pagecur").val()) - 1);
+            jsjdbg.detail.xmxxxz();
+        }
+    });
+    $("#pagejump").keydown(
+            function(event, p) {
+                if (event.keyCode == 13) {
+                    if ($.isNumeric($("#pagejump").val()) && (parseInt($("#pagejump").val()) >= 1)
+                            && (parseInt($("#pagejump").val()) <= parseInt($("#pagetotal").val()))) {
+                    }
+                    else {
+                    	$.alert({
+                		    title: '提示',
+                		    content: '请输入有效数字'
+                	 });
+                        return false;
+                    }
+                    jsjdbg.detail.xmxxxz();
+                }
+            });
+    $("#pagenext").click(function() {
+        if(parseInt($("#pagetotal").val())<=1){
+        	$.alert({
+    		    title: '提示',
+    		    content: '已到最后一页'
+    	 });
+            return;
+        }
+        if ($("#pagecur").val() == $("#pagetotal").val()) {
+        	$.alert({
+    		    title: '提示',
+    		    content: '已到最后一页'
+    	 });
+            return;
+        }
+        else {
+            $("#pagejump").val(parseInt($("#pagecur").val()) + 1);
+            jsjdbg.detail.xmxxxz();
+        }
+    });
+    $("#pagelast").click(function() {
+        if(parseInt($("#pagetotal").val())<=1){
+        	$.alert({
+    		    title: '提示',
+    		    content: '已到最后一页'
+    	 });
+            return;
+        }
+        if ($("#pagecur").val() == $("#pagetotal").val()) {
+        	$.alert({
+    		    title: '提示',
+    		    content: '已到最后一页'
+    	 });
+            return;
+        }
+        else {
+            $("#pagejump").val($("#pagetotal").val());
+            jsjdbg.detail.xmxxxz();
+        }
+    });
+    
+}
+
+
+jsjdbg.detail.xmxxxz=function(){
+	 pageinfo4();
+	 $.ajax({
+		 url:$.app+"/jsjdgl/xzxmbg",
+		 type:"post",
+		 dataType:"json",
+		 data:{
+			 xmcx:$('#xmcx').val(),	 
+			 page:$('#pagejump').val()	 
+		 },
+		 success:function(data){
+			 if(data){
+					var str="";
+					for(var i=0;i<data.attrs.list.length;i++){
+						var xmxx = data.attrs.list[i];
+						str+="<tr class='tr_bg'>";
+						str+="<td>"+(i+1)+"</td>";
+						str+="<td>"+xmxx.xmmc+"</td>";
+						if(xmxx.szgk!=null){
+						str+="<td>"+xmxx.szgk.gkmc+"</td>";
+						}else{
+						str+="<td></td>";
+						}
+						if(xmxx.szgq!=null){
+							str+="<td>"+xmxx.szgq.gqmc+"</td>";
+						}else{
+						str+="<td></td>";
+						}
+						if(xmxx.xmfr!=null){
+						str+="<td>"+xmxx.xmfr+"</td>";
+						}else{
+						str+="<td></td>";	
+						}
+						if(xmxx.jsdd!=null){
+						str+="<td>"+xmxx.jsdd+"</td>";
+						}else{
+						str+="<td></td>";	
+						}
+						if(xmxx.xmlx!=null){
+						str+="<td>"+xmxx.xmlx.text+"</td>";
+						}else{
+						str+="<td></td>";
+						}
+						str+="<td >" +
+						"<a class=\"btn btn-default btn-xs\" href=\"#\" onclick=\"jsjdbg.detail.choose('"+xmxx.id+"')\">"+
+						"<i class='glyphicon glyphicon-wrench'></i>选择</a>"+
+									          "</td>";
+						str+="</tr>";
+					}
+					$("#xmxxtb").html("");
+		      	    $("#xmxxtb").append(str);
+		      		$('.theme-popover-mask-tc').fadeIn(100);
+		      		$('.theme-popover-tc').slideDown(0);
+		      		$("#pagejump").val(data.attrs.page);
+		            $("#gongpage").html(data.attrs.gongpage);
+		            $("#nowshow").html(data.attrs.nowshow);
+		        	$("#gongsize").html(data.attrs.gongsize);
+		            $("#pagecur").val(data.attrs.page);
+		        	$("#pagetotal").val(data.attrs.totalpage);
+		        	$("#pagesort").val(data.attrs.sort);
+		        	$("#pageorder").val(data.attrs.order);
+				}else {
+		           	$.alert({
+		       		    title: '提示',
+		       		    content: data.message,
+		       		    confirm: function(){
+		       		    }
+		           	});	 
+		 }
+		 }
+	    });
+	}

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdgl/ctl/JsjdglCtl.java

@@ -97,7 +97,7 @@ public class JsjdglCtl extends BaseWebCtl {
 	@RequestMapping(value = "/main")
 	@RequiresPermissions("jsjdgl:main")
 	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String xmmc, final String szdid, final String szgkid, final String szgqid, String menuid, final String dqzt, final String xmfr, final String lcjd) throws JsonProcessingException {
-		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request,"jsjdgl");
+		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request, "jsjdgl");
 		Specification<XmxxglEntity> spec = new Specification<XmxxglEntity>() {
 			// 查询条件
 			@Override
@@ -106,32 +106,37 @@ public class JsjdglCtl extends BaseWebCtl {
 				if (StringUtils.isNotEmpty(xmmc)) {
 					list.add(cb.like(root.get("xmmc").as(String.class), "%" + xmmc + "%"));
 				} else if (isGET(request)) {
-					//list.add(cb.like(root.get("xmmc").as(String.class), "%" + SearchCondition.jsxmmc + "%"));
+					// list.add(cb.like(root.get("xmmc").as(String.class), "%" +
+					// SearchCondition.jsxmmc + "%"));
 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, null, "xmmc");
 				}
 				if (StringUtils.isNotEmpty(xmfr)) {
 					list.add(cb.like(root.get("xmfr").as(String.class), "%" + xmfr + "%"));
 				} else if (isGET(request)) {
-					//list.add(cb.like(root.get("xmfr").as(String.class), "%" + SearchCondition.jsxmfr + "%"));
+					// list.add(cb.like(root.get("xmfr").as(String.class), "%" +
+					// SearchCondition.jsxmfr + "%"));
 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, null, "xmfr");
 				}
 				if (StringUtils.isNotEmpty(szdid)) {
 					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));
 				} else if (isGET(request)) {
-					//list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + SearchCondition.jsszd + "%"));
-					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id", "szd","szdid");
+					// list.add(cb.like(root.get("szd").get("id").as(String.class),
+					// "%" + SearchCondition.jsszd + "%"));
+					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id", "szd", "szdid");
 				}
 				if (StringUtils.isNotEmpty(szgkid)) {
 					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));
 				} else if (isGET(request)) {
-					//list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + SearchCondition.jsszgk + "%"));
-					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id", "szgk","szgkid");
+					// list.add(cb.like(root.get("szgk").get("id").as(String.class),
+					// "%" + SearchCondition.jsszgk + "%"));
+					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id", "szgk", "szgkid");
 				}
 				if (StringUtils.isNotEmpty(szgqid)) {
 					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + szgqid + "%"));
 				} else if (isGET(request)) {
-					//list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + SearchCondition.jsszgq + "%"));
-					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id", "szgq","szgqid");
+					// list.add(cb.like(root.get("szgq").get("id").as(String.class),
+					// "%" + SearchCondition.jsszgq + "%"));
+					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id", "szgq", "szgqid");
 				}
 				Subquery<TaskInfoEntity> subquery = query.subquery(TaskInfoEntity.class);
 				Root<TaskInfoEntity> dpRoot = subquery.from(TaskInfoEntity.class);
@@ -140,14 +145,14 @@ public class JsjdglCtl extends BaseWebCtl {
 				if (StringUtils.isNotEmpty(lcjd)) {
 					if (lcjd.equals("已完成")) {
 						list.add(cb.like(root.get("recordStatus").as(String.class), "%" + BaseEntity.RECORD_STATE_COMPLETED + "%"));
-					}else{
+					} else {
 						subQueryPredicates.add(cb.equal(root.get("id").as(String.class), dpRoot.get("busId").as(String.class)));
 						subQueryPredicates.add(cb.like(dpRoot.get("currName").as(String.class), "%" + lcjd + "%"));
 						subQueryPredicates.add(cb.equal(dpRoot.get("state").as(String.class), "3"));
 						subquery.where(subQueryPredicates.toArray(new Predicate[] {}));
 						list.add(cb.exists(subquery));
 					}
-				}else if (isGET(request)&&StringUtils.isNotEmpty(lcjd)) {
+				} else if (isGET(request) && StringUtils.isNotEmpty(lcjd)) {
 					subQueryPredicates.add(cb.equal(root.get("id").as(String.class), dpRoot.get("busId").as(String.class)));
 					Object val = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "lcjd");
 					subQueryPredicates.add(cb.like(dpRoot.get("currName").as(String.class), "%" + val + "%"));
@@ -161,34 +166,34 @@ public class JsjdglCtl extends BaseWebCtl {
 					} else {
 						subQueryPredicates.add(cb.equal(root.get("id").as(String.class), dpRoot.get("busId").as(String.class)));
 						subQueryPredicates.add(cb.like(dpRoot.get("currName").as(String.class), "%" + dqzt + "%"));
-						if("岸线利用审批".equals(dqzt)){
+						if ("岸线利用审批".equals(dqzt)) {
 							subQueryPredicates.add(cb.like(dpRoot.get("currName").as(String.class), "%" + "岸线利用审批支撑文件审查" + "%"));
 						}
-						if("项目审批、核准、备案".equals(dqzt)){
+						if ("项目审批、核准、备案".equals(dqzt)) {
 							subQueryPredicates.add(cb.like(dpRoot.get("currName").as(String.class), "%" + "项目审批、核准、备案支撑文件审查" + "%"));
 						}
-						if("初步设计审批".equals(dqzt)){
+						if ("初步设计审批".equals(dqzt)) {
 							subQueryPredicates.add(cb.like(dpRoot.get("currName").as(String.class), "%" + "初步设计审批支撑文件审查" + "%"));
 						}
-						if("施工图设计审批".equals(dqzt)){
+						if ("施工图设计审批".equals(dqzt)) {
 							subQueryPredicates.add(cb.like(dpRoot.get("currName").as(String.class), "%" + "施工图设计审批支撑文件审查" + "%"));
 						}
-						if("开工备案".equals(dqzt)){
+						if ("开工备案".equals(dqzt)) {
 							subQueryPredicates.add(cb.like(dpRoot.get("currName").as(String.class), "%" + "开工备案支撑文件审查" + "%"));
 						}
-						if("交工验收".equals(dqzt)){
+						if ("交工验收".equals(dqzt)) {
 							subQueryPredicates.add(cb.like(dpRoot.get("currName").as(String.class), "%" + "交工验收" + "%"));
 						}
-						if("试运行备案".equals(dqzt)){
+						if ("试运行备案".equals(dqzt)) {
 							subQueryPredicates.add(cb.like(dpRoot.get("currName").as(String.class), "%" + "试运行备案" + "%"));
 						}
-						if("竣工验收".equals(dqzt)){
+						if ("竣工验收".equals(dqzt)) {
 							subQueryPredicates.add(cb.like(dpRoot.get("currName").as(String.class), "%" + "竣工验收" + "%"));
 						}
 						subquery.where(subQueryPredicates.toArray(new Predicate[] {}));
 						list.add(cb.exists(subquery));
 					}
-				} else if (isGET(request)&&StringUtils.isNotEmpty(dqzt)) {
+				} else if (isGET(request) && StringUtils.isNotEmpty(dqzt)) {
 					subQueryPredicates.add(cb.equal(root.get("id").as(String.class), dpRoot.get("busId").as(String.class)));
 					Object val = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "dqzt");
 					subQueryPredicates.add(cb.like(dpRoot.get("currName").as(String.class), "%" + val + "%"));
@@ -198,13 +203,11 @@ public class JsjdglCtl extends BaseWebCtl {
 				}
 				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在港区的数据
 				if (isJyr()) {
-					list.add(cb.like(root.get("jyrid").get("id").as(String.class), "%"
-							+ getSsjyr().getId() + "%"));
+					list.add(cb.like(root.get("jyrid").get("id").as(String.class), "%" + getSsjyr().getId() + "%"));
 				} else {
 					In<String> in = cb.in(root.get("szgq").get("id").as(String.class));
 					@SuppressWarnings("unchecked")
-					List<String> gqlist = (List<String>) Utils.getSession()
-							.getAttribute("gqList");
+					List<String> gqlist = (List<String>) Utils.getSession().getAttribute("gqList");
 					if (gqlist != null && gqlist.size() > 0) {
 						for (int i = 0; i < gqlist.size(); i++) {
 							in.value(gqlist.get(i));
@@ -212,13 +215,13 @@ public class JsjdglCtl extends BaseWebCtl {
 						list.add(in);
 					}
 				}
-				//只显示状态为8或者3的
+				// 只显示状态为8或者3的
 				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
 				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_VALID));
 				return cb.and(list.toArray(new Predicate[] {}));
 			}
 		};
-		
+
 		if (page.getPage() < 1) {
 			Object jsjdpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "jsjdpage");
 			if (StringUtils.isEmpty(jsjdpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(jsjdpage))) {
@@ -263,7 +266,7 @@ public class JsjdglCtl extends BaseWebCtl {
 							vo.setDqzt("未提交");
 						}
 					}
-					
+
 				} else {
 					List<TaskInfoEntity> listtask = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(entity.getId().toString(), XmxxglEntity.PROCESS_DEFINITION_KEY);
 					if (listtask.size() != 0) {
@@ -278,34 +281,34 @@ public class JsjdglCtl extends BaseWebCtl {
 						}
 					}
 				}
-				if(securityMgr.getCurrUser().getSfjyr().getText().equals("否")){
+				if (securityMgr.getCurrUser().getSfjyr().getText().equals("否")) {
 					if ((xmxxglService.getTaskByUserAndBusKey(SecUtils.getCurrUser().getId().toString(), entity.getId().toString()) != null) || xmxxgljggzService.getCandidateTaskByUserAndBusKey(SecUtils.getCurrUser().getId().toString(), entity.getId().toString()) != null || xmxxglService.getCandidateTaskByUserAndBusKey(SecUtils.getCurrUser().getId().toString(), entity.getId().toString()) != null || xmxxgljggzService.getTaskByUserAndBusKey(SecUtils.getCurrUser().getId().toString(), entity.getId().toString()) != null) {
 						vo.setTaskState(Constants.IS_MY_TASK);
 					}
-				}else{
+				} else {
 					if ((xmxxglService.getTaskByUserAndBusKey(SecUtils.getCurrUser().getSsjyr().getId().toString(), entity.getId().toString()) != null) || xmxxgljggzService.getCandidateTaskByUserAndBusKey(SecUtils.getCurrUser().getId().toString(), entity.getId().toString()) != null || xmxxglService.getCandidateTaskByUserAndBusKey(SecUtils.getCurrUser().getId().toString(), entity.getId().toString()) != null || xmxxgljggzService.getTaskByUserAndBusKey(SecUtils.getCurrUser().getSsjyr().getId().toString(), entity.getId().toString()) != null) {
 						vo.setTaskState(Constants.IS_MY_TASK);
 					}
 				}
-				
+
 				voList.add(vo);
 			}
 		}
-		if(isPOST(request)){
-			cacheSCmap.put("jsjdpage",page.getPage());
+		if (isPOST(request)) {
+			cacheSCmap.put("jsjdpage", page.getPage());
 			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);
-			//System.out.println(JSONObject.fromObject(cacheSCmap));
+			// System.out.println(JSONObject.fromObject(cacheSCmap));
 		}
-		String isjyr="";
-		if(isJyr()){
-			isjyr="1";
-		}else{
-			isjyr="0";
+		String isjyr = "";
+		if (isJyr()) {
+			isjyr = "1";
+		} else {
+			isjyr = "0";
 		}
 		model.addAttribute("isjyr", isjyr);
 		model.addAttribute("list", voList);
-		model.addAttribute("xmmc",  CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xmmc"));
-		model.addAttribute("xmfr",  CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xmfr"));
+		model.addAttribute("xmmc", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xmmc"));
+		model.addAttribute("xmfr", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xmfr"));
 		model.addAttribute("szd", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szdid"));
 		model.addAttribute("szgk", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgkid"));
 		model.addAttribute("szgq", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgqid"));
@@ -344,10 +347,10 @@ public class JsjdglCtl extends BaseWebCtl {
 		entity.setSftb(Constants.YES);
 		xmxxglService.save(entity);
 		String url = "/GK_OPERATION_JSJY_JSJDCBSJ_ONE_CP?condition=ID=" + id;
-		if("2".equals(entity.getFlowstatus())){
-			url="/GK_OPERATION_JSJY_JGSQ_ONE_CP?condition=ID=" + id;
+		if ("2".equals(entity.getFlowstatus())) {
+			url = "/GK_OPERATION_JSJY_JGSQ_ONE_CP?condition=ID=" + id;
 		}
-		
+
 		boolean flag = getTbStatus(url);
 		if (flag) {
 			entity.setFlowstatus("0");
@@ -359,11 +362,11 @@ public class JsjdglCtl extends BaseWebCtl {
 		}
 		return wr;
 	}
-	
+
 	@RequestMapping(value = "/save")
 	@RequiresPermissions("jsjdgl:add")
 	@ResponseBody
-	public WebJsonResult save(Model model, XmxxglEntity code, String fjzdids, String accids, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szgkid, String szgqid, String qtfjids, String qtfjzdids,String zyhbwflid) {
+	public WebJsonResult save(Model model, XmxxglEntity code, String fjzdids, String accids, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szgkid, String szgqid, String qtfjids, String qtfjzdids, String zyhbwflid) {
 		WebJsonResult wr = success();
 		if (StringUtils.isEmpty(code.getXmmc())) {
 			wr.setSuccess(false);
@@ -575,7 +578,7 @@ public class JsjdglCtl extends BaseWebCtl {
 
 	@RequestMapping(value = "/edit")
 	@RequiresPermissions("jsjdgl:edit")
-	public String edit(Model model, String id, String flag, String fhbz, String path,String type) {
+	public String edit(Model model, String id, String flag, String fhbz, String path, String type) {
 		// 附件
 		List<AccessoryEntity> accessoryList = accessoryService.queryBySsidAndSstype(id, "jsjd");
 		for (int i = 0; i < accessoryList.size(); i++) {
@@ -637,7 +640,7 @@ public class JsjdglCtl extends BaseWebCtl {
 		vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
 		vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
 		vo.setZyhbwfl(entity.getZyhbwfl() != null ? entity.getZyhbwfl().getId() : "");
-		vo.setSylx(entity.getSylx()!=null?entity.getSylx().getId():"");
+		vo.setSylx(entity.getSylx() != null ? entity.getSylx().getId() : "");
 		vo.setSylxzw(entity.getSylx() != null ? entity.getSylx().getText() : "");
 		model.addAttribute("record", vo);
 		model.addAttribute("jyr", entity.getJyrid());
@@ -728,32 +731,32 @@ public class JsjdglCtl extends BaseWebCtl {
 				spflag = "8";
 			}
 
-			/*// 其他附件和附件字段
-			if (opflag.equals("2")) {
-				List<AccessoryEntity> acclist = accessoryService.queryBySsidAndSstype(id, "xmsphzbaqtfj");
-				this.qtfjgtview(model, acclist, opflag);
-			} else if (opflag.equals("3")) {
-				List<AccessoryEntity> acclist = accessoryService.queryBySsidAndSstype(id, "cbsjspqtfj");
-				this.qtfjgtview(model, acclist, opflag);
-			} else if (opflag.equals("4")) {
-				List<AccessoryEntity> acclist = accessoryService.queryBySsidAndSstype(id, "sgtsjspqtfj");
-				this.qtfjgtview(model, acclist, opflag);
-			} else if (opflag.equals("5")) {
-				List<AccessoryEntity> acclist = accessoryService.queryBySsidAndSstype(id, "kgbaqtfj");
-				this.qtfjgtview(model, acclist, opflag);
-			} else if (opflag.equals("6")) {
-				List<AccessoryEntity> acclist = accessoryService.queryBySsidAndSstype(id, "jgys1qtfj");
-				this.qtfjgtview(model, acclist, opflag);
-			} else if (opflag.equals("7")) {
-				List<AccessoryEntity> acclist = accessoryService.queryBySsidAndSstype(id, "syxbaqtfj");
-				this.qtfjgtview(model, acclist, opflag);
-			} else if (opflag.equals("8")) {
-				List<AccessoryEntity> acclist = accessoryService.queryBySsidAndSstype(id, "jgys2qtfj");
-				this.qtfjgtview(model, acclist, opflag);
-			} else {
-				List<AccessoryEntity> acclist = accessoryService.queryBySsidAndSstype(id, "axlyspqtfj");
-				this.qtfjgtview(model, acclist, opflag);
-			}*/
+			/*
+			 * // 其他附件和附件字段 if (opflag.equals("2")) { List<AccessoryEntity>
+			 * acclist = accessoryService.queryBySsidAndSstype(id,
+			 * "xmsphzbaqtfj"); this.qtfjgtview(model, acclist, opflag); } else
+			 * if (opflag.equals("3")) { List<AccessoryEntity> acclist =
+			 * accessoryService.queryBySsidAndSstype(id, "cbsjspqtfj");
+			 * this.qtfjgtview(model, acclist, opflag); } else if
+			 * (opflag.equals("4")) { List<AccessoryEntity> acclist =
+			 * accessoryService.queryBySsidAndSstype(id, "sgtsjspqtfj");
+			 * this.qtfjgtview(model, acclist, opflag); } else if
+			 * (opflag.equals("5")) { List<AccessoryEntity> acclist =
+			 * accessoryService.queryBySsidAndSstype(id, "kgbaqtfj");
+			 * this.qtfjgtview(model, acclist, opflag); } else if
+			 * (opflag.equals("6")) { List<AccessoryEntity> acclist =
+			 * accessoryService.queryBySsidAndSstype(id, "jgys1qtfj");
+			 * this.qtfjgtview(model, acclist, opflag); } else if
+			 * (opflag.equals("7")) { List<AccessoryEntity> acclist =
+			 * accessoryService.queryBySsidAndSstype(id, "syxbaqtfj");
+			 * this.qtfjgtview(model, acclist, opflag); } else if
+			 * (opflag.equals("8")) { List<AccessoryEntity> acclist =
+			 * accessoryService.queryBySsidAndSstype(id, "jgys2qtfj");
+			 * this.qtfjgtview(model, acclist, opflag); } else {
+			 * List<AccessoryEntity> acclist =
+			 * accessoryService.queryBySsidAndSstype(id, "axlyspqtfj");
+			 * this.qtfjgtview(model, acclist, opflag); }
+			 */
 			model.addAttribute("opflag", opflag);
 			model.addAttribute("spflag", spflag);
 		}
@@ -887,8 +890,9 @@ public class JsjdglCtl extends BaseWebCtl {
 		}
 		return "gkjsgl/jsjdgl/jsjdglview";
 	}
-    //其他附件显示
-	public void qtfjview(Model model,List<JsjdfjEntity> qtfjzdlist){
+
+	// 其他附件显示
+	public void qtfjview(Model model, List<JsjdfjEntity> qtfjzdlist) {
 		SimpleDateFormat dateFormater = new SimpleDateFormat("yyyy-MM-dd");
 		List<JsjdfjVo> fjvolist1 = new ArrayList<JsjdfjVo>();
 		List<JsjdfjVo> fjvolist2 = new ArrayList<JsjdfjVo>();
@@ -902,8 +906,8 @@ public class JsjdglCtl extends BaseWebCtl {
 			AccessoryEntity qtfj = accessoryService.findOne(qtfjzdlist.get(i).getFjid());
 			JsjdfjVo fjnamevo = new JsjdfjVo();
 			fjnamevo.setFbdw(qtfjzdlist.get(i).getFbdw());
-			String fbsj="";
-			if(qtfjzdlist.get(i).getFbsj()!=null){
+			String fbsj = "";
+			if (qtfjzdlist.get(i).getFbsj() != null) {
 				fbsj = dateFormater.format(qtfjzdlist.get(i).getFbsj());
 			}
 			fjnamevo.setFbsj(fbsj);
@@ -911,34 +915,34 @@ public class JsjdglCtl extends BaseWebCtl {
 			fjnamevo.setFjid(qtfj.getId());
 			fjnamevo.setFjmc(qtfj.getName());
 			String s = qtfj.getRemark();
-			if(!StringUtils.isNotEmpty(s)){
-			fjvolist1.add(fjnamevo);
-			model.addAttribute("fjvolist", fjvolist1);	
-			}else if("2".equals(s)){
-			fjvolist2.add(fjnamevo);
-			model.addAttribute("fjvolist2", fjvolist2);		
-			}else if("3".equals(s)){
-			fjvolist3.add(fjnamevo);
-			model.addAttribute("fjvolist3", fjvolist3);		
-			}else if("4".equals(s)){
-			fjvolist4.add(fjnamevo);
-			model.addAttribute("fjvolist4", fjvolist4);		
-			}else if("5".equals(s)){
-			fjvolist5.add(fjnamevo);
-			model.addAttribute("fjvolist5", fjvolist5);		
-			}else if("6".equals(s)){
-			fjvolist6.add(fjnamevo);
-			model.addAttribute("fjvolist6", fjvolist6);		
-			}else if("7".equals(s)){
-			fjvolist7.add(fjnamevo);
-			model.addAttribute("fjvolist7", fjvolist7);		
-			}else if("8".equals(s)){
-			fjvolist8.add(fjnamevo);
-			model.addAttribute("fjvolist8", fjvolist8);		
+			if (!StringUtils.isNotEmpty(s)) {
+				fjvolist1.add(fjnamevo);
+				model.addAttribute("fjvolist", fjvolist1);
+			} else if ("2".equals(s)) {
+				fjvolist2.add(fjnamevo);
+				model.addAttribute("fjvolist2", fjvolist2);
+			} else if ("3".equals(s)) {
+				fjvolist3.add(fjnamevo);
+				model.addAttribute("fjvolist3", fjvolist3);
+			} else if ("4".equals(s)) {
+				fjvolist4.add(fjnamevo);
+				model.addAttribute("fjvolist4", fjvolist4);
+			} else if ("5".equals(s)) {
+				fjvolist5.add(fjnamevo);
+				model.addAttribute("fjvolist5", fjvolist5);
+			} else if ("6".equals(s)) {
+				fjvolist6.add(fjnamevo);
+				model.addAttribute("fjvolist6", fjvolist6);
+			} else if ("7".equals(s)) {
+				fjvolist7.add(fjnamevo);
+				model.addAttribute("fjvolist7", fjvolist7);
+			} else if ("8".equals(s)) {
+				fjvolist8.add(fjnamevo);
+				model.addAttribute("fjvolist8", fjvolist8);
 			}
 		}
 	}
-	
+
 	public void qtfjgtview(Model model, List<AccessoryEntity> acclist, String opflag) {
 		SimpleDateFormat dateFormater = new SimpleDateFormat("yyyy-MM-dd");
 		List<JsjdfjVo> fjvolist = new ArrayList<JsjdfjVo>();
@@ -974,10 +978,10 @@ public class JsjdglCtl extends BaseWebCtl {
 	@ResponseBody
 	public WebJsonResult saveFile(String ssid, MultipartFile filename, Model model) {
 		WebJsonResult wr = success();
-		if(filename!=null){
+		if (filename != null) {
 			AccessoryEntity acc = accessoryService.saveFile(filename, "jsjd");
 			wr.setAttr("acc", acc);
-		}else{
+		} else {
 			wr.setSuccess(false);
 			wr.setMessage("请上传附件！");
 		}
@@ -1107,7 +1111,7 @@ public class JsjdglCtl extends BaseWebCtl {
 
 	@RequestMapping(value = "/submit")
 	@ResponseBody
-	public WebJsonResult submit(Model model, XmxxglEntity code, String fjzdids, String accids, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szgkid, String szgqid, String qtfjzdids, String qtfjids, String delid11,String zyhbwflid) {
+	public WebJsonResult submit(Model model, XmxxglEntity code, String fjzdids, String accids, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szgkid, String szgqid, String qtfjzdids, String qtfjids, String delid11, String zyhbwflid) {
 		WebJsonResult wr = success();
 		if (StringUtils.isEmpty(code.getXmmc())) {
 			wr.setSuccess(false);
@@ -1268,8 +1272,7 @@ public class JsjdglCtl extends BaseWebCtl {
 
 	@RequestMapping(value = "/audit")
 	@ResponseBody
-	public WebJsonResult audit(XmxxglEntity code, String fjzdids, String accids, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szgkid, String szgqid, boolean flag, String shyj, String qtfjzdids, String qtfjids, String delid11, String delid21, String delid31, String delid32,String delid33, String delid41, String delid42, 
-			String delid51, String delid52, String delid53, String delid54, String delid55, String delid56, String delid61, String delid62, String delid71, String delid72, String delid81, String delid82, String opflag, String sfjyr,String zyhbwflid) {
+	public WebJsonResult audit(XmxxglEntity code, String fjzdids, String accids, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szgkid, String szgqid, boolean flag, String shyj, String qtfjzdids, String qtfjids, String delid11, String delid21, String delid31, String delid32, String delid33, String delid41, String delid42, String delid51, String delid52, String delid53, String delid54, String delid55, String delid56, String delid61, String delid62, String delid71, String delid72, String delid81, String delid82, String opflag, String sfjyr, String zyhbwflid) {
 		try {
 			shyj = URLDecoder.decode(shyj, "UTF-8");
 		} catch (UnsupportedEncodingException e1) {
@@ -1303,7 +1306,7 @@ public class JsjdglCtl extends BaseWebCtl {
 					wr.setMessage("请上传港口建设项目初步设计文件!");
 					return wr;
 				}
-				if(StringUtils.isEmpty(delid33)){
+				if (StringUtils.isEmpty(delid33)) {
 					wr.setSuccess(false);
 					wr.setMessage("请上传港口建设项目批准或者核准、备案文件!");
 					return wr;
@@ -1530,16 +1533,16 @@ public class JsjdglCtl extends BaseWebCtl {
 			vo.setCurrentname(list.get(i).getCurrName() != null ? list.get(i).getCurrName() : "");
 			vo.setAuditusername(list.get(i).getAuditUsername() != null ? list.get(i).getAuditUsername() : "");
 			vo.setSpyj(list.get(i).getAuditMsg() != null ? list.get(i).getAuditMsg() : "");
-			vo.setCljg(list.get(i).getAuditResult()!=null?list.get(i).getAuditResult():"" );
-			if(vo.getCljg().equals("false")){
+			vo.setCljg(list.get(i).getAuditResult() != null ? list.get(i).getAuditResult() : "");
+			if (vo.getCljg().equals("false")) {
 				vo.setCljg("退回");
-			}else if(vo.getCljg().equals("true")&&vo.getCurrentname().contains("审查")){
+			} else if (vo.getCljg().equals("true") && vo.getCurrentname().contains("审查")) {
 				vo.setCljg("同意");
-			}else if(vo.getCljg().equals("true")&&vo.getCurrentname().contains("提交")){
+			} else if (vo.getCljg().equals("true") && vo.getCurrentname().contains("提交")) {
 				vo.setCljg("提交");
-			}else if(vo.getCljg().equals("1")){
+			} else if (vo.getCljg().equals("1")) {
 				vo.setCljg("提交");
-			}else{
+			} else {
 				vo.setCljg("");
 			}
 			SimpleDateFormat dateFormater = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -1684,7 +1687,7 @@ public class JsjdglCtl extends BaseWebCtl {
 				vo.setSzgqzw(xmxxfb.getSzgq() != null ? xmxxfb.getSzgq().getGqmc() : "");
 				vo.setSzdzw(xmxxfb.getSzd() != null ? xmxxfb.getSzd().getText() : "");
 				vo.setZyhbwflzw(xmxxfb.getZyhbwfl() != null ? xmxxfb.getZyhbwfl().getText() : "");
-				
+
 				vo.setTzlx(xmxxfb.getTzlx() != null ? xmxxfb.getTzlx().getId() : "");
 				vo.setXmlx(xmxxfb.getXmlx() != null ? xmxxfb.getXmlx().getId() : "");
 				vo.setXmhzjb(xmxxfb.getXmhzjb() != null ? xmxxfb.getXmhzjb().getId() : "");
@@ -1772,12 +1775,12 @@ public class JsjdglCtl extends BaseWebCtl {
 	@ResponseBody
 	public WebJsonResult saveQtfj(String opflag, MultipartFile qtfilename, Model model) {
 		WebJsonResult wr = success();
-		if(qtfilename!=null){
+		if (qtfilename != null) {
 			AccessoryEntity acc = accessoryService.saveFile(qtfilename, "jsjdqtfj");
 			acc.setRemark(opflag);
 			accessoryService.save(acc);
 			wr.setAttr("acc", acc);
-		}else{
+		} else {
 			wr.setSuccess(false);
 			wr.setMessage("请上传附件！");
 		}
@@ -1796,10 +1799,10 @@ public class JsjdglCtl extends BaseWebCtl {
 			entity.setWjh(qtwjh);
 			entity.setFjid(qtfjid);
 			entity.setFjlx("jsjdqtfj");
-			if(StringUtils.isEmpty(opflag)){
-			entity.setFjbz("1");
-			}else{
-			entity.setFjbz(opflag);	
+			if (StringUtils.isEmpty(opflag)) {
+				entity.setFjbz("1");
+			} else {
+				entity.setFjbz(opflag);
 			}
 			jsjdfjService.save(entity);
 			String fjid = entity.getId();
@@ -1823,16 +1826,16 @@ public class JsjdglCtl extends BaseWebCtl {
 		if (fjzd != null) {
 			jsjd.setFbdw(fjzd.getFbdw());
 			jsjd.setWjh(fjzd.getWjh());
-			if(!StringUtils.isEmpty(fjzd.getFbsj())){
+			if (!StringUtils.isEmpty(fjzd.getFbsj())) {
 				Date date = fjzd.getFbsj();
 				if (date != null) {
 					String date2 = dateFormater.format(date);
 					jsjd.setFbsj(date2);
 				}
-			}else{
+			} else {
 				jsjd.setFbsj("");
 			}
-		
+
 			jsjd.setId(fjzd.getId());
 		}
 		jsjd.setFjmc(acc.getName());
@@ -1844,31 +1847,32 @@ public class JsjdglCtl extends BaseWebCtl {
 	@ResponseBody
 	public List<JsjdfjVo> showqtfj(String id, String opflag, Model model) {
 		List<JsjdfjVo> fjvolist = new ArrayList<JsjdfjVo>();
-	/*	if (opflag.equals("2")) {
-			List<AccessoryEntity> acclist = accessoryService.queryBySsidAndSstype(id, "xmsphzbaqtfj");
-			this.showqtfjgt(acclist, fjvolist, opflag);
-		} else if (opflag.equals("3")) {
-			List<AccessoryEntity> acclist = accessoryService.queryBySsidAndSstype(id, "cbsjspqtfj");
-			this.showqtfjgt(acclist, fjvolist, opflag);
-		} else if (opflag.equals("4")) {
-			List<AccessoryEntity> acclist = accessoryService.queryBySsidAndSstype(id, "sgtsjspqtfj");
-			this.showqtfjgt(acclist, fjvolist, opflag);
-		} else if (opflag.equals("5")) {
-			List<AccessoryEntity> acclist = accessoryService.queryBySsidAndSstype(id, "kgbaqtfj");
-			this.showqtfjgt(acclist, fjvolist, opflag);
-		} else if (opflag.equals("6")) {
-			List<AccessoryEntity> acclist = accessoryService.queryBySsidAndSstype(id, "jgys1qtfj");
-			this.showqtfjgt(acclist, fjvolist, opflag);
-		} else if (opflag.equals("7")) {
-			List<AccessoryEntity> acclist = accessoryService.queryBySsidAndSstype(id, "syxbaqtfj");
-			this.showqtfjgt(acclist, fjvolist, opflag);
-		} else if (opflag.equals("8")) {
-			List<AccessoryEntity> acclist = accessoryService.queryBySsidAndSstype(id, "jgys2qtfj");
-			this.showqtfjgt(acclist, fjvolist, opflag);
-		} else {
-			List<AccessoryEntity> acclist = accessoryService.queryBySsidAndSstype(id, "axlyspqtfj");
-			this.showqtfjgt(acclist, fjvolist, opflag);
-		}*/
+		/*
+		 * if (opflag.equals("2")) { List<AccessoryEntity> acclist =
+		 * accessoryService.queryBySsidAndSstype(id, "xmsphzbaqtfj");
+		 * this.showqtfjgt(acclist, fjvolist, opflag); } else if
+		 * (opflag.equals("3")) { List<AccessoryEntity> acclist =
+		 * accessoryService.queryBySsidAndSstype(id, "cbsjspqtfj");
+		 * this.showqtfjgt(acclist, fjvolist, opflag); } else if
+		 * (opflag.equals("4")) { List<AccessoryEntity> acclist =
+		 * accessoryService.queryBySsidAndSstype(id, "sgtsjspqtfj");
+		 * this.showqtfjgt(acclist, fjvolist, opflag); } else if
+		 * (opflag.equals("5")) { List<AccessoryEntity> acclist =
+		 * accessoryService.queryBySsidAndSstype(id, "kgbaqtfj");
+		 * this.showqtfjgt(acclist, fjvolist, opflag); } else if
+		 * (opflag.equals("6")) { List<AccessoryEntity> acclist =
+		 * accessoryService.queryBySsidAndSstype(id, "jgys1qtfj");
+		 * this.showqtfjgt(acclist, fjvolist, opflag); } else if
+		 * (opflag.equals("7")) { List<AccessoryEntity> acclist =
+		 * accessoryService.queryBySsidAndSstype(id, "syxbaqtfj");
+		 * this.showqtfjgt(acclist, fjvolist, opflag); } else if
+		 * (opflag.equals("8")) { List<AccessoryEntity> acclist =
+		 * accessoryService.queryBySsidAndSstype(id, "jgys2qtfj");
+		 * this.showqtfjgt(acclist, fjvolist, opflag); } else {
+		 * List<AccessoryEntity> acclist =
+		 * accessoryService.queryBySsidAndSstype(id, "axlyspqtfj");
+		 * this.showqtfjgt(acclist, fjvolist, opflag); }
+		 */
 		List<AccessoryEntity> acclist = accessoryService.queryBySsidAndSstype(id, "jsjdqtfj");
 		showqtfjgt(acclist, fjvolist, opflag);
 		return fjvolist;
@@ -1896,23 +1900,24 @@ public class JsjdglCtl extends BaseWebCtl {
 			fjvolist.add(jsfjvo);
 		}
 	}
+
 	@RequestMapping(value = "/ajaxedit")
 	@ResponseBody
-	public WebJsonResult ajaxedit(String xmid,Model model,String straddform){
+	public WebJsonResult ajaxedit(String xmid, Model model, String straddform) {
 		WebJsonResult wr = success();
 		XmxxglEntity entity = xmxxglService.findOne(xmid);
 		XmxxglVo vo = new XmxxglVo();
 		BeanUtils.copyProperties(entity, vo);
-		vo.setJsgm(entity.getJsgm()!= null ? entity.getJsgm():"");
-		vo.setZtz(entity.getZtz()!= null ? entity.getZtz():0);
-		vo.setAxcd(entity.getAxcd()!= null ? entity.getAxcd():0);
-		vo.setBwdj(entity.getBwdj()!= null ? entity.getBwdj():0);
-		vo.setBwyt(entity.getBwyt()!= null ? entity.getBwyt():null);
-		vo.setTgnl(entity.getTgnl()!= null ? entity.getTgnl():0);
-		vo.setSddx(entity.getSddx()!= null ? entity.getSddx():"");
-		vo.setSddy(entity.getSddy()!= null ? entity.getSddy():"");
-		vo.setXddx(entity.getXddx()!= null ? entity.getXddx():"");
-		vo.setXddy(entity.getXddy()!= null ? entity.getXddy():"");
+		vo.setJsgm(entity.getJsgm() != null ? entity.getJsgm() : "");
+		vo.setZtz(entity.getZtz() != null ? entity.getZtz() : 0);
+		vo.setAxcd(entity.getAxcd() != null ? entity.getAxcd() : 0);
+		vo.setBwdj(entity.getBwdj() != null ? entity.getBwdj() : 0);
+		vo.setBwyt(entity.getBwyt() != null ? entity.getBwyt() : null);
+		vo.setTgnl(entity.getTgnl() != null ? entity.getTgnl() : 0);
+		vo.setSddx(entity.getSddx() != null ? entity.getSddx() : "");
+		vo.setSddy(entity.getSddy() != null ? entity.getSddy() : "");
+		vo.setXddx(entity.getXddx() != null ? entity.getXddx() : "");
+		vo.setXddy(entity.getXddy() != null ? entity.getXddy() : "");
 		vo.setTzlx(entity.getTzlx() != null ? entity.getTzlx().getId() : "");
 		vo.setXmlx(entity.getXmlx() != null ? entity.getXmlx().getId() : "");
 		vo.setXmhzjb(entity.getXmhzjb() != null ? entity.getXmhzjb().getId() : "");
@@ -1925,26 +1930,89 @@ public class JsjdglCtl extends BaseWebCtl {
 		wr.setAttr("straddform", straddform);
 		return wr;
 	}
-	
-	/*@RequestMapping(value = "/delete")
-	@RequiresPermissions("xmxxgl:delete")
+
+	/*
+	 * @RequestMapping(value = "/delete")
+	 * 
+	 * @RequiresPermissions("xmxxgl:delete")
+	 * 
+	 * @ResponseBody public WebJsonResult logicdelete(Model model, String id) {
+	 * WebJsonResult wr = success(); try { // 逻辑删除 List<TaskInfoEntity>
+	 * list=taskInfoService.findByBusIdAndBusKeyOrderByIdAsc(id, "jsjd");
+	 * for(TaskInfoEntity task:list){ if(task.getTaskKey().equals("axlysptb")){
+	 * task.setRecordStatus(BaseEntity.RECORD_STATE_DELETE); }
+	 * 
+	 * } } catch (Exception e) { wr.setSuccess(false); wr.setMessage("操作失败！");
+	 * e.printStackTrace(); } return wr; }
+	 */
+
+	// 初始化项目信息选择页面
+	@RequestMapping(value = "/xzxmbg")
 	@ResponseBody
-	public WebJsonResult logicdelete(Model model, String id) {
-		WebJsonResult wr = success();
-		try {
-			// 逻辑删除
-			List<TaskInfoEntity> list=taskInfoService.findByBusIdAndBusKeyOrderByIdAsc(id, "jsjd");
-			for(TaskInfoEntity task:list){
-				if(task.getTaskKey().equals("axlysptb")){
-					task.setRecordStatus(BaseEntity.RECORD_STATE_DELETE);
+	public WebJsonResult xzxmbg(final Integer page, Model model, final String xmcx) throws JsonProcessingException {
+		WebJsonResult wr = new WebJsonResult();
+		Specification<XmxxglEntity> spec = new Specification<XmxxglEntity>() {
+			// 查询条件
+			@Override
+			public Predicate toPredicate(Root<XmxxglEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
+				List<Predicate> list = new ArrayList<Predicate>();
+				if (StringUtils.isNotEmpty(xmcx)) {
+					list.add(cb.like(root.get("xmmc").as(String.class), "%" + xmcx + "%"));
 				}
+				if (securityMgr.getCurrUser().getSfjyr().getText().equals("是")) {
+					list.add(cb.like(root.get("createUser").as(String.class), "%" + securityMgr.getCurrUser().getId() + "%"));
+				}
+
+				Subquery<TaskInfoEntity> subquery = query.subquery(TaskInfoEntity.class);
+				Root<TaskInfoEntity> dpRoot = subquery.from(TaskInfoEntity.class);
+				subquery.select(dpRoot);
+				List<Predicate> subQueryPredicates = new ArrayList<Predicate>();
+
+				subQueryPredicates.add(cb.equal(root.get("id").as(String.class), dpRoot.get("busId").as(String.class)));
+
 				
+				subQueryPredicates.add(cb.like(dpRoot.get("currName").as(String.class), "%" + "施工图设计审批支撑文件审查" + "%"));
+				subQueryPredicates.add(cb.like(dpRoot.get("currName").as(String.class), "%" + "开工备案支撑文件审查" + "%"));
+				subQueryPredicates.add(cb.like(dpRoot.get("currName").as(String.class), "%" + "交工验收" + "%"));
+				subQueryPredicates.add(cb.like(dpRoot.get("currName").as(String.class), "%" + "试运行备案" + "%"));
+				subQueryPredicates.add(cb.equal(dpRoot.get("state").as(String.class), "3"));
+				subquery.where(subQueryPredicates.toArray(new Predicate[] {}));
+				list.add(cb.exists(subquery));
+
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_COMPLETED));
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_SUBMIT));
+				return cb.and(list.toArray(new Predicate[] {}));
 			}
-		} catch (Exception e) {
-			wr.setSuccess(false);
-			wr.setMessage("操作失败！");
-			e.printStackTrace();
+		};
+		SimplePageRequest page2 = new SimplePageRequest();
+		if (page == null) {
+			page2.setPage(1);
+		} else {
+			page2.setPage(page);
+		}
+		page2.setRows(5);
+		Sort newsort = new Sort(Direction.fromString(page2.getOrder()), new String[] { page2.getSort() });
+		// 页码从0开始
+		PageRequest pageable = new PageRequest(page2.getPage() - 1, page2.getRows(), newsort);
+		Page<XmxxglEntity> list = query.findAll(spec, pageable, XmxxglEntity.class);
+		List<XmxxglEntity> list2 = new ArrayList<XmxxglEntity>();
+		for (XmxxglEntity xmxxglEntity : list) {
+			list2.add(xmxxglEntity);
 		}
+		wr.setAttr("list", list2);
+
+		wr.setAttr("pagejump", list.getTotalPages() == 0 ? 0 : page2.getPage());
+		wr.setAttr("gongpage", "共 " + list.getTotalPages() + "页");
+		wr.setAttr("nowshow", "当前显示" + (page2.getRows() == 0 ? 0 : (page2.getRows() * (page2.getPage() - 1) + 1)) + "-" + (page2.getPage() * page2.getRows() - (page2.getRows() - list.getContent().size())) + " 条记录");
+		wr.setAttr("gongsize", "共 " + list.getTotalElements() + "条记录");
+		wr.setAttr("page", page2.getPage());
+		wr.setAttr("sort", page2.getSort());
+		wr.setAttr("order", page2.getOrder());
+		wr.setAttr("pagesize", list.getContent().size());
+		wr.setAttr("totalpage", list.getTotalPages());
+		wr.setAttr("totalsize", list.getTotalElements());
+		wr.setAttr("sort", list.getSort());
 		return wr;
-	}*/
+	}
 }

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/xmxxgl/ctl/XmxxglCtl.java

@@ -464,6 +464,7 @@ public class XmxxglCtl extends BaseWebCtl {
 				} else {
 					xmxxgl.setSylx(null);
 				}
+				xmxxgl.setSftb(Constants.NO);
 				xmxxgl = xmxxglService.save(xmxxgl);
 			} else {
 				if (StringUtils.isEmpty(xzqh)) {
@@ -528,6 +529,7 @@ public class XmxxglCtl extends BaseWebCtl {
 				String bh = xmxxglService.getxmbm();
 				String xmbm = nf + xzqh + "GK" + bh;
 				code.setXmbm(xmbm);
+				code.setSftb(Constants.NO);
 				xmxxgl = xmxxglService.save(code);
 
 			}

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxksq/ctl/XkzsqCtl.java

@@ -167,6 +167,7 @@ public class XkzsqCtl extends BaseWebCtl {
 	private ZxjxService zxjxService;
 	@Autowired
 	private XzglbmxxService xzglbmxxService;
+
 	@RequestMapping(value = "/main")
 	@RequiresPermissions("gkjyxksq:main")
 	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, 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 {
@@ -1747,7 +1748,8 @@ public class XkzsqCtl extends BaseWebCtl {
 			jyr.setRecordStatus(BaseEntity.RECORD_STATE_SQ);
 			gkjyrService.save(jyr);
 			// rtx提醒
-			//rtxSend(xkzsqEntity.getSzgq().getId(), Constants.ROLE_CLSC,"你有一条许可证申请待办事务，请及时处理！");
+			// rtxSend(xkzsqEntity.getSzgq().getId(),
+			// Constants.ROLE_CLSC,"你有一条许可证申请待办事务，请及时处理！");
 		} catch (Exception e) {
 			wr.setSuccess(false);
 			wr.setMessage("操作失败！");
@@ -2010,7 +2012,8 @@ public class XkzsqCtl extends BaseWebCtl {
 			}
 			xkzsqService.changeAudit(null, xkzsqEntity, true);
 			// rtx提醒
-			//rtxSend(xkzsqEntity.getSzgq().getId(), Constants.ROLE_CLSC,"你有一条许可证申请待办事务，请及时处理！");
+			// rtxSend(xkzsqEntity.getSzgq().getId(),
+			// Constants.ROLE_CLSC,"你有一条许可证申请待办事务，请及时处理！");
 		} catch (Exception e) {
 			wr.setSuccess(false);
 			wr.setMessage("操作失败！");
@@ -2154,10 +2157,11 @@ public class XkzsqCtl extends BaseWebCtl {
 	public WebJsonResult saveFile(@RequestParam("file") List<MultipartFile> file, String sfbx, Model model, HttpServletRequest request, HttpServletResponse response) {
 		WebJsonResult wr = success();
 		if (file != null && file.size() > 0) {
-			XkzsqfjEntity fjEntity = new XkzsqfjEntity();
+			XkzsqfjEntity fjEntity = null;
 			for (int i = 0; i < file.size(); i++) {
 				MultipartFile f = file.get(i);
 				if (f.getSize() > 0) {
+					fjEntity = new XkzsqfjEntity();
 					AccessoryEntity acc = accessoryService.saveFile(f, "xkzsq");
 					if (acc != null) {
 						fjEntity.setFjid(acc.getId());
@@ -2168,7 +2172,12 @@ public class XkzsqCtl extends BaseWebCtl {
 					}
 				}
 			}
-			wr.setAttr("acc", fjEntity);
+			if (fjEntity != null) {
+				wr.setAttr("acc", fjEntity);
+			}else{
+				wr.setSuccess(false);
+				wr.setMessage("上传的附件不能为空！");
+			}
 		} else {
 			wr.setSuccess(false);
 			wr.setMessage("请上传附件!");
@@ -2440,7 +2449,8 @@ public class XkzsqCtl extends BaseWebCtl {
 				}
 			} else {
 				// rtx提醒
-				//rtxSend(entity.getSzgq().getId(), role,"你有一条许可证申请待办事务，请及时处理！");
+				// rtxSend(entity.getSzgq().getId(),
+				// role,"你有一条许可证申请待办事务，请及时处理！");
 			}
 			wr.setAttr("jflag", jflag);
 		} catch (Exception e) {
@@ -2451,8 +2461,6 @@ public class XkzsqCtl extends BaseWebCtl {
 		return wr;
 	}
 
-	
-
 	/**
 	 * 签收
 	 * 
@@ -2579,10 +2587,10 @@ public class XkzsqCtl extends BaseWebCtl {
 			xkz.setZyqyfw(jyfwstr2);
 			xkz.setCq(jylzstr);
 			if (!StringUtils.isEmpty(user.getSsglbm())) {
-				XzglbmxxEntity glbm= user.getSsglbm();
-				if("00".equals(glbm.getPid())){
+				XzglbmxxEntity glbm = user.getSsglbm();
+				if ("00".equals(glbm.getPid())) {
 					xkz.setFzjg(glbm.getGkglbmqc());
-				}else{
+				} else {
 					XzglbmxxEntity pglbm = xzglbmxxService.getPglbm(glbm.getPid());
 					xkz.setFzjg(pglbm.getGkglbmqc());
 				}