git-svn-id: https://192.168.57.71/svn/lyggkj@145 1a6f6e3a-4066-fe46-b609-79c204482ece

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/dao/jyr/JyrDao.java

@@ -34,7 +34,7 @@ public interface JyrDao extends MyRepository<JyrEntity, Long> {
 	 */
 	@Query(value = " select g.mc,x.a,x.b from t_yjpt_ggdm g left join (select substr(szd,0,5)szdid, "
 			+ "count(id)a,SUM(CASE WHEN T.SFWHQY='W' or T.SFWHQY='Y' THEN 1 ELSE 0 END)b from T_YJPT_JYRJCXX T  "
-			+ "where t.record_status!=9 group by substr(T .szd,0,5))x on g.id=x.szdid where "
+			+ "where t.record_status!=9 and t.record_status!=0 group by substr(T .szd,0,5))x on g.id=x.szdid where "
 			+ "g.fid =900 and g.groupcode='SZD' order by g.px", nativeQuery = true)
 	public List<Object[]> countQy();
 
@@ -112,7 +112,7 @@ public interface JyrDao extends MyRepository<JyrEntity, Long> {
 			+ "count(id)a,SUM(CASE WHEN T.SFWHQY='W' or T.SFWHQY='Y' THEN 1 ELSE 0 END)b, "
 			+ "SUM(CASE WHEN (T.SFWHQY='W' or T.SFWHQY='Y') AND TO_CHAR(T.ADD_DATE,'YYYY')=TO_CHAR(SYSDATE,'YYYY') THEN 1 ELSE 0 END)c,"
 			+ "SUM(CASE WHEN (T.SFWHQY='W' or T.SFWHQY='Y') AND TO_CHAR(T.ADD_DATE,'YYYYMM')=TO_CHAR(SYSDATE,'YYYYMM') "
-			+ "THEN 1 ELSE 0 END)d  from T_YJPT_JYRJCXX T where T.RECORD_STATUS!=9 group by substr(T.szd,0,5)) x "
+			+ "THEN 1 ELSE 0 END)d  from T_YJPT_JYRJCXX T where T.RECORD_STATUS!=9 and T.RECORD_STATUS!=0 group by substr(T.szd,0,5)) x "
 			+ "on x.szdid=g.id where g.fid =900 and g.groupcode='SZD' order by g.px", nativeQuery = true)
 	public List<Object[]> countJyr();
 

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/webService/zysqbp/WhsqbpWebService.java

@@ -216,12 +216,11 @@ public class WhsqbpWebService extends BaseController {
 	 */
 	public List<ZysqbpEntity> getZysqbpPageListByParam(Long szd, String gkjyr,
 			Long szgq, String cm, String wxhwbh, String wxhwpm, String bgsj1,
-			String bgsj2, String kgsj1, String kgsj2, String wgsj1,
-			String wgsj2, int n, int pageCount) {
+			String bgsj2, String kgsj1, String kgsj2, String wgsj1,String wgsj2,
+			int n, int pageCount) {
 		List<PredicateModel> filterList = new ArrayList<PredicateModel>();
 		// 只检索非删除状态记录
-		addNotEmptyModel(filterList, "recordStatus",
-				BaseEntity.RECORD_STATE_DELETE, Operator.NEQ);
+		addNotEmptyModel(filterList, "recordStatus", BaseEntity.RECORD_STATE_DELETE, Operator.NEQ);
 		// 根据 申请单位 过滤
 		addNotEmptyModel(filterList, "zydw.gkjyr", gkjyr, Operator.LIKE);
 		// 根据所在地过滤
@@ -270,13 +269,14 @@ public class WhsqbpWebService extends BaseController {
 			} else {
 				// 行政人员根据权限过滤(危货列表菜单ID=26)
 				addRecordCodeFilter(26l, filterList);
-				addNotEmptyModel(filterList, "recordStatus",
-						BaseEntity.RECORD_STATE_VALID, Operator.NEQ);
+				addNotEmptyModel(filterList, "recordStatus", BaseEntity.RECORD_STATE_VALID, Operator.NEQ);
 			}
 		}
 		Specification<ZysqbpEntity> spec = SpecificationCreater.searchByPredicateModels(filterList);
 		SinglePageRequest page = new SinglePageRequest(pageCount, n, "desc","bgsj");
 		
+		 
+		
 		Page<ZysqbpEntity> list = zysqbpService.findAll(spec, page);
 		if (list == null || list.getTotalPages() < pageCount) {
 			return new ArrayList<ZysqbpEntity>();