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

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/xkzzxeditmain.jsp

@@ -724,7 +724,7 @@
 											<td>${xkzfz.wxhwpm }</td>
 											<%-- <td>${xkzfz.yxqkssjfmt }</td> --%>
 											<td>${xkzfz.yxqjssjfmt }</td>
-											<td><c:if test="${xkzfz.recordStatus==0}">有效</c:if></td>
+											<td><c:if test="${xkzfz.recordStatus==11}">有效</c:if></td>
 											<td><a class="btn btn-default btn-xs" href="#"
 												onclick="xkzzx.detail.viewXkzfz('${xkzfz.id}')" title='查看'>
 													<i class="glyphicon glyphicon-search"></i>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/xkzzxviewmain.jsp

@@ -744,7 +744,7 @@
 							<td >${xkzfz.wxhwpm }</td>
 							<%-- <td >${xkzfz.yxqkssjfmt }</td> --%>
 							<td >${xkzfz.yxqjssjfmt }</td>
-							<td ><c:if test="${xkzfz.recordStatus==0}">有效</c:if></td>
+							<td ><c:if test="${xkzfz.recordStatus==11}">有效</c:if></td>
 					        <td>
 						        <a class="btn btn-default btn-xs" href="#" onclick="xkzzx.detail.viewXkzfz('${xkzfz.id}')" title='查看'>
 						            <i class="glyphicon glyphicon-search"></i>

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

@@ -381,8 +381,7 @@ public class XkzzxCtl extends BaseWebCtl {
 					// 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));
+					list.add(cb.equal(root.get("sfyx").as(Integer.class),BaseEntity.RECORD_STATE_VALID));
 					Date date = new Date();
 					list.add(cb.greaterThanOrEqualTo(root.get("yxqz").as(Date.class), date));
 					list.add(cb.lessThanOrEqualTo(root.get("yxqq").as(Date.class), date));
@@ -423,8 +422,11 @@ public class XkzzxCtl 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));
+					Date date = new Date();
+					list.add(cb.greaterThanOrEqualTo(root.get("yxqjssj").as(Date.class), date));
+					list.add(cb.lessThanOrEqualTo(root.get("yxqkssj").as(Date.class), date));
 					return cb.and(list.toArray(new Predicate[] {}));
 				}
 			};
@@ -1113,7 +1115,11 @@ public class XkzzxCtl extends BaseWebCtl {
 					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("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
+					list.add(cb.equal(root.get("sfyx").as(Integer.class), BaseEntity.RECORD_STATE_VALID));
+					Date date = new Date();
+					list.add(cb.greaterThanOrEqualTo(root.get("yxqz").as(Date.class), date));
+					list.add(cb.lessThanOrEqualTo(root.get("yxqq").as(Date.class), date));
 					return cb.and(list.toArray(new Predicate[] {}));
 				}
 			};
@@ -1153,6 +1159,9 @@ public class XkzzxCtl extends BaseWebCtl {
 					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));
+					Date date = new Date();
+					list.add(cb.greaterThanOrEqualTo(root.get("yxqjssj").as(Date.class), date));
+					list.add(cb.lessThanOrEqualTo(root.get("yxqkssj").as(Date.class), date));
 					return cb.and(list.toArray(new Predicate[] {}));
 				}
 			};
@@ -1321,7 +1330,11 @@ public class XkzzxCtl extends BaseWebCtl {
 					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.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));
+					Date date = new Date();
+					list.add(cb.greaterThanOrEqualTo(root.get("yxqz").as(Date.class), date));
+					list.add(cb.lessThanOrEqualTo(root.get("yxqq").as(Date.class), date));
 					return cb.and(list.toArray(new Predicate[] {}));
 				}
 			};
@@ -1361,6 +1374,9 @@ public class XkzzxCtl extends BaseWebCtl {
 					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));
+					Date date = new Date();
+					list.add(cb.greaterThanOrEqualTo(root.get("yxqjssj").as(Date.class), date));
+					list.add(cb.lessThanOrEqualTo(root.get("yxqkssj").as(Date.class), date));
 					return cb.and(list.toArray(new Predicate[] {}));
 				}
 			};