git-svn-id: https://192.168.57.71/svn/hbghj@106 201dd7a2-ec1b-f84b-8b06-88221118ff88

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/map/GkxxController.java

@@ -1,5 +1,9 @@
 package com.jtgh.yjpt.controller.map;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.flex.remoting.RemotingDestination;
 import org.springframework.stereotype.Controller;
@@ -10,22 +14,112 @@ import com.jtgh.yjpt.common.Constants;
 import com.jtgh.yjpt.common.GlobalData;
 import com.jtgh.yjpt.controller.BaseController;
 import com.jtgh.yjpt.entity.map.GkxxEntity;
+import com.jtgh.yjpt.service.gkgq.MtService;
+import com.jtgh.yjpt.service.jyr.BwService;
+import com.jtgh.yjpt.service.jyr.DcService;
+import com.jtgh.yjpt.service.jyr.JyrService;
 import com.jtgh.yjpt.service.map.GkxxService;
+import com.jtgh.yjpt.service.sys.WxhwpmService;
+import com.jtgh.yjpt.service.yjgl.zdwxyfb.CgService;
+import com.jtgh.yjpt.service.zyfzndjy.GkwxhwzyfzService;
 
 @Controller
 @RemotingDestination
 public class GkxxController extends BaseController {
 	@Autowired
 	private GkxxService gkxxService;
-
+	@Autowired
+	private JyrService jyrService;
+	@Autowired
+	private BwService bwService;
+	@Autowired 
+	private MtService mtService;
+	@Autowired
+	private CgService cgService;
+//	@Autowired
+//	private WxhwpmService wxhwpmService;
+	@Autowired
+	private DcService dcService;
+	@Autowired
+	private GkwxhwzyfzService gkwxhwzyfzService;
+	
 	public BusinessContext getGkxxBySzd(String szd) {
 		BusinessContext bc=new BusinessContext();
-		GkxxEntity entity=gkxxService.findBySzd(Long.parseLong(szd));
+		//GkxxEntity entity=gkxxService.findBySzd(Long.parseLong(szd));
+		GkxxEntity entity = new GkxxEntity();
+		
+		//4 危险货物品种
+//				List<Object[]> Total_LBHXB_BZLB = wxhwpmService.Count_Total_LBHXB_BZLB();
+//				entity.setWhpz("系统中危险货物品名录中录入的危险品有"+
+//							(Total_LBHXB_BZLB.get(0)[0]==null?0:Total_LBHXB_BZLB.get(0)[0])+"种，按类别与项别分有"+
+//							(Total_LBHXB_BZLB.get(0)[1]==null?0:Total_LBHXB_BZLB.get(0)[1])+"类，按包装类别分有"+
+//							(Total_LBHXB_BZLB.get(0)[2]==null?0:Total_LBHXB_BZLB.get(0)[2])+"类。");
+		//危货品种从附证的允许作业的危货物品中去重累计得来
+		List<Object[]> WH = gkwxhwzyfzService.GetWH_By_Szd(szd);
+		Map<String,String> whMap= new HashMap<String,String>();
+		for(int i=0;i<WH.size();i++){
+			Object o = WH.get(i);
+			if(o!=null){
+				String temp = o.toString();
+				if(!temp.equals("")){
+					String[] arrTemp = temp.split(";");
+					for(String str : arrTemp){
+						if(!str.trim().equals("")){
+							whMap.put(str.replace("\n", ""),"");
+						}
+					}//end for string arr
+				}// !=""
+			}// !=null
+		}//end for List<Object[]> WH
+		
+		//System.err.println(whMap.toString());
+		int WH_Num = whMap.size();
+		
+		//5 重大危险源 
+		List<Object[]> ZDWXY_CG = cgService.GetCG_ZDWXY_Num_By_Szd(szd);
+				entity.setZdwxy("重大危险源储罐"+
+					(ZDWXY_CG.get(0)[0]==null?0:ZDWXY_CG.get(0)[0])+"个，储罐总容积"+
+					(ZDWXY_CG.get(0)[0]==null?0:ZDWXY_CG.get(0)[0])+"万立方。");
+		
+		//1 港口安全情况
+		List<Object[]> WHQY_Num = jyrService.GetWHQY_Num_By_SZD(szd);
+		List<Object[]> BW_Num = bwService.GetBW_Num_By_Szd(szd);
+		//List<Object[]> Mt_Num= mtService.GetMt_Num_By_Szd(szd);//码头
+		List<Object[]> CG_Num = cgService.GetCG_Num_By_Szd(szd); 
+		List<Object[]> DC_Num = dcService.GetDC_JZX_WH_Num_By_SZD(szd);
+		entity.setAqgk("现有港口危险货物企业"+ (WHQY_Num.get(0)==null?0:WHQY_Num.get(0)) +"家、泊位"+
+						(BW_Num.get(0)==null?0:BW_Num.get(0))+"个，危险货物"+
+						WH_Num+"种，属港航管理部门监管的储罐" + 
+						(CG_Num.get(0)==null?0:CG_Num.get(0))+"个，集装箱危货堆场"+
+						(DC_Num.get(0)==null?0:DC_Num.get(0))+"个，其中重大危险源" + 
+						(ZDWXY_CG.get(0)[0]==null?0:ZDWXY_CG.get(0)[0])+"个。");
+		//2 石油化工码头企业
+		List<Object[]> SYHG_Num = jyrService.GetSYHGQY_Num_By_SZD(szd);
+		List<Object[]> BW_SYHG_Num = bwService.GetBW_SYHG_Num_By_SZD(szd);
+		List<Object[]> Mt_SYHG_Num = mtService.GetMt_Num_By_Szd(szd);
+		List<Object[]> CG_SYHG_Num = cgService.GetCG_SYHG_Num_By_Szd(szd);
+		entity.setSyhg("石油化工码头企业有" + (SYHG_Num.get(0)==null?0:SYHG_Num.get(0))
+						+"家，相关泊位"+ (BW_SYHG_Num.get(0)==null?0:BW_SYHG_Num.get(0)) + 
+						"个、储罐"+ (CG_SYHG_Num.get(0)==null?0:CG_SYHG_Num.get(0)) + 
+						"个"+"、码头" + (Mt_SYHG_Num.get(0)==null?0:Mt_SYHG_Num.get(0)) + "个。");
+		//3 危险货物储罐 
+		List<Object[]> WH_CG = cgService.GetCG_WH_Num_By_Szd(szd);
+		entity.setWhcg("属于危货企业的储罐有"+ (WH_CG.get(0)[0]==null?0:WH_CG.get(0)[0]) +
+				"个，储罐总容积"+
+				(WH_CG.get(0)[1]==null?0:WH_CG.get(0)[1]) +
+				"万立方，其中最大储罐容积"+ (WH_CG.get(0)[2]==null?0:WH_CG.get(0)[2])+
+				"万立方，最小储罐容积"+
+				(WH_CG.get(0)[3]==null?0:WH_CG.get(0)[3])+"万立方");
+		
+		
 		
 		bc.setAttribute("record", entity);
 		bc.setAttribute("success", true);
 		return bc;
 	}
+	
+	
+	
 	public BusinessContext save(GkxxEntity entity) {
 		BusinessContext bc=new BusinessContext();
 		entity=gkxxService.save(entity);

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/dao/gkgq/MtDao.java

@@ -26,4 +26,13 @@ public interface MtDao extends MyRepository<MtEntity, Long> {
 	@Query("from MtEntity where recordStatus=9 and tbzt='N'")
 	public List<MtEntity> synTimerdelete();
 
+	//根据所在地获得码头个数。
+	@Query(value="select COUNT(*) from T_YJPT_GQ_MT WHERE RECORD_STATUS<>9 AND SZD LIKE ?1% ",nativeQuery = true)
+	public List<Object[]> GetMt_Num_By_Szd(String szd);
+	
+	//根据所在地获得企业后，再获得与其相关的码头
+	@Query(value="SELECT count(*) from T_YJPT_GQ_MT where JYR in " +
+			"(select ID from T_YJPT_JYRJCXX J where J.SFWHQY<>'N' AND J.RECORD_STATUS<>9 and substr(QYXZ,1,1)='Y' and substr(QYXZ,4,1)='Y' AND J.SZD LIKE ?1% ) ",nativeQuery = true)
+	public List<Object[]> GetMt_SYHG_Num_By_Szd(String szd);
+	
 }

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

@@ -13,7 +13,23 @@ import com.jtgh.yjpt.entity.jyr.JyrEntity;
  * 2014-2021
  */
 public interface BwDao extends MyRepository<BwEntity, Long> {
+	
+	/**
+	 *查找未被删除的企业泊位 
+	 */
 	@Query("from BwEntity where qymc = ?1 and recordStatus <> 9")
 	public List<BwEntity> findByQymc(JyrEntity jyr);
 	
+	/**
+	 *根据所在地获得泊位数 
+	 */
+	@Query(value="select count(*) from T_YJPT_JYRXX_BW where RECORD_STATUS<>9 and SZD like ?1% ",nativeQuery = true)
+	public List<Object[]> GetBW_Num_By_Szd(String szd);
+	
+	
+	//根据所在地获得所有未删除的石油化工码头企业数后再获得这些企业的泊位数
+	@Query(value="SELECT count(*) from T_YJPT_JYRXX_BW where QYMC in " +
+			"(select ID from T_YJPT_JYRJCXX J where J.SFWHQY<>'N' AND J.RECORD_STATUS<>9 and substr(QYXZ,1,1)='Y' and substr(QYXZ,4,1)='Y' AND J.SZD LIKE ?1% ) ",nativeQuery = true)
+	public List<Object[]> GetBW_SYHG_Num_By_SZD(String szd);
+	
 }

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

@@ -108,12 +108,20 @@ public interface JyrDao extends MyRepository<JyrEntity, Long> {
 	 * 
 	 * @return
 	 */
-	@Query(value = " select g.mc,x.a,x.b,x.c,x.d from t_yjpt_ggdm g left join ( select substr(T.szd,0,4)szdid, "
-			+ "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,4)) x "
-			+ "on x.szdid=g.id where g.fid =42 and g.groupcode='SZD' order by g.px", nativeQuery = true)
+	@Query(value = "select g.mc,x.a,x.b,x.c,x.d,x.e from t_yjpt_ggdm g left join (" +
+			" SELECT z.szdid,a,b,c,d,e FROM " +
+			" ( select substr(T.szd,0,4)szdid," +
+			" 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,4)) " +
+			" z" +
+			"  LEFT JOIN" +
+			" (" +
+			" SELECT SUBSTR(SZD,0,4)SZDID,COUNT(*) e FROM T_YJPT_JYRXX_BW GROUP BY SUBSTR(SZD,0,4)" +
+			" ) W" +
+			" ON z.SZDID= SUBSTR(W.SZDID,1,4))" +
+			" x on x.szdid=g.id where g.fid =42 and g.groupcode='SZD' order by g.px", nativeQuery = true)
 	public List<Object[]> countJyr();
 
 	@Query(value = "   select g.mc,x.b,x.a from t_yjpt_ggdm g left join "
@@ -455,4 +463,14 @@ public interface JyrDao extends MyRepository<JyrEntity, Long> {
 			"SELECT TO_CHAR(COUNT(1)) FROM T_YJPT_CG C WHERE  C.ZDWXYCGGS=1 AND C.RECORD_STATUS<>9 AND C.DWMC=?1 ", nativeQuery = true)
 	public List<Object[]> countGkwhccss(Long jyrid);
 
+	
+	//根据所在地获得所有未删除的危货企业数
+	@Query(value="select count(*) as num from T_YJPT_JYRJCXX J where J.SFWHQY<>'N' AND J.RECORD_STATUS<>9 AND J.SZD LIKE ?1% ",nativeQuery = true)
+	public List<Object[]> GetWHQY_Num_By_SZD(String szd);
+	
+	//根据所在地获得所有未删除的石油化工码头企业数
+	@Query(value="select count(*) from T_YJPT_JYRJCXX J where J.SFWHQY<>'N' AND J.RECORD_STATUS<>9 and substr(QYXZ,1,1)='Y' and substr(QYXZ,4,1)='Y' AND J.SZD LIKE ?1% ",nativeQuery = true)
+	public List<Object[]> GetSYHGQY_Num_By_SZD(String szd);
+	
+	
 }

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

@@ -59,4 +59,18 @@ public interface WxhwpmDao extends MyRepository<WxhwpmEntity, Long> {
 	
 	@Query(value = "select * from T_YJPT_WXHWPMB where bh like ?1 and mchsm like ?2 and rownum<=200", nativeQuery = true)
 	public List<WxhwpmEntity> queryByBhMc(String bh, String mc);
+	
+	
+	//危险货物查询统计 总数量、类别与相别分总类数、包装类别分总类数
+	@Query(value="SELECT total,LBHXB,BZLB FROM" +
+			" ((select total,LBHXB from (" +
+			" (select  count(ID) as total FROM T_YJPT_WXHWPMB WHERE RECORD_STATUS<>9)  " +
+			" outer join (select count(LBHXB) as LBHXB from (select  COUNT(LBHXB),LBHXB FROM T_YJPT_WXHWPMB WHERE RECORD_STATUS<>9 GROUP BY LBHXB))" +
+			" on 1=1 " +
+			" )) " +
+			" outer join (select count(BZLB) as BZLB from (select  COUNT(BZLB),BZLB FROM T_YJPT_WXHWPMB WHERE RECORD_STATUS<>9 GROUP BY BZLB))" +
+			" on 1=1" +
+			" )",nativeQuery=true)
+	public List<Object[]> Count_Total_LBHXB_BZLB();
+	
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/dao/jyrxxgl/JyrdcxxDao.java

@@ -24,4 +24,8 @@ public interface JyrdcxxDao extends MyRepository<JyrdcxxEntity, Long> {
 
 	@Query("from JyrdcxxEntity where qymc = ?1 and recordStatus <> 9")
 	public List<JyrdcxxEntity> findByQymc(JyrEntity jyr);
+	
+	//根据所在地获得集装箱危货堆场多少个
+	@Query(value="select count(*) from T_YJPT_JYRXX_DC where RECORD_STATUS<>9 and WXPDC='Y' and substr(SCYDCYT,3,1)='Y' and SZD like ?1% ",nativeQuery = true)
+	public List<Object[]> GetDC_JZX_WH_Num_By_SZD(String szd);
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/dao/yjgl/zdwxyfb/CgDao.java

@@ -102,4 +102,23 @@ public interface CgDao extends MyRepository<CgEntity, Long> {
 
 	@Query("from CgEntity where dwmc=?1 and cgqmc like '%?2%' and  recordStatus<>9 ")
 	public List<CgEntity> findByJyrAndName(JyrEntity jyr, String name);
+	
+	//根据所在地获得储罐的总个数
+	@Query(value="select sum(CGGS) from T_YJPT_CG where RECORD_STATUS<>9 and SZD like ?1% ",nativeQuery = true)
+	public List<Object[]> GetCG_Num_By_Szd(String szd);
+	
+	//根据所在地获得石油化工企业后获得与其相关的储罐个数
+	@Query(value="SELECT SUM(CGGS) from T_YJPT_CG where DWMC in " +
+			"(select ID from T_YJPT_JYRJCXX J where J.SFWHQY<>'N' AND J.RECORD_STATUS<>9 and substr(QYXZ,1,1)='Y' and substr(QYXZ,4,1)='Y' AND J.SZD LIKE ?1% ) ",nativeQuery = true)
+	public List<Object[]> GetCG_SYHG_Num_By_Szd(String szd);
+	
+	//根据所在地获得危货企业后获得与其相关的储罐个数 
+	@Query(value="SELECT SUM(CGGS),SUM(CGRJ),Max(CGRJ),min(CGRJ) from T_YJPT_CG where DWMC in " +
+			"(select ID from T_YJPT_JYRJCXX J where J.SFWHQY<>'N' AND J.RECORD_STATUS<>9 and J.SZD LIKE ?1% ) ",nativeQuery = true)
+	public List<Object[]> GetCG_WH_Num_By_Szd(String szd);
+	
+	//根据所在地获得是重大危险源的储罐的总个数、总容积
+	@Query(value="select sum(ZDWXYCGGS),sum(ZDWXYCGRL) from T_YJPT_CG where RECORD_STATUS<>9 and SZD like ?1% AND ZDWXYCGGS=1 ",nativeQuery = true)
+	public List<Object[]> GetCG_ZDWXY_Num_By_Szd(String szd);
+	 
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/dao/zyfzndjy/Gkwxhwzyfzbl_fzbDao.java

@@ -55,4 +55,9 @@ public interface Gkwxhwzyfzbl_fzbDao extends
 
 	@Query("from GkwxhwzyfzblFzEntity o where o.fzhz.id=?1 and recordStatus<>9 ")
 	public List<GkwxhwzyfzblFzEntity> findByFzhzId(Long id);
+	
+	
+	//获得所在危货附证中的危货物品
+	@Query(value="	SELECT DISTINCT(byzd5) from T_YJPT_GKWXHWZYFZBL_FZ where RECORD_STATUS<>9 and szd like ?1% ",nativeQuery=true)
+	public List<Object[]> GetWH_By_Szd(String szd);
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/gkgq/MtService.java

@@ -36,4 +36,12 @@ public interface MtService {
 	public List<MtEntity> synTimerdelete();
 	public void saveSynTimer(MtEntity entity, MtWebService webService);
 	public void deleteSynTimer(MtEntity entity, MtWebService webService);
+	
+	//根据所在地获得码头个数。
+	public List<Object[]> GetMt_Num_By_Szd(String szd);
+	
+	
+	//根据所在地获得企业后，再获得与其相关的码头
+	public List<Object[]> GetMt_SYHG_Num_By_Szd(String szd);
+	
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/impl/gkgq/MtServiceImpl.java

@@ -80,10 +80,17 @@ public class MtServiceImpl extends BaseService<MtEntity, Long> implements MtServ
 				e.printStackTrace();
 			}
 		
+		}
 	}
-		
+
+	//根据所在地获得码头个数。
+	public List<Object[]> GetMt_Num_By_Szd(String szd){
+		return mtDao.GetMt_Num_By_Szd(szd);
 	}
 	
+	//根据所在地获得企业后，再获得与其相关的码头
+	public List<Object[]> GetMt_SYHG_Num_By_Szd(String szd){
+		return mtDao.GetMt_Num_By_Szd(szd);
+	}
 	
-
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/impl/jyr/BwServiceImpl.java

@@ -1,5 +1,7 @@
 package com.jtgh.yjpt.service.impl.jyr;
 
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -33,4 +35,17 @@ public class BwServiceImpl extends BaseService<BwEntity, Long> implements BwServ
 		return null;
 	}
 
+	
+	/**
+	 *根据所在地获得泊位数 
+	 */
+	public List<Object[]> GetBW_Num_By_Szd(String szd){
+		return bwdao.GetBW_Num_By_Szd(szd);
+	}
+	
+	//根据所在地获得所有未删除的石油化工码头企业数后再获得这些企业的泊位数
+	public List<Object[]> GetBW_SYHG_Num_By_SZD(String szd){
+		return bwdao.GetBW_SYHG_Num_By_SZD(szd);
+	}
+	
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/impl/jyr/JyrDcServiceImpl.java

@@ -1,5 +1,7 @@
 package com.jtgh.yjpt.service.impl.jyr;
 
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -9,11 +11,14 @@ import com.jtgh.yjpt.dao.jyrxxgl.JyrdcxxDao;
 import com.jtgh.yjpt.entity.jyrxxgl.JyrdcxxEntity;
 import com.jtgh.yjpt.service.BaseService;
 import com.jtgh.yjpt.service.jyr.DcService;
+
 @Service
-public class JyrDcServiceImpl extends BaseService<JyrdcxxEntity, Long> implements DcService {
+public class JyrDcServiceImpl extends BaseService<JyrdcxxEntity, Long>
+		implements DcService {
 
 	@Autowired
 	private JyrdcxxDao dao;
+
 	@Override
 	public JyrdcxxEntity findByTbdyid(Long tbdyid) {
 		// TODO Auto-generated method stub
@@ -31,7 +36,9 @@ public class JyrDcServiceImpl extends BaseService<JyrdcxxEntity, Long> implement
 		return null;
 	}
 
-	
+	// 根据所在地获得集装箱危货堆场多少个
+	public List<Object[]> GetDC_JZX_WH_Num_By_SZD(String szd) {
+		return dao.GetDC_JZX_WH_Num_By_SZD(szd);
+	}
 
-	
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/impl/jyr/JyrServiceImpl.java

@@ -512,6 +512,7 @@ public class JyrServiceImpl extends BaseService<JyrEntity, Long> implements
 				Map<String, Object> row = new HashMap<String, Object>();
 				row.put("NAME", objects[0]);
 				row.put("NUM", objects[1]);
+				row.put("BW", objects[5]);//泊位
 				row.put("WHNUM", objects[2]);
 				row.put("YEAR", objects[3]);
 				row.put("MONTH", objects[4]);
@@ -1159,5 +1160,15 @@ public class JyrServiceImpl extends BaseService<JyrEntity, Long> implements
 		return listJyr.isEmpty();
 	}
 	
+	//根据所在地获得所有未删除的危货企业数
+	public List<Object[]> GetWHQY_Num_By_SZD(String szd){
+		return jyrDao.GetWHQY_Num_By_SZD(szd);
+	}
+	
+	
+	//根据所在地获得所有未删除的石油化工码头企业数
+	public List<Object[]> GetSYHGQY_Num_By_SZD(String szd){
+		return jyrDao.GetSYHGQY_Num_By_SZD(szd);
+	}
 	
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/impl/sys/WxhwpmServiceImpl.java

@@ -147,5 +147,11 @@ public class WxhwpmServiceImpl extends BaseService<WxhwpmEntity, Long>
 		
 		return wxhwpmDao.queryByBhMc("%" + bh + "%", "%" + mc + "%");
 	}
-
+	
+	
+	//危险货物查询统计 总数量、类别与相别分总类数、包装类别分总类数 
+	public List<Object[]> Count_Total_LBHXB_BZLB(){
+		return wxhwpmDao.Count_Total_LBHXB_BZLB();
+	}
+	
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/impl/yjgl/zdwxyfb/CgServiceImp.java

@@ -375,5 +375,27 @@ public class CgServiceImp extends BaseService<CgEntity, Long> implements
 	public List<CgEntity> findByJyrAndName(JyrEntity jyr, String name) {
 		return cgDao.findByJyrAndName(jyr, name);
 	}
+	
+	
+	//根据所在地获得储罐的总个数
+	public List<Object[]> GetCG_Num_By_Szd(String szd){
+		return cgDao.GetCG_Num_By_Szd(szd);
+	}
 
+	
+	//根据所在地获得石油化工企业后获得与其相关的储罐个数
+	public List<Object[]> GetCG_SYHG_Num_By_Szd(String szd){
+		return cgDao.GetCG_SYHG_Num_By_Szd(szd);
+	}
+	
+	//根据所在地获得危货企业后获得与其相关的储罐个数  
+	public List<Object[]> GetCG_WH_Num_By_Szd(String szd){
+		return cgDao.GetCG_WH_Num_By_Szd(szd);
+	}
+	
+	//根据所在地获得是重大危险源的储罐的总个数、总容积
+	public List<Object[]> GetCG_ZDWXY_Num_By_Szd(String szd){
+		return cgDao.GetCG_ZDWXY_Num_By_Szd(szd);
+	}
+	
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/impl/zyfzndjy/GkwxhwzyfzServiceImpl.java

@@ -10,6 +10,7 @@ import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
 import com.jtgh.yjpt.dao.common.MyRepository;
 import com.jtgh.yjpt.dao.zyfzndjy.Gkwxhwzyfzbl_fzbDao;
 import com.jtgh.yjpt.entity.zyfzhz.GkwxhwzyfzhzEntity;
@@ -47,7 +48,9 @@ public class GkwxhwzyfzServiceImpl extends
 		return dao.findByFzhzId(gkwxhwzyfzhzEntity.getId());
 	}
 
+	// 获得所在危货附证中的危货物品
+	public List<Object[]> GetWH_By_Szd(String szd) {
+		return dao.GetWH_By_Szd(szd);
+	}
 
-
-	
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/jyr/BwService.java

@@ -1,8 +1,9 @@
 package com.jtgh.yjpt.service.jyr;
 
+import java.util.List;
+
 import org.springframework.data.jpa.domain.Specification;
 
-import java.util.List;
 import com.jtgh.yjpt.client.jyr.bw.BwWebService;
 import com.jtgh.yjpt.entity.jyr.BwEntity;
 
@@ -31,5 +32,14 @@ public interface BwService {
 	public <S extends BwEntity> S save(S newEntity);
 	public BwEntity findOne(Long tbdyid);
 	public BwWebService geWebService();
+	
+	/**
+	 *根据所在地获得泊位数 
+	 */
+	public List<Object[]> GetBW_Num_By_Szd(String szd);
+	
+	
+	//根据所在地获得所有未删除的石油化工码头企业数后再获得这些企业的泊位数
+	public List<Object[]> GetBW_SYHG_Num_By_SZD(String szd);
 
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/jyr/DcService.java

@@ -1,5 +1,7 @@
 package com.jtgh.yjpt.service.jyr;
 
+import java.util.List;
+
 import com.jtgh.yjpt.client.jyr.dc.JyrDcWebService;
 import com.jtgh.yjpt.entity.jyrxxgl.JyrdcxxEntity;
 
@@ -25,4 +27,7 @@ public interface DcService {
 	public <S extends JyrdcxxEntity> S save(S newEntity);
 	public JyrdcxxEntity findOne(Long tbdyid);
 	public JyrDcWebService getWebService();
+	
+	//根据所在地获得集装箱危货堆场多少个
+	public List<Object[]> GetDC_JZX_WH_Num_By_SZD(String szd);
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/jyr/JyrService.java

@@ -295,4 +295,11 @@ public interface JyrService {
 	 */
 	public Boolean IsExistJyrName(JyrEntity jyrEntity);
 	
+	
+	//根据所在地获得所有未删除的危货企业数
+	public List<Object[]> GetWHQY_Num_By_SZD(String szd);
+	
+	//根据所在地获得所有未删除的石油化工码头企业数
+	public List<Object[]> GetSYHGQY_Num_By_SZD(String szd);
+	
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/sys/WxhwpmService.java

@@ -58,4 +58,7 @@ public interface WxhwpmService {
 	public List<WxhwpmEntity> queryByMc(String mc);
 	
 	public List<WxhwpmEntity> queryByBhMc(String bh, String mc);  
+	
+	//危险货物查询统计 总数量、类别与相别分总类数、包装类别分总类数 
+	public List<Object[]> Count_Total_LBHXB_BZLB();
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/yjgl/zdwxyfb/CgService.java

@@ -7,6 +7,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.jpa.domain.Specification;
+import org.springframework.data.jpa.repository.Query;
 
 import com.jtgh.yjpt.client.yjgl.cg.CgWebService;
 import com.jtgh.yjpt.entity.common.CodeEntity;
@@ -83,5 +84,20 @@ public interface CgService {
 	public List<CgEntity> findValid();
 
 	public List<CgEntity> findByJyrAndName(JyrEntity jyr, String name);
+	
+	
+	//根据所在地获得储罐的总个数
+	public List<Object[]> GetCG_Num_By_Szd(String szd);
+	
+	
+	//根据所在地获得石油化工企业后获得与其相关的储罐个数
+	public List<Object[]> GetCG_SYHG_Num_By_Szd(String szd);
+	
+	
+	//根据所在地获得危货企业后获得与其相关的储罐个数  
+	public List<Object[]> GetCG_WH_Num_By_Szd(String szd);
+	
+	//根据所在地获得是重大危险源的储罐的总个数、总容积
+	public List<Object[]> GetCG_ZDWXY_Num_By_Szd(String szd);
 
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/zyfzndjy/GkwxhwzyfzService.java

@@ -35,5 +35,6 @@ public interface GkwxhwzyfzService extends BaseWorkFlowService {
 			GkwxhwzyfzhzEntity gkwxhwzyfzhzEntity);
 
 
-	
+	// 获得所在危货附证中的危货物品
+	public List<Object[]> GetWH_By_Szd(String szd);
 }

gkaq/yjpt-java/trunk/resources/iReport/jyr/jyrTj-pro.jrxml

@@ -157,7 +157,7 @@
 				<textElement verticalAlignment="Middle">
 					<font fontName="Serif"/>
 				</textElement>
-				<textFieldExpression><![CDATA[com.yjpt.util.PropReader.getProperty($F{NAME})]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{NAME}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement stretchType="RelativeToTallestObject" x="90" y="0" width="80" height="20" uuid="de0e8334-19b8-4efc-9565-2012f964abc9"/>