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

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkbg/ctl/XkzbgCtl.java

@@ -399,9 +399,9 @@ public class XkzbgCtl extends BaseWebCtl {
 				public Predicate toPredicate(Root<XkzxxEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
 					List<Predicate> list = new ArrayList<Predicate>();
 					list.add(cb.like(root.get("gkjyr").as(String.class), "%" + jyrid + "%"));
-					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.equal(root.get("sfyx").as(Integer.class), BaseEntity.RECORD_STATE_VALID));
+					//list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
+					list.add(cb.equal(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
+					//list.add(cb.equal(root.get("sfyx").as(Integer.class), BaseEntity.RECORD_STATE_VALID));
 					return cb.and(list.toArray(new Predicate[] {}));
 				}
 			};
@@ -439,8 +439,8 @@ public class XkzbgCtl extends BaseWebCtl {
 				public Predicate toPredicate(Root<XkzfzEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
 					List<Predicate> list = new ArrayList<Predicate>();
 					list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + jyrid + "%"));
-					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_DELETE));
+					list.add(cb.equal(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
 					return cb.and(list.toArray(new Predicate[] {}));
 				}
 			};
@@ -1874,9 +1874,9 @@ public class XkzbgCtl extends BaseWebCtl {
 			changStatus(bgjyr.getId(), BaseEntity.RECORE_STATE_BGFLAG);
 
 			GkjyrEntity yjyr = gkjyrService.findOne(jyr.getYjyrid());
-			yjyr.setRecordStatus(BaseEntity.RECORE_STATE_BGFLAG);
+			yjyr.setRecordStatus(BaseEntity.RECORD_STATE_BG);
 			yjyr = gkjyrService.save(yjyr);
-			changStatus(yjyr.getId(), BaseEntity.RECORE_STATE_BGFLAG);
+			changStatus(yjyr.getId(), BaseEntity.RECORD_STATE_BG);
 
 			// 码头
 			List<XkzglbEntity> xkzglbList = xkzglbService.findByCzid(xkzbgEntity.getId(), "1");

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

@@ -1644,9 +1644,9 @@ public class XkzzxCtl extends BaseWebCtl {
 
 			// 原经营人
 			GkjyrEntity yjyr = gkjyrService.findOne(jyr.getYjyrid());
-			yjyr.setRecordStatus(BaseEntity.RECORE_STATE_ZXFLAG);
+			yjyr.setRecordStatus(BaseEntity.RECORD_STATE_ZX);
 			yjyr = gkjyrService.save(yjyr);
-			changStatus(yjyr.getId(), BaseEntity.RECORE_STATE_ZXFLAG);
+			changStatus(yjyr.getId(), BaseEntity.RECORD_STATE_ZX);
 
 			if (!StringUtils.isEmpty(accid)) {
 				// 关联附件