增加了首页新列--有效期的企业数

修改了原来查询首页信息的条件（把like修改为equal）

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

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

@@ -32,6 +32,7 @@ import com.xt.jygl.gkjcxx.gq.service.GqService;
 import com.xt.jygl.gkjygl.cghzyxxgl.dcsb.entity.DcsbEntity;
 import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.BwEntity;
 import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.GkjyrEntity;
+import com.xt.jygl.gkjygl.gkjyr.xkzxx.entity.XkzxxEntity;
 import com.xtframe.core.base.ctl.WebJsonResult;
 import com.xtframe.sec.common.BaseEntity;
 import com.xtframe.util.StringUtils;
@@ -95,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.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));
+					list.add(cb.equal(root.get("szd").get("id").as(String.class), szdid));
 				}
 				if (StringUtils.isNotEmpty(gkid)) {
-					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + gkid + "%"));
+					list.add(cb.equal(root.get("szgk").get("id").as(String.class), gkid));
 				}
 				if (StringUtils.isNotEmpty(gqid)) {
-					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + gqid + "%"));
+					list.add(cb.equal(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));
@@ -134,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.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));
+					list.add(cb.equal(root.get("szd").get("id").as(String.class), szdid));
 				}
 				if (StringUtils.isNotEmpty(gkid)) {
-					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + gkid + "%"));
+					list.add(cb.equal(root.get("szgk").get("id").as(String.class), gkid ));
 				}
 				if (StringUtils.isNotEmpty(gqid)) {
-					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + gqid + "%"));
+					list.add(cb.equal(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[] {}));
@@ -149,7 +150,23 @@ public class IndexCtl extends BaseWebCtl {
 		List<BwEntity> bwlist = query.findAll(spec2, BwEntity.class);
 		int bwnum = bwlist != null ? bwlist.size() : 0;
 		map.put("bwnum", bwnum + "");
+		
+		//许可证有效期 内的企业数
+		Specification<XkzxxEntity> spec4 = new Specification<XkzxxEntity>() {
 
+			@Override
+			public Predicate toPredicate(Root<XkzxxEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
+				List<Predicate> list = new ArrayList<Predicate>();
+				if (StringUtils.isNotEmpty(gqid)) {
+					list.add(cb.equal(root.get("ssgq").as(String.class), gqid));
+				}
+				list.add(cb.equal(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_VALID));
+				list.add(cb.equal(root.get("sfyx").as(Integer.class), BaseEntity.RECORD_STATE_VALID));
+				return cb.and(list.toArray(new Predicate[] {}));
+			}
+		};
+		List<XkzxxEntity> qyslist = query.findAll(spec4, XkzxxEntity.class);
+		map.put("xkzyxqnqys", qyslist.size());
 		// 万吨级以上泊位个数
 		int wdjysbw = 0;
 		if (bwlist != null) {
@@ -185,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.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));
+					list.add(cb.equal(root.get("szd").get("id").as(String.class), szdid ));
 				}
 				if (StringUtils.isNotEmpty(gkid)) {
-					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + gkid + "%"));
+					list.add(cb.equal(root.get("szgk").get("id").as(String.class), gkid));
 				}
 				if (StringUtils.isNotEmpty(gqid)) {
-					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + gqid + "%"));
+					list.add(cb.equal(root.get("szgq").get("id").as(String.class), gqid));
 				}
 				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
 				Calendar startCal = Calendar.getInstance();