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

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

@@ -87,10 +87,12 @@ public class GkxxController extends BaseController {
 		//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);
+		List<Object[]> CGRJ = cgService.GetCG_CGRJ_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))+"个，集装箱危货堆场"+
+						(CG_Num.get(0)==null?0:CG_Num.get(0))+"个，储罐总容积"+
+						(CGRJ.get(0)==null?0:CGRJ.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 石油化工码头企业

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

@@ -118,7 +118,11 @@ public interface CgDao extends MyRepository<CgEntity, Long> {
 	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)
+	@Query(value="select sum(ZDWXYCGGS),sum(ZDWXYCGRL) from T_YJPT_CG where RECORD_STATUS<>9 and SZD like ?1% AND ZDWXYCGGS is not null ",nativeQuery = true)
 	public List<Object[]> GetCG_ZDWXY_Num_By_Szd(String szd);
 	 
+	//根据所在地获得储罐总容积
+	@Query(value="SELECT SUM(CGRJ) FROM T_YJPT_CG WHERE RECORD_STATUS<>9 AND SZD LIKE ?1% ",nativeQuery = true)
+	public List<Object[]> GetCG_CGRJ_By_Szd(String szd);
+	
 }

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

@@ -8,6 +8,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Service;
 
 import com.jtgh.yjpt.client.common.AuthHandlerResolver;
@@ -398,4 +399,9 @@ public class CgServiceImp extends BaseService<CgEntity, Long> implements
 		return cgDao.GetCG_ZDWXY_Num_By_Szd(szd);
 	}
 	
+	//根据所在地获得储罐总容积
+	public List<Object[]> GetCG_CGRJ_By_Szd(String szd){
+		return cgDao.GetCG_CGRJ_By_Szd(szd);
+	}
+	
 }

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

@@ -100,4 +100,7 @@ public interface CgService {
 	//根据所在地获得是重大危险源的储罐的总个数、总容积
 	public List<Object[]> GetCG_ZDWXY_Num_By_Szd(String szd);
 
+	//根据所在地获得储罐总容积
+	public List<Object[]> GetCG_CGRJ_By_Szd(String szd);
+	
 }