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

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/bagl/yjyaba/YjyabaController.java

@@ -110,9 +110,11 @@ public class YjyabaController extends BaseController {
 	public BusinessContext list(Pageable pageable, final Long functionId,
 			final String dwname, final Long jjtype, Date bzdate_begin1,
 			Date bzdate_end1, final Long szdid, final Long gqid,
-			final String lcStatus) {
+			final String lcStatus,Date bayxq_) {
+		
 		final Date bzdate_begin = Utils.getDateFirstTime(bzdate_begin1);
 		final Date bzdate_end = Utils.getDateLastTime(bzdate_end1);
+		final Date bayxq_FirstTime = Utils.getDateFirstTime(bayxq_);
 		// List<PredicateModel> filterList = new ArrayList<PredicateModel>();
 		//
 		// // 查询条件-单位名称
@@ -159,45 +161,35 @@ public class YjyabaController extends BaseController {
 			Specification<YjyabaEntity> spec = new Specification<YjyabaEntity>() {
 
 				@Override
-				public Predicate toPredicate(Root<YjyabaEntity> root,
-						CriteriaQuery<?> query, CriteriaBuilder cb) {
+				public Predicate toPredicate(Root<YjyabaEntity> root,CriteriaQuery<?> query, CriteriaBuilder cb) {
 					List<Predicate> list = new ArrayList<Predicate>();
 					addRecordCodeFilter(functionId, cb, root, list);
-					list.add(cb.notEqual(
-							root.get("recordStatus").as(String.class),
-							BaseEntity.RECORD_STATE_DELETE));
+					list.add(cb.notEqual(root.get("recordStatus").as(String.class),BaseEntity.RECORD_STATE_DELETE));
 					if (null != dwname && !"".equals(dwname))
-						list.add(cb.like(
-								root.get("dwname").get("gkjyr")
-										.as(String.class), "%" + dwname + "%"));
+						list.add(cb.like(root.get("dwname").get("gkjyr").as(String.class), "%" + dwname + "%"));
 					// if (null != dwaddress && !"".equals(dwaddress))
 					// list.add(cb.like(
 					// root.get("dwaddress").as(String.class),
 					// "%"+dwaddress+"%"));
 					if (null != jjtype && -1l != jjtype)
-						list.add(cb.equal(root.get("jjtype").as(Integer.class),
-								jjtype));
+						list.add(cb.equal(root.get("jjtype").as(Integer.class),jjtype));
 					if (null != szdid && -1l != szdid)
-						list.add(cb.like(
-								root.get("szd").get("id").as(String.class),
-								szdid + "%"));
+						list.add(cb.like(root.get("szd").get("id").as(String.class),szdid + "%"));
 					if (gqid != null && !gqid.equals(-1l))
-						list.add(cb.equal(
-								root.get("gq").get("id").as(Long.class), gqid));
+						list.add(cb.equal(root.get("gq").get("id").as(Long.class), gqid));
 					// if (null != versionno && !"".equals(versionno))
 					// list.add(cb.like(
 					// root.get("versionno").as(String.class),
 					// "%"+versionno+"%"));
 					if (null != bzdate_begin)
-						list.add(cb
-								.greaterThanOrEqualTo(
-										root.get("bzdate").as(Date.class),
-										bzdate_begin));
+						list.add(cb.greaterThanOrEqualTo(root.get("bzdate").as(Date.class),bzdate_begin));
 					if (null != bzdate_end)
-						list.add(cb.lessThanOrEqualTo(
-								root.get("bzdate").as(Date.class), bzdate_end));
-					list = Utils.setWorkflowSpec(list, cb, query, root,
-							lcStatus);
+						list.add(cb.lessThanOrEqualTo(root.get("bzdate").as(Date.class), bzdate_end));
+					//备案有效期大于等于所选的日期筛选条件，即相较于所选日期，还处于有效期内地的数据
+					if(null != bayxq_FirstTime)
+						list.add(cb.greaterThanOrEqualTo(root.get("bayxq").as(Date.class), bayxq_FirstTime));
+					
+					list = Utils.setWorkflowSpec(list, cb, query, root,lcStatus);
 					return cb.and(list.toArray(new Predicate[] {}));
 				}
 			};
@@ -242,9 +234,12 @@ public class YjyabaController extends BaseController {
 	@Log(Type.QUERY)
 	public BusinessContext listNoFlow(Pageable pageable, Long functionId,
 			String dwname, Long jjtype, Date bzdate_begin, Date bzdate_end,
-			Long szdid, Long gqid, String lcStatus) {
+			Long szdid, Long gqid, String lcStatus,Date bayxq_)  {
+		
 		bzdate_begin = Utils.getDateFirstTime(bzdate_begin);
 		bzdate_end = Utils.getDateLastTime(bzdate_end);
+		bayxq_ = Utils.getDateFirstTime(bayxq_);
+		
 		List<PredicateModel> filterList = new ArrayList<PredicateModel>();
 
 		// 查询条件-单位名称
@@ -266,6 +261,9 @@ public class YjyabaController extends BaseController {
 
 		// 查询条件-编制日期范围结束
 		addNotEmptyModel(filterList, "bzdate", bzdate_end, Operator.LTE);
+		
+		//备案有效期大于等于所选的日期筛选条件，即相较于所选日期，还处于有效期内地的数据 
+		addNotEmptyModel(filterList,"bayxq",bayxq_,Operator.GTE);
 
 		// 查询条件-区域类别 0：省级；1：市级
 		// addNotEmptyModel(filterList, "qylb", GlobalData.DEPLOY_MODE,
@@ -282,30 +280,23 @@ public class YjyabaController extends BaseController {
 		}
 
 		// 只检索非删除状态记录
-		addNotEmptyModel(filterList, "recordStatus",
-				Logable.RECORD_STATE_DELETE, Operator.NEQ);
+		addNotEmptyModel(filterList, "recordStatus", Logable.RECORD_STATE_DELETE, Operator.NEQ);
 		addRecordCodeFilter(functionId, filterList, null, "dwname");
-		Specification<YjyabaEntity> spec = SpecificationCreater
-				.searchByPredicateModels(filterList);
+		Specification<YjyabaEntity> spec = SpecificationCreater.searchByPredicateModels(filterList);
 		Page<YjyabaEntity> pageList = yjyabaService.findAll(spec, pageable);
 		for (YjyabaEntity entity : pageList) {
 			// 检索附件
 			filterList = new ArrayList<PredicateModel>();
-			addNotEmptyModel(filterList, "entityType.id",
-					Constants.ACCESSORY_ENTITY_TYPE_YJYABA, Operator.EQ);
-			addNotEmptyModel(filterList, "recordStatus",
-					BaseEntity.RECORD_STATE_DELETE, Operator.NEQ);
-			addNotEmptyModel(filterList, "entityId", entity.getId(),
-					PredicateModel.Operator.EQ);
-			Specification<AccessoryEntity> accSpec = SpecificationCreater
-					.searchByPredicateModels(filterList);
+			addNotEmptyModel(filterList, "entityType.id", Constants.ACCESSORY_ENTITY_TYPE_YJYABA, Operator.EQ);
+			addNotEmptyModel(filterList, "recordStatus", BaseEntity.RECORD_STATE_DELETE, Operator.NEQ);
+			addNotEmptyModel(filterList, "entityId", entity.getId(), PredicateModel.Operator.EQ);
+			Specification<AccessoryEntity> accSpec = SpecificationCreater.searchByPredicateModels(filterList);
 			List<AccessoryEntity> acc = accessoryService.findAll(accSpec);
 			if (acc != null && acc.size() > 0)
 				entity.setAccessory(acc.get(0));
 		}
 		BusinessContext bc = createBusinessContext(pageList);
 		return bc;
-
 	}
 
 	@RequestMapping(value = "yjyabaJasper", method = RequestMethod.POST)
@@ -347,56 +338,40 @@ public class YjyabaController extends BaseController {
 			Specification<YjyabaEntity> spec = new Specification<YjyabaEntity>() {
 
 				@Override
-				public Predicate toPredicate(Root<YjyabaEntity> root,
-						CriteriaQuery<?> query, CriteriaBuilder cb) {
+				public Predicate toPredicate(Root<YjyabaEntity> root,CriteriaQuery<?> query, CriteriaBuilder cb) {
 					List<Predicate> list = new ArrayList<Predicate>();
-					addRecordCodeFilter(Long.parseLong(param.get(7)), cb, root,
-							list);
+					addRecordCodeFilter(Long.parseLong(param.get(7)), cb, root,list);
 					if (Constants.YES.equals(Utils.getCurrentUser().getSfjyr())) {
-						list.add(cb.equal(
-								root.get("addUser").as(UserEntity.class),
-								Utils.getCurrentUser()));
+						list.add(cb.equal(root.get("addUser").as(UserEntity.class),Utils.getCurrentUser()));
 					}
-					list.add(cb.notEqual(
-							root.get("recordStatus").as(String.class),
-							BaseEntity.RECORD_STATE_DELETE));
+					list.add(cb.notEqual(root.get("recordStatus").as(String.class),BaseEntity.RECORD_STATE_DELETE));
 					if (!"".equals(param.get(0)))
-						list.add(cb.like(
-								root.get("dwname").get("gkjyr")
-										.as(String.class), "%" + param.get(0)
-										+ "%"));
+						list.add(cb.like(root.get("dwname").get("gkjyr").as(String.class), "%" + param.get(0)+ "%"));
 					if (!"".equals(param.get(1)))
-						list.add(cb.equal(
-								root.get("jjtype").get("id").as(Long.class),
-								Long.parseLong(param.get(1))));
+						list.add(cb.equal(root.get("jjtype").get("id").as(Long.class),Long.parseLong(param.get(1))));
 					if (!"".equals(param.get(2)))
-						list.add(cb.like(
-								root.get("szd").get("id").as(String.class),
-								param.get(2) + "%"));
+						list.add(cb.like(root.get("szd").get("id").as(String.class),param.get(2) + "%"));
 					if (!"".equals(param.get(3)))
-						list.add(cb.equal(
-								root.get("gq").get("id").as(Long.class),
-								Long.parseLong(param.get(3))));
+						list.add(cb.equal(root.get("gq").get("id").as(Long.class),Long.parseLong(param.get(3))));
 					if (!"".equals(param.get(4)))
 						try {
-							list.add(cb.greaterThan(
-									root.get("bzdate").as(Date.class), Utils
-											.getDateFirstTime(sdf.parse(param
-													.get(4)))));
+							list.add(cb.greaterThan(root.get("bzdate").as(Date.class), Utils.getDateFirstTime(sdf.parse(param.get(4)))));
 						} catch (ParseException e) {
 							e.printStackTrace();
 						}
 					if (!"".equals(param.get(5)))
 						try {
-							list.add(cb.lessThan(
-									root.get("bzdate").as(Date.class), Utils
-											.getDateLastTime(sdf.parse(param
-													.get(5)))));
+							list.add(cb.lessThan(root.get("bzdate").as(Date.class), Utils.getDateLastTime(sdf.parse(param.get(5)))));
+						} catch (ParseException e) {
+							e.printStackTrace();
+						}
+					if (!"".equals(param.get(8)))
+						try {
+							list.add(cb.greaterThanOrEqualTo(root.get("bayxq").as(Date.class), Utils.getDateLastTime(sdf.parse(param.get(8)))));
 						} catch (ParseException e) {
 							e.printStackTrace();
 						}
-					list = Utils.setWorkflowSpec(list, cb, query, root,
-							param.get(6));
+					list = Utils.setWorkflowSpec(list, cb, query, root,param.get(6));
 					return cb.and(list.toArray(new Predicate[] {}));
 				}
 			};