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

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

@@ -235,6 +235,7 @@ public class JsjdglCtl extends BaseWebCtl {
 				}
 				// 只显示状态为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.RECORE_STATE_COPY));
 				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_VALID));
 				return cb.and(list.toArray(new Predicate[] {}));
 			}
@@ -921,7 +922,8 @@ public class JsjdglCtl extends BaseWebCtl {
 	// 查看
 	@RequestMapping(value = "/view")
 	@RequiresPermissions("jsjdgl:main")
-	public String view(Model model, String id, String flag, String fhbz, String menuid) {
+	public String view(Model model, String id, String flag, String fhbz, String menuid,String tzflag) {
+		model.addAttribute("tzflag", tzflag);
 		// 附件
 		List<AccessoryEntity> accessoryList = accessoryService.queryBySsidAndSstype(id, "jsjd");
 		for (int i = 0; i < accessoryList.size(); i++) {
@@ -1192,6 +1194,7 @@ public class JsjdglCtl extends BaseWebCtl {
 					list.add(cb.like(root.get("createUser").as(String.class), "%" + securityMgr.getCurrUser().getId() + "%"));
 				}
 				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.RECORE_STATE_COPY));
 				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[] {}));
@@ -2502,6 +2505,7 @@ public class JsjdglCtl extends BaseWebCtl {
 					list.add(cb.like(root.get("createUser").as(String.class), "%" + securityMgr.getCurrUser().getId() + "%"));
 				}
 				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.RECORE_STATE_COPY));
 				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[] {}));