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

gkjsjy/trunk/src/com/xt/jygl/sys/ctl/IndexCtl.java

@@ -96,13 +96,13 @@ public class IndexCtl extends BaseWebCtl {
 			public Predicate toPredicate(Root<GkjyrEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
 				List<Predicate> list = new ArrayList<Predicate>();
 				if (StringUtils.isNotEmpty(szdid)) {
-					list.add(cb.equal(root.get("szd").get("id").as(String.class), szdid));
+					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));
 				}
 				if (StringUtils.isNotEmpty(gkid)) {
-					list.add(cb.equal(root.get("szgk").get("id").as(String.class), gkid));
+					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + gkid + "%"));
 				}
 				if (StringUtils.isNotEmpty(gqid)) {
-					list.add(cb.equal(root.get("szgq").get("id").as(String.class), gqid));
+					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + gqid + "%"));
 				}
 				//list.add(cb.equal(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_VALID));
 				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
@@ -135,13 +135,13 @@ public class IndexCtl extends BaseWebCtl {
 			public Predicate toPredicate(Root<BwEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
 				List<Predicate> list = new ArrayList<Predicate>();
 				if (StringUtils.isNotEmpty(szdid)) {
-					list.add(cb.equal(root.get("szd").get("id").as(String.class), szdid));
+					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));
 				}
 				if (StringUtils.isNotEmpty(gkid)) {
-					list.add(cb.equal(root.get("szgk").get("id").as(String.class), gkid ));
+					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + gkid + "%"));
 				}
 				if (StringUtils.isNotEmpty(gqid)) {
-					list.add(cb.equal(root.get("szgq").get("id").as(String.class),  gqid));
+					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + gqid + "%"));
 				}
 				list.add(cb.equal(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_VALID));
 				return cb.and(list.toArray(new Predicate[] {}));
@@ -202,13 +202,13 @@ public class IndexCtl extends BaseWebCtl {
 			public Predicate toPredicate(Root<DcsbEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
 				List<Predicate> list = new ArrayList<Predicate>();
 				if (StringUtils.isNotEmpty(szdid)) {
-					list.add(cb.equal(root.get("szd").get("id").as(String.class), szdid ));
+					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));
 				}
 				if (StringUtils.isNotEmpty(gkid)) {
-					list.add(cb.equal(root.get("szgk").get("id").as(String.class), gkid));
+					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + gkid + "%"));
 				}
 				if (StringUtils.isNotEmpty(gqid)) {
-					list.add(cb.equal(root.get("szgq").get("id").as(String.class), gqid));
+					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + gqid + "%"));
 				}
 				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));