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

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/common/systimer/ZcdcSycn.java

@@ -14,7 +14,6 @@ import com.jtgh.yjpt.client.zcdc.zxjc.ZxjcWebService;
 import com.jtgh.yjpt.common.Constants;
 import com.jtgh.yjpt.common.GlobalData;
 import com.jtgh.yjpt.controller.BaseController;
-import com.jtgh.yjpt.dao.check.DcDao;
 import com.jtgh.yjpt.entity.check.DcEntity;
 import com.jtgh.yjpt.entity.check.DcZxjcEntity;
 import com.jtgh.yjpt.entity.check.ZcEntity;
@@ -27,7 +26,7 @@ import com.jtgh.yjpt.service.gg.GgService;
 /**
  * 自查督查同步
  * 
- */
+ */ 
 @Component
 public class ZcdcSycn extends BaseController{
 	@Autowired
@@ -37,9 +36,7 @@ public class ZcdcSycn extends BaseController{
 	@Autowired
 	private ZxjcService zxjcService;
 	@Autowired
-	private GgService ggService;
-	@Autowired
-	private DcDao dcDao;
+	private GgService ggService; 
 	@Autowired
 	private DcService dcService;
 	
@@ -69,18 +66,29 @@ public class ZcdcSycn extends BaseController{
 					}
 				}
 			}
+			
+			System.out.println("------------dc begin-----------------");
 			//===========================督察================
-			List<DcEntity> dclist = dcDao.findBySync();
+			List<DcEntity> dclist = dcService.findBySync();
+			System.out.println("------------dc 1-----------------");
 			if(dclist!=null&&dclist.size()>0){
+				System.out.println("------------dc 2-----------------");
 				DcWebService dcWebService= dcService.getWebService(null);
+				System.out.println("------------dc 3-----------------");
 				if(dcWebService!=null){
 					for (DcEntity dcEntity : dclist) {
+						System.out.println("------------dc 4-----------------");
+						System.out.println(dcEntity.getAddDate());
+						System.out.println(dcEntity);
 						dcWebService.save(dcEntity);
+						System.out.println("------------dc 5-----------------");
 						dcEntity.setTbzt(Constants.YES);
 						dcService.save(dcEntity);
 					}
 				}
 			}
+			System.out.println("--------dc end---------------------");
+			
 			//===============专项检查======================
 			List<DcZxjcEntity> zxjcList = zxjcService.findBySync();
 			if(zxjcList!=null&&zxjcList.size()>0){
@@ -100,7 +108,7 @@ public class ZcdcSycn extends BaseController{
 			List<DcZxjcEntity> zxjcList = zxjcService.findBySync();
 			if(zxjcList!=null&&zxjcList.size()>0){
 				for (DcZxjcEntity dcZxjcEntity : zxjcList) {
-					List<DcEntity> dcList = dcDao.findByZxjcId(dcZxjcEntity.getId());
+					List<DcEntity> dcList = dcService.findByZxjcId(dcZxjcEntity.getId());
 					for (DcEntity dcEntity : dcList) {
 						ZxjcWebService zxjcWebService = zxjcService.getWebService(dcEntity.getSzd().getId()); 
 						GgWebService ggWebService = ggService.getWebService(dcEntity.getSzd().getId());
@@ -114,7 +122,7 @@ public class ZcdcSycn extends BaseController{
 				}
 			}
 			//===========================督察================
-			List<DcEntity> dclist = dcDao.findBySync();
+			List<DcEntity> dclist = dcService.findBySync();
 			if(dclist!=null&&dclist.size()>0){
 				DcWebService dcWebService= null;
 				for (DcEntity dcEntity : dclist) {

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/bagl/jdhxpandzdwxyba/JdhxpZdwxyBadjController.java

@@ -744,23 +744,34 @@ public class JdhxpZdwxyBadjController extends BaseController {
 		return bc;
 	}
 
+	/**
+	 * 安全备案管理 模块首页 统计
+	 * @param szd
+	 * @return
+	 */
 	public BusinessContext tj(Long szd) {
 		BusinessContext bc = createBusinessContext();
 		try {
 			if (null == szd || szd == 0) {
+				//省：
+				//柱状图数据
 				List<Object[]> tjWxyYhpc = djbaService.tj_Wxy_Yhpc_Baqk();
 				bc.setAttribute("tjWxyYhpc", tjWxyYhpc);
-				List<Object[]> tjWxyYhpcPjbgYjya = djbaService
-						.tj_Wxy_Yhpc_Pjbg_Yjya_Baqk();
+				//备案管理统计列表 左
+				List<Object[]> tjWxyYhpcPjbgYjya = djbaService.tj_Wxy_Yhpc_Pjbg_Yjya_Baqk();
 				bc.setAttribute("tjWxyYhpcPjbgYjya", tjWxyYhpcPjbgYjya);
+				//安全评价机构统计列表 右
 				List<Object[]> tjAqpjjg = djbaService.tj_Aqpjjg();
 				bc.setAttribute("tjAqpjjg", tjAqpjjg);
 			} else {
+				//市：
+				//柱状图数据
 				List<Object[]> tjWxyYhpc = djbaService.tj_Wxy_Yhpc_Baqk(szd);
 				bc.setAttribute("tjWxyYhpc", tjWxyYhpc);
-				List<Object[]> tjWxyYhpcPjbgYjya = djbaService
-						.tj_Wxy_Yhpc_Pjbg_Yjya_Baqk(szd);
+				//备案管理统计列表 左
+				List<Object[]> tjWxyYhpcPjbgYjya = djbaService.tj_Wxy_Yhpc_Pjbg_Yjya_Baqk(szd);
 				bc.setAttribute("tjWxyYhpcPjbgYjya", tjWxyYhpcPjbgYjya);
+				//安全评价机构统计列表 右
 				List<Object[]> tjAqpjjg = djbaService.tj_Aqpjjg(szd);
 				bc.setAttribute("tjAqpjjg", tjAqpjjg);
 			}

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

@@ -367,7 +367,7 @@ public class YjyabaController extends BaseController {
 						}
 					if (!"".equals(param.get(8)))
 						try {
-							list.add(cb.greaterThanOrEqualTo(root.get("bayxq").as(Date.class), Utils.getDateLastTime(sdf.parse(param.get(8)))));
+							list.add(cb.greaterThanOrEqualTo(root.get("bayxq").as(Date.class), Utils.getDateFirstTime(sdf.parse(param.get(8)))));
 						} catch (ParseException e) {
 							e.printStackTrace();
 						}

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/check/DcController.java

@@ -613,16 +613,93 @@ public class DcController extends BaseController {
 		return createBusinessContext();
 	}
 
+//	public BusinessContext countEvent(CodeEntity entity, Date tjsjq, Date tjsjz) {
+//		BusinessContext bc = new BusinessContext();
+//		if (Constants.SZD_ID_PROVINCE.equals(entity.getId()))
+//			bc.setAttribute("countList",
+//					dcService.countSzdEvent(entity, tjsjq, tjsjz));
+//		else
+//			bc.setAttribute("countList",
+//					dcService.countJyrEvent(entity, tjsjq, tjsjz));
+//		return bc;
+//	}
+	/**
+	 * 统计督查隐患数量
+	 * @param entity
+	 * @param tjsjq
+	 * @param tjsjz
+	 * @return
+	 */
 	public BusinessContext countEvent(CodeEntity entity, Date tjsjq, Date tjsjz) {
 		BusinessContext bc = new BusinessContext();
-		if (Constants.SZD_ID_PROVINCE.equals(entity.getId()))
-			bc.setAttribute("countList",
-					dcService.countSzdEvent(entity, tjsjq, tjsjz));
-		else
-			bc.setAttribute("countList",
-					dcService.countJyrEvent(entity, tjsjq, tjsjz));
+		if (Constants.SZD_ID_PROVINCE.equals(entity.getId())){
+			List<ZcDcCountEntity> countList = dcService.countSzdEvent(entity, tjsjq, tjsjz);
+			
+			bc.setAttribute("countList",countList);
+			
+			//1 所在地隐患总数、已整改数量、重大隐患数量 所在地柱状图统计
+			// TODO 数据来源
+			List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
+			List<Map<String, Object>> list1 = new ArrayList<Map<String, Object>>();
+			for(ZcDcCountEntity zcDcCountEntity : countList){
+				if(zcDcCountEntity.getSzd().equals("SZD.JIANGSU")) {
+					
+					Map<String, Object> map = new HashMap<String, Object>();
+					list = new ArrayList<Map<String, Object>>();
+					map = new HashMap<String, Object>();
+					map.put("NAME", "重大隐患");
+					map.put("NUM", zcDcCountEntity.getQzzdyh());
+					list.add(map);
+					map = new HashMap<String, Object>();
+					map.put("NAME", "一般隐患");
+					map.put("NUM", zcDcCountEntity.getQzybyh());
+					list.add(map);
+					bc.setAttribute("tj2",list);
+					
+					list = new ArrayList<Map<String, Object>>();
+					map = new HashMap<String, Object>();
+					map.put("NAME", "码头");
+					map.put("NUM", zcDcCountEntity.getYhqymt());
+					list.add(map);
+					map = new HashMap<String, Object>();
+					map.put("NAME", "罐区");
+					map.put("NUM", zcDcCountEntity.getYhqygq());
+					list.add(map);
+					bc.setAttribute("tj3",list);
+					continue;
+				}
+				Map<String, Object> map1 = new HashMap<String, Object>();
+				map1.put("NAME", Utils.getResource("select",  zcDcCountEntity.getSzd()));
+				map1.put("YHNUM", zcDcCountEntity.getChyhhj());
+				map1.put("YZGNUM", zcDcCountEntity.getYzgyhhj());
+				map1.put("ZDYHNUM", zcDcCountEntity.getQzzdyh());
+				list1.add(map1);
+			}
+//			map.put("NAME", "所在地1");
+//			map.put("YHNUM", 100);
+//			map.put("YZGNUM", 90);
+//			map.put("ZDYHNUM", 20);
+//			list.add(map);
+//			map = new HashMap<String, Object>();
+//			map.put("NAME", "所在地2");
+//			map.put("YHNUM", 120);
+//			map.put("YZGNUM", 110);
+//			map.put("ZDYHNUM", 30);
+//			list.add(map);
+//			map = new HashMap<String, Object>();
+//			map.put("NAME", "所在地3");
+//			map.put("YHNUM", 60);
+//			map.put("YZGNUM", 56);
+//			map.put("ZDYHNUM", 7);
+//			list.add(map);
+			bc.setAttribute("tj1",list1);
+		}
+		else{
+			bc.setAttribute("countList",dcService.countJyrEvent(entity, tjsjq, tjsjz));
+		}
 		return bc;
 	}
+	
 
 	@RequestMapping(value = "getDcExcelFile", method = RequestMethod.POST)
 	@ResponseBody
@@ -991,4 +1068,7 @@ public class DcController extends BaseController {
 		bc.setAttribute("gg", ggEntity);
 		return bc;
 	}
+	
+	
+	
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/check/ZcController.java

@@ -480,12 +480,12 @@ public class ZcController extends BaseController {
 	 * @param szd
 	 * @return
 	 */
-	public BusinessContext countZcDc(String szd) {
+	public BusinessContext countZcDc(String szd,String type) {
 		List<Map<String, Object>> list = null;
 		if (null == szd) {
-			list = zcService.countZcdc(null);
+			list = zcService.countZcdc(null,type);
 		} else {
-			list = zcService.countZcdc(Long.parseLong(szd));
+			list = zcService.countZcdc(Long.parseLong(szd),type);
 		}
 		BusinessContext bc = createBusinessContext();
 		bc.setAttribute("records", list);

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/zyfzndjy/GkwxhwzyfzblhhzController.java

@@ -273,8 +273,7 @@ public class GkwxhwzyfzblhhzController extends BaseController {
 					return cb.and(list.toArray(new Predicate[] {}));
 				}
 			};
-			Page<GkwxhwzyfzblhhzEntity> result = gkwxhwzyfzblhhzService
-					.findAll(spec, pageable);
+			Page<GkwxhwzyfzblhhzEntity> result = gkwxhwzyfzblhhzService.findAll(spec, pageable);
 			if (result != null) {
 				for (GkwxhwzyfzblhhzEntity entity : result) {
 					if (entity.getTaskList() != null
@@ -306,6 +305,29 @@ public class GkwxhwzyfzblhhzController extends BaseController {
 		}
 		return null;
 	}
+	
+	
+	/**
+	 * 统计拥有有效附证的经营人数量
+	 * @param szd
+	 * @param gq
+	 * @param whdj
+	 * @return
+	 */
+	@Log(Type.QUERY)
+	public BusinessContext countValidFz_Jyr(final CodeEntity szd, final GqEntity gq,final CodeEntity whdj) {
+		BusinessContext bc = new BusinessContext();
+		Map<String,String> rtn = gkwxhwzyfzblhhzService.countValidFz(szd, gq, whdj);
+		//有效附证
+		bc.setAttribute("validFz",rtn.get("fz"));
+		//码头企业
+		bc.setAttribute("validFzJyrMt",rtn.get("mt"));
+		//码头企业  危险货物集装箱码头经营人
+		bc.setAttribute("validFzJyrMtJzx",rtn.get("mtJzx"));
+		//仓储企业
+		bc.setAttribute("validFzJyrCc",rtn.get("cc"));
+		return bc;
+	}
 
 	public Collection<String[]> print(final List<String> param)
 			throws ParseException {

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/zysqbp/ZysqbpController.java

@@ -4,6 +4,7 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
+import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -1363,39 +1364,38 @@ public class ZysqbpController extends BaseController {
 	 * @param szd
 	 * @return
 	 */
-	public BusinessContext countSpZxl(String szd) {
+	public BusinessContext countSpZxl(String szd,Date ks,Date js) {
 		List<Map<String, Object>> list = null;
 		if (null == szd) {
-			list = zysqbpService.countSpZxl(null);
+			list = zysqbpService.countSpZxl(null,ks,js);
 		} else {
-			list = zysqbpService.countSpZxl(Long.parseLong(szd));
+			list = zysqbpService.countSpZxl(Long.parseLong(szd),ks,js);
 		}
 		BusinessContext bc = createBusinessContext();
 		bc.setAttribute("records", list);
 		return bc;
 	}
 
-	@RequestMapping(value = "bdwhspTjJasper", method = RequestMethod.POST)
-	@ResponseBody
-	@RemotingExclude
-	public void jasperPrintTj(
-			@RequestParam(value = "type", required = false) final String type,
-			@RequestParam(value = "szd", required = false) final String szd,
-			HttpServletResponse response, HttpServletRequest request) {
-		List<Map<String, Object>> dataList = (List<Map<String, Object>>) countSp(
-				szd, type).getAttribute("records");
-		String reportFile = "";
-		Map<String, Object> parameters = new HashMap<String, Object>();
-		if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
-			reportFile = "iReport/aqsp/aqspglTj-city.jasper";
-		} else {
-			reportFile = "iReport/aqsp/aqspglTj-pro.jasper";
-		}
-
-		ReportExportHelper.exportFromIreport(reportFile, response, parameters,
-				new JRBeanCollectionDataSource(dataList), "本地危货审批统计",
-				ReportExportHelper.REPORT_EXPORT_TYPE_WORD);
-	}
+//	@RequestMapping(value = "bdwhspTjJasper", method = RequestMethod.POST)
+//	@ResponseBody
+//	@RemotingExclude
+//	public void jasperPrintTj(
+//			@RequestParam(value = "type", required = false) final String type,
+//			@RequestParam(value = "szd", required = false) final String szd,
+//			HttpServletResponse response, HttpServletRequest request) {
+//		List<Map<String, Object>> dataList = (List<Map<String, Object>>) countSp(szd, type).getAttribute("records");
+//		String reportFile = "";
+//		Map<String, Object> parameters = new HashMap<String, Object>();
+//		if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
+//			reportFile = "iReport/aqsp/aqspglTj-city.jasper";
+//		} else {
+//			reportFile = "iReport/aqsp/aqspglTj-pro.jasper";
+//		}
+//
+//		ReportExportHelper.exportFromIreport(reportFile, response, parameters,
+//				new JRBeanCollectionDataSource(dataList), "本地危货审批统计",
+//				ReportExportHelper.REPORT_EXPORT_TYPE_WORD);
+//	}
 
 	/**
 	 * 审批统计
@@ -1404,12 +1404,12 @@ public class ZysqbpController extends BaseController {
 	 * @param type
 	 * @return
 	 */
-	public BusinessContext countSp(String szd, String type) {
+	public BusinessContext countSp(String szd,Date ks,Date js) {
 		List<Map<String, Object>> list = null;
 		if (null == szd) {
-			list = zysqbpService.countSp(null, type);
+			list = zysqbpService.countSp(null,ks,js);
 		} else {
-			list = zysqbpService.countSp(Long.parseLong(szd), type);
+			list = zysqbpService.countSp(Long.parseLong(szd),ks,js);
 		}
 		BusinessContext bc = createBusinessContext();
 		bc.setAttribute("records", list);
@@ -2068,26 +2068,93 @@ public class ZysqbpController extends BaseController {
 		return bc;
 	}
 
+//	public BusinessContext countEvent3(CodeEntity szd, int ndName, int jdName,
+//			Long qymcName, String hzName, Long mtbwName, Date bgsj1,
+//			Date bgsj2, Date kgsj1, Date kgsj2, Date wgsj1, Date wgsj2) {
+//		BusinessContext bc = new BusinessContext();
+//
+//		if (qymcName == 0) {
+//			if (szd == null || szd.getId() == 900l)
+//				bc = zysqbpService.getForSeasonList(0l, ndName, jdName, bgsj1,
+//						bgsj2, kgsj1, kgsj2, wgsj1, wgsj2, hzName, false);
+//			else {
+//				bc = zysqbpService.getForSeasonList(szd.getId(), ndName,
+//						jdName, bgsj1, bgsj2, kgsj1, kgsj2, wgsj1, wgsj2,
+//						hzName, false);
+//			}
+//		} else if (qymcName != 0)
+//			bc.setAttribute("countList8", zysqbpService.findJyrBwAndHwList(
+//					ndName, jdName, bgsj1, bgsj2, kgsj1, kgsj2, wgsj1, wgsj2,
+//					qymcName, hzName, mtbwName, false));
+//		return bc;
+//	}
+	
+	/**
+	 * 统计集装箱数量
+	 * @param szd
+	 * @param ndName
+	 * @param jdName
+	 * @param qymcName
+	 * @param hzName
+	 * @param mtbwName
+	 * @param bgsj1
+	 * @param bgsj2
+	 * @param kgsj1
+	 * @param kgsj2
+	 * @param wgsj1
+	 * @param wgsj2
+	 * @return
+	 */
 	public BusinessContext countEvent3(CodeEntity szd, int ndName, int jdName,
 			Long qymcName, String hzName, Long mtbwName, Date bgsj1,
 			Date bgsj2, Date kgsj1, Date kgsj2, Date wgsj1, Date wgsj2) {
 		BusinessContext bc = new BusinessContext();
 
 		if (qymcName == 0) {
-			if (szd == null || szd.getId() == 900l)
+			if (szd == null || szd.getId() == 900l){
 				bc = zysqbpService.getForSeasonList(0l, ndName, jdName, bgsj1,
 						bgsj2, kgsj1, kgsj2, wgsj1, wgsj2, hzName, false);
+				
+				// 查询吞吐量前n的货物
+				// TODO 数据来源
+				List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
+				List<Object[]> hzTjList = zysqbpService.hzTj(bgsj1, bgsj2, kgsj1, kgsj2, wgsj1, wgsj2,hzName,false);
+				for(Object[] obj : hzTjList){
+					if(null != obj){
+						Map<String, Object> map = new HashMap<String, Object>();
+						map.put("NAME", String.valueOf(obj[0])+String.valueOf(obj[2]));
+						map.put("NUM", obj[1]);
+						list.add(map);
+					}
+				}
+				
+//				map = new HashMap<String, Object>();
+//				map.put("NAME", "货种2");
+//				map.put("NUM", 90);
+//				list.add(map);
+//				map = new HashMap<String, Object>();
+//				map.put("NAME", "货种3");
+//				map.put("NUM", 28);
+//				list.add(map);
+//				map = new HashMap<String, Object>();
+//				map.put("NAME", "货种4");
+//				map.put("NUM", 54);
+//				list.add(map);
+				bc.setAttribute("tj", list);
+			}
 			else {
 				bc = zysqbpService.getForSeasonList(szd.getId(), ndName,
 						jdName, bgsj1, bgsj2, kgsj1, kgsj2, wgsj1, wgsj2,
 						hzName, false);
 			}
-		} else if (qymcName != 0)
+		} else if (qymcName != 0){
 			bc.setAttribute("countList8", zysqbpService.findJyrBwAndHwList(
 					ndName, jdName, bgsj1, bgsj2, kgsj1, kgsj2, wgsj1, wgsj2,
 					qymcName, hzName, mtbwName, false));
+		}
 		return bc;
 	}
+	
 
 	/**
 	 * 统计危货作业数量
@@ -5021,5 +5088,32 @@ public class ZysqbpController extends BaseController {
 
 		return "error";
 	}
+	
+	/** 
+	 * 放回当天日期年份的一月一号到当天日期
+	 * @return  
+	 */
+	public BusinessContext getDateRange() {
+		BusinessContext bc = createBusinessContext();
+		Calendar cal = Calendar.getInstance(); 
+		Date js = cal.getTime();//end
+		
+		//1.1
+		int year = Calendar.YEAR;
+		String date = year + "-01-01";
+		
+		DateFormat fmt = new SimpleDateFormat("yyyy-MM-dd");
+		Date ks = null;
+		try {
+			ks = fmt.parse(date);
+		} catch (ParseException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		
+		bc.setAttribute("ks",ks);
+		bc.setAttribute("js",js);
+		return bc;
+	}
 
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/dao/aqsszxyssc/AqsszxysDao.java

@@ -85,16 +85,15 @@ public interface AqsszxysDao extends MyRepository<Aqsszxys, Long> {
 //	public List<Object[]> countWxp();
 
 	@Query(value = "select g.mc,x.a from t_yjpt_ggdm g left join (select substr(A.Szd,0,5)szdid,count(A.id)a " +
-			"from T_YJPT_AQSSZXYS A where A.RECORD_STATUS!=9 AND TO_CHAR(SYSDATE,:TYPE)=TO_CHAR(A.ADD_DATE,:TYPE) " +
+			"from T_YJPT_AQSSZXYS A where A.RECORD_STATUS!=9 AND ?1<=A.ADD_DATE AND A.ADD_DATE<=?2 " +
 			"group by substr(A.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[]> countSp(@Param("TYPE") String type);
+	public List<Object[]> countSp(java.util.Date ks,java.util.Date js);
 
 	@Query(value = "SELECT G.GQMC,COUNT(A.ID) "
 			+ " FROM T_YJPT_GQ G "
 			+ " LEFT JOIN T_YJPT_AQSSZXYS A "
-			+ " ON A.SZGQ=G.ID AND A.RECORD_STATUS!=9 AND TO_CHAR(SYSDATE,?2)=TO_CHAR(A.ADD_DATE,?2)"
+			+ " ON A.SZGQ=G.ID AND A.RECORD_STATUS!=9 AND ?2<=A.ADD_DATE AND A.ADD_DATE<=?3 "
 			+ " WHERE G.RECORD_STATUS!=9 AND  G.SZD like ?1  " + " GROUP BY G.GQMC ORDER BY G.GQMC", nativeQuery = true)
-	public List<Object[]> countSp( String string,
-			String type);
+	public List<Object[]> countSp(String szd,java.util.Date ks,java.util.Date js);
 
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/dao/bagl/jdhxpandzdwxyba/GqnwxydjbabDao.java

@@ -29,8 +29,8 @@ public interface GqnwxydjbabDao extends MyRepository<GqnwxydjbabEntity, Long> {
 	/** 备案首页统计 **/
 	/** 统计危险源和隐患排查备案情况 */
 	@Query(value = "SELECT ID,MC, CASE WHEN T1.CNT IS NULL THEN 0 ELSE T1.CNT END AS WXY_COUNT,CASE WHEN T2.CNT IS NULL THEN 0 ELSE T2.CNT END AS YHPC_COUNTFROM  from T_YJPT_GGDM g "+
-         "LEFT JOIN (SELECT substr(SZD,0,5)szdid, COUNT(ID) AS CNT FROM T_YJPT_GQNWXYDJBAB WHERE SZD IS NOT NULL AND RECORD_STATUS<>9 GROUP BY substr(SZD,0,5)) T1 ON g.ID = T1.szdid "+
-         "LEFT JOIN (SELECT substr(SZD,0,5)szdid, COUNT(ID) AS CNT FROM T_YJPT_ZDSGYHPCZGBA WHERE SZD IS NOT NULL AND RECORD_STATUS<>9 GROUP BY substr(SZD,0,5)) T2 ON g.ID = T2.szdid "+
+         "LEFT JOIN (SELECT substr(SZD,0,5)szdid, COUNT(ID) AS CNT FROM T_YJPT_GQNWXYDJBAB WHERE SZD IS NOT NULL AND RECORD_STATUS<>9 AND trunc(sysdate)<=BAYXQ GROUP BY substr(SZD,0,5)) T1 ON g.ID = T1.szdid "+
+         "LEFT JOIN (SELECT substr(SZD,0,5)szdid, COUNT(ID) AS CNT FROM T_YJPT_ZDSGYHPCZGBA WHERE SZD IS NOT NULL AND RECORD_STATUS<>9 AND trunc(sysdate)<=BAYXQ GROUP BY substr(SZD,0,5)) T2 ON g.ID = T2.szdid "+
        "WHERE g.GROUPCODE='SZD' and g.fid =900 ORDER BY g.PX", nativeQuery = true)
 	public List<Object[]> tj_Wxy_Yhpc_Baqk();
 
@@ -43,15 +43,15 @@ public interface GqnwxydjbabDao extends MyRepository<GqnwxydjbabEntity, Long> {
 			+ "   CASE WHEN T3.CNT IS NULL THEN 0 ELSE T3.CNT END AS PJBG_COUNT,"
 			+ "   CASE WHEN T4.CNT IS NULL THEN 0 ELSE T4.CNT END AS YJYA_COUNT"
 			+ " FROM T_YJPT_GGDM"
-			+ "   LEFT JOIN (SELECT substr(SZD,0,5)szdid, COUNT(ID) AS CNT FROM T_YJPT_GQNWXYDJBAB WHERE SZD IS NOT NULL AND RECORD_STATUS<>9 GROUP BY substr(SZD,0,5)) T1 ON ID = T1.szdid"
-			+ "   LEFT JOIN (SELECT substr(SZD,0,5)szdid, COUNT(ID) AS CNT FROM T_YJPT_ZDSGYHPCZGBA WHERE SZD IS NOT NULL AND RECORD_STATUS<>9 GROUP BY substr(SZD,0,5)) T2 ON ID = T2.szdid"
-			+ "   LEFT JOIN (SELECT substr(SZD,0,5)szdid, COUNT(ID) AS CNT FROM T_YJPT_AQXZPJBGBADJB WHERE SZD IS NOT NULL AND RECORD_STATUS<>9 GROUP BY substr(SZD,0,5)) T3 ON ID = T3.szdid"
-			+ "   LEFT JOIN (SELECT substr(SZD,0,5)szdid, COUNT(ID) AS CNT FROM T_YJPT_YJYABA WHERE SZD IS NOT NULL AND RECORD_STATUS<>9 GROUP BY substr(SZD,0,5)) T4 ON ID = T4.szdid"
+			+ "   LEFT JOIN (SELECT substr(SZD,0,5)szdid, COUNT(ID) AS CNT FROM T_YJPT_GQNWXYDJBAB WHERE SZD IS NOT NULL AND RECORD_STATUS<>9 AND trunc(sysdate)<=BAYXQ GROUP BY substr(SZD,0,5)) T1 ON ID = T1.szdid"
+			+ "   LEFT JOIN (SELECT substr(SZD,0,5)szdid, COUNT(ID) AS CNT FROM T_YJPT_ZDSGYHPCZGBA WHERE SZD IS NOT NULL AND RECORD_STATUS<>9 AND trunc(sysdate)<=BAYXQ GROUP BY substr(SZD,0,5)) T2 ON ID = T2.szdid"
+			+ "   LEFT JOIN (SELECT substr(SZD,0,5)szdid, COUNT(ID) AS CNT FROM T_YJPT_AQXZPJBGBADJB WHERE SZD IS NOT NULL AND RECORD_STATUS<>9 AND trunc(sysdate)<=BAYXQ GROUP BY substr(SZD,0,5)) T3 ON ID = T3.szdid"
+			+ "   LEFT JOIN (SELECT substr(SZD,0,5)szdid, COUNT(ID) AS CNT FROM T_YJPT_YJYABA WHERE SZD IS NOT NULL AND RECORD_STATUS<>9 AND trunc(sysdate)<=BAYXQ GROUP BY substr(SZD,0,5)) T4 ON ID = T4.szdid"
 			+ " WHERE GROUPCODE='SZD' and fid =900 ORDER BY PX", nativeQuery = true)
 	public List<Object[]> tj_Wxy_Yhpc_Pjbg_Yjya_Baqk();
 
 	/** 统计安全评价机构 */
-	@Query(value = "SELECT JGLX, COUNT(ID) AS CNT FROM T_YJPT_GKAQPJJGSQBAB WHERE JGLX IS NOT NULL AND RECORD_STATUS<>9 GROUP BY JGLX", nativeQuery = true)
+	@Query(value = "SELECT JGLX, COUNT(ID) AS CNT FROM T_YJPT_GKAQPJJGSQBAB WHERE JGLX IS NOT NULL AND RECORD_STATUS<>9 AND trunc(sysdate)<=BAYXQ GROUP BY JGLX", nativeQuery = true)
 	public List<Object[]> tj_Aqpjjg();
 
 	/** 统计危险源和隐患排查备案情况 */
@@ -61,8 +61,8 @@ public interface GqnwxydjbabDao extends MyRepository<GqnwxydjbabEntity, Long> {
 			+ "   CASE WHEN T1.CNT IS NULL THEN 0 ELSE T1.CNT END AS WXY_COUNT,"
 			+ "   CASE WHEN T2.CNT IS NULL THEN 0 ELSE T2.CNT END AS YHPC_COUNT"
 			+ " FROM T_YJPT_GQ"
-			+ "   LEFT JOIN (SELECT GQ, COUNT(ID) AS CNT FROM T_YJPT_GQNWXYDJBAB WHERE GQ IS NOT NULL AND RECORD_STATUS<>9 GROUP BY GQ) T1 ON ID = T1.GQ"
-			+ "   LEFT JOIN (SELECT GQ, COUNT(ID) AS CNT FROM T_YJPT_ZDSGYHPCZGBA WHERE GQ IS NOT NULL AND RECORD_STATUS<>9 GROUP BY GQ) T2 ON ID = T2.GQ"
+			+ "   LEFT JOIN (SELECT GQ, COUNT(ID) AS CNT FROM T_YJPT_GQNWXYDJBAB WHERE GQ IS NOT NULL AND RECORD_STATUS<>9 AND trunc(sysdate)<=BAYXQ GROUP BY GQ) T1 ON ID = T1.GQ"
+			+ "   LEFT JOIN (SELECT GQ, COUNT(ID) AS CNT FROM T_YJPT_ZDSGYHPCZGBA WHERE GQ IS NOT NULL AND RECORD_STATUS<>9 AND trunc(sysdate)<=BAYXQ GROUP BY GQ) T2 ON ID = T2.GQ"
 			+ " WHERE SZD like ?1 AND RECORD_STATUS!=9 ORDER BY GQMC", nativeQuery = true)
 	public List<Object[]> tj_Wxy_Yhpc_Baqk(String string);
 
@@ -75,15 +75,15 @@ public interface GqnwxydjbabDao extends MyRepository<GqnwxydjbabEntity, Long> {
 			+ "   CASE WHEN T3.CNT IS NULL THEN 0 ELSE T3.CNT END AS PJBG_COUNT,"
 			+ "   CASE WHEN T4.CNT IS NULL THEN 0 ELSE T4.CNT END AS YJYA_COUNT"
 			+ " FROM T_YJPT_GQ"
-			+ "   LEFT JOIN (SELECT GQ, COUNT(ID) AS CNT FROM T_YJPT_GQNWXYDJBAB WHERE GQ IS NOT NULL AND RECORD_STATUS<>9 GROUP BY GQ) T1 ON ID = T1.GQ"
-			+ "   LEFT JOIN (SELECT GQ, COUNT(ID) AS CNT FROM T_YJPT_ZDSGYHPCZGBA WHERE GQ IS NOT NULL AND RECORD_STATUS<>9 GROUP BY GQ) T2 ON ID = T2.GQ"
-			+ "   LEFT JOIN (SELECT SZGQ as GQ, COUNT(ID) AS CNT FROM T_YJPT_AQXZPJBGBADJB WHERE SZGQ IS NOT NULL AND RECORD_STATUS<>9 GROUP BY SZGQ) T3 ON ID = T3.GQ"
-			+ "   LEFT JOIN (SELECT GQ, COUNT(ID) AS CNT FROM T_YJPT_YJYABA WHERE GQ IS NOT NULL AND RECORD_STATUS<>9 GROUP BY GQ) T4 ON ID = T4.GQ"
+			+ "   LEFT JOIN (SELECT GQ, COUNT(ID) AS CNT FROM T_YJPT_GQNWXYDJBAB WHERE GQ IS NOT NULL AND RECORD_STATUS<>9 AND trunc(sysdate)<=BAYXQ GROUP BY GQ) T1 ON ID = T1.GQ"
+			+ "   LEFT JOIN (SELECT GQ, COUNT(ID) AS CNT FROM T_YJPT_ZDSGYHPCZGBA WHERE GQ IS NOT NULL AND RECORD_STATUS<>9 AND trunc(sysdate)<=BAYXQ GROUP BY GQ) T2 ON ID = T2.GQ"
+			+ "   LEFT JOIN (SELECT SZGQ as GQ, COUNT(ID) AS CNT FROM T_YJPT_AQXZPJBGBADJB WHERE SZGQ IS NOT NULL AND RECORD_STATUS<>9 AND trunc(sysdate)<=BAYXQ GROUP BY SZGQ) T3 ON ID = T3.GQ"
+			+ "   LEFT JOIN (SELECT GQ, COUNT(ID) AS CNT FROM T_YJPT_YJYABA WHERE GQ IS NOT NULL AND RECORD_STATUS<>9 AND trunc(sysdate)<=BAYXQ GROUP BY GQ) T4 ON ID = T4.GQ"
 			+ " WHERE SZD like ?1 AND RECORD_STATUS!=9 ORDER BY GQMC", nativeQuery = true)
 	public List<Object[]> tj_Wxy_Yhpc_Pjbg_Yjya_Baqk(String string);
 
 	/** 统计安全评价机构 */
-	@Query(value = "SELECT JGLX, COUNT(ID) FROM T_YJPT_GKAQPJJGSQBAB WHERE JGLX IS NOT NULL AND SZD like ?1  AND RECORD_STATUS<>9 GROUP BY JGLX", nativeQuery = true)
+	@Query(value = "SELECT JGLX, COUNT(ID) FROM T_YJPT_GKAQPJJGSQBAB WHERE JGLX IS NOT NULL AND SZD like ?1  AND RECORD_STATUS<>9 AND trunc(sysdate)<=BAYXQ GROUP BY JGLX", nativeQuery = true)
 	public List<Object[]> tj_Aqpjjg(String string);
 
 	@Query(value = "SELECT"

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/dao/check/ZcDao.java

@@ -24,10 +24,10 @@ public interface ZcDao extends MyRepository<ZcEntity, Long> {
 	@Query(value = "SELECT G.GQMC,"
 			+ " SUM(Z.CCYHS)/(CASE WHEN COUNT(Z.ID)=0 THEN 1 ELSE COUNT(Z.ID)/COUNT(DISTINCT(Z.ID)) END),"
 			+ " COUNT(DISTINCT(D.ID)) " + " FROM T_YJPT_GQ G "
-			+ " LEFT JOIN T_YJPT_ZC Z ON G.ID=Z.SZGQ AND Z.RECORD_STATUS!=9"
-			+ " LEFT JOIN T_YJPT_DC D ON G.ID=D.SZGQ AND D.RECORD_STATUS!=9"
+			+ " LEFT JOIN T_YJPT_ZC Z ON G.ID=Z.SZGQ AND Z.RECORD_STATUS!=9 AND TO_CHAR(SYSDATE,:TYPE)=TO_CHAR(Z.ADD_DATE,?2) "
+			+ " LEFT JOIN T_YJPT_DC D ON G.ID=D.SZGQ AND D.RECORD_STATUS!=9 AND TO_CHAR(SYSDATE,:TYPE)=TO_CHAR(D.ADD_DATE,?2) "
 			+ " WHERE G.SZD like ?1 AND G.RECORD_STATUS!=9 GROUP BY G.GQMC ORDER BY G.GQMC", nativeQuery = true)
-	public List<Object[]> countZcdc(String szd);
+	public List<Object[]> countZcdc(String szd,String type);
 
 	/**
 	 * 自查督查数量统计（省级）
@@ -37,10 +37,10 @@ public interface ZcDao extends MyRepository<ZcEntity, Long> {
 	@Query(value = "SELECT G.MC,"+
        "SUM(Z.CCYHS)/(CASE WHEN COUNT(Z.ID)=0 THEN 1 ELSE COUNT(Z.ID)/COUNT(DISTINCT(Z.ID)) END),"+
        "COUNT(DISTINCT(D.ID))  FROM T_YJPT_GGDM G "+
-       "LEFT JOIN T_YJPT_ZC Z ON G.ID=substr(Z.SZD,0,5) AND Z.RECORD_STATUS!=9 " +
-       "LEFT JOIN T_YJPT_DC D ON G.ID=substr(D.SZD,0,5) AND D.RECORD_STATUS!=9 "+
+       "LEFT JOIN T_YJPT_ZC Z ON G.ID=substr(Z.SZD,0,5) AND Z.RECORD_STATUS!=9 AND TO_CHAR(SYSDATE,:TYPE)=TO_CHAR(Z.ADD_DATE,:TYPE) " +
+       "LEFT JOIN T_YJPT_DC D ON G.ID=substr(D.SZD,0,5) AND D.RECORD_STATUS!=9 AND TO_CHAR(SYSDATE,:TYPE)=TO_CHAR(D.ADD_DATE,:TYPE) "+
       "WHERE G.GROUPCODE='SZD' and g.fid =900 GROUP BY G.MC,G.ID,g.px ORDER BY G.PX", nativeQuery = true)
-	public List<Object[]> countZcdc();
+	public List<Object[]> countZcdc(@Param("TYPE") String type);
 
 	/**
 	 * 重大隐患数量统计（省级）

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/dao/jsxmaqsc/GkjsxmaqscDao.java

@@ -1,9 +1,9 @@
 package com.jtgh.yjpt.dao.jsxmaqsc;
 
+import java.util.Date;
 import java.util.List;
 
 import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
 
 import com.jtgh.yjpt.dao.common.MyRepository;
 import com.jtgh.yjpt.entity.jsxmaqtjsc.GkjsxmaqscEntity;
@@ -34,16 +34,15 @@ public interface GkjsxmaqscDao extends MyRepository<GkjsxmaqscEntity, Long> {
 	public List<Object[]> countByXmlb(Long szd, Long gq);
 
 	@Query(value = " select g.mc,x.a from t_yjpt_ggdm g left join (select substr(A.Szd,0,5)szdid,count(A.id)a " +
-			"from T_YJPT_JSXMAQSC A where A.RECORD_STATUS!=9 AND TO_CHAR(SYSDATE,:TYPE)=TO_CHAR(A.ADD_DATE,:TYPE) " +
+			"from T_YJPT_JSXMAQSC A where A.RECORD_STATUS!=9 AND ?1<=A.ADD_DATE AND A.ADD_DATE<=?2 " +
 			"group by substr(A.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[]> countSp(@Param("TYPE") String type);
+	public List<Object[]> countSp(Date ks,Date js);
 
 	@Query(value = "SELECT G.GQMC,COUNT(J.ID) "
 			+ " FROM T_YJPT_GQ G "
 			+ " LEFT JOIN T_YJPT_JSXMAQSC J "
-			+ " ON J.SZGQ=G.ID AND  J.RECORD_STATUS!=9 AND TO_CHAR(SYSDATE,?2)=TO_CHAR(J.ADD_DATE,?2)"
+			+ " ON J.SZGQ=G.ID AND  J.RECORD_STATUS!=9 AND ?2<=A.ADD_DATE AND A.ADD_DATE<=?3 "
 			+ " WHERE G.RECORD_STATUS!=9 AND G.SZD like ?1  " + " GROUP BY G.GQMC ORDER BY G.GQMC", nativeQuery = true)
-	public List<Object[]> countSp( String string,
-			String type);
+	public List<Object[]> countSp(String szd,Date ks,Date js);
 
 }

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

@@ -311,7 +311,7 @@ public interface JyrDao extends MyRepository<JyrEntity, Long> {
 			+ "UNION ALL  "
 			+ " SELECT COUNT(*) FROM T_YJPT_JYRJCXX T WHERE T.RECORD_STATUS<> 9 AND (T.SZD like ?1 OR ?1 is null) AND T.SFWHQY<>'N' AND T.GKJYXKZH IS NOT NULL "
 			+ " UNION ALL "
-			+ " SELECT COUNT(*) FROM T_YJPT_JYRJCXX T WHERE T.RECORD_STATUS<> 9 AND (T.SZD like ?1 OR ?1 is null) AND T.SFWHQY<>'N' AND T.GKWXHWZYFZBH IS NOT NULL "
+			+ "SELECT COUNT(*) FROM T_YJPT_GKWXHWZYFZBL_FZ B LEFT JOIN T_YJPT_GKWXHWZYFZBLHHZ A ON B.FZSQ = A.ID WHERE B.RECORD_STATUS!=9 AND B.FZCSBH IS NOT NULL AND A.RECORD_STATUS=2 AND trunc(sysdate)>=A.YXQKSSJ and trunc(sysdate)<=A.YXQJSSJ AND (A.SZD like ?1 OR ?1 is null) "//" SELECT COUNT(*) FROM T_YJPT_JYRJCXX T WHERE T.RECORD_STATUS<> 9 AND (T.SZD like ?1 OR ?1 is null) AND T.SFWHQY<>'N' AND T.GKWXHWZYFZBH IS NOT NULL "
 			+ "  UNION ALL "
 			+ " SELECT SUM(T.RS) FROM T_YJPT_JYRJCXX T WHERE T.RECORD_STATUS<> 9 AND (T.SZD like ?1 OR ?1 is null) AND T.SFWHQY<>'N' "
 			+ " UNION ALL "
@@ -511,5 +511,24 @@ public interface JyrDao extends MyRepository<JyrEntity, Long> {
 	@Query(value="SELECT * FROM T_YJPT_JYRJCXX J WHERE J.ID IN "
 	+" (SELECT V.QYMC FROM T_YJPT_GG_VIEW V WHERE V.RECORD_STATUS<>9 AND V.SFKJ='Y' AND V.GGID=?1)",nativeQuery=true)
 	public List<JyrEntity> findByGg(Long ggid);
-
+	
+	/**
+	 * 重大危险源单元个数统计
+	 */
+	@Query(value="SELECT SUM(C.DANGER_SRC_UNIT_NUM),G.GQMC  FROM T_YJPT_GQ G " +
+			"LEFT JOIN T_YJPT_JYRJCXX C ON C.SZGQ=G.ID AND C.RECORD_STATUS!=9 " +
+			"WHERE G.SZD like ?1  AND G.RECORD_STATUS!=9 GROUP BY G.GQMC ORDER BY G.GQMC ",
+			nativeQuery=true)
+	public List<Object[]> countDangerSrcUnit(String szd);
+	
+	/**
+	 * 重大危险源单元个数统计
+	 */
+	@Query(value="SELECT Y.N,G.MC FROM T_YJPT_GGDM G LEFT JOIN (select SUM(DANGER_SRC_UNIT_NUM)N,substr(SZD,0,5)SZD from T_YJPT_JYRJCXX " +
+			"WHERE RECORD_STATUS!=9 GROUP BY substr(SZD,0,5)) Y ON Y.SZD=G.ID WHERE G.GROUPCODE='SZD' AND G.FID=900 ORDER BY G.PX ",
+			nativeQuery=true)
+	public List<Object[]> countDangerSrcUnit();
+	
+	
+	
 }

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

@@ -39,16 +39,16 @@ public interface GkwxhwzyfzblhhzbDao extends
 
 	@Query(value = "select g.mc,x.a from t_yjpt_ggdm g left join (select substr(A.Szd,0,5)szdid,"
 			+ "count(A.id)a from T_YJPT_GKWXHWZYFZBLHHZ A where A.RECORD_STATUS!=9 "
-			+ "AND TO_CHAR(SYSDATE,:TYPE)=TO_CHAR(A.ADD_DATE,:TYPE) "
+			+ " AND ?1<=A.ADD_DATE AND A.ADD_DATE<=?2 "
 			+ "group by substr(A.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[]> countSp(@Param("TYPE") String type);
+	public List<Object[]> countSp(Date ks,Date js);
 
 	@Query(value = "SELECT G.GQMC,COUNT(A.ID) "
 			+ " FROM T_YJPT_GQ G "
 			+ " LEFT JOIN T_YJPT_GKWXHWZYFZBLHHZ A "
-			+ " ON A.SSGQ=G.ID AND A.RECORD_STATUS!=9 AND TO_CHAR(SYSDATE,?2)=TO_CHAR(A.ADD_DATE,?2)"
+			+ " ON A.SSGQ=G.ID AND A.RECORD_STATUS!=9 AND ?2<=A.ADD_DATE AND A.ADD_DATE<=?3 "
 			+ " WHERE G.RECORD_STATUS!=9 AND  G.SZD like ?1  " + " GROUP BY G.GQMC ORDER BY G.GQMC", nativeQuery = true)
-	public List<Object[]> countSp(String string, String type);
+	public List<Object[]> countSp(String szd,Date ks,Date js);
 
 	@Query(value="select * from T_YJPT_GKWXHWZYFZBLHHZ where add_date>=?1 and add_date<=?2 and rownum<=200",nativeQuery=true)
 	public List<GkwxhwzyfzblhhzEntity> query(Timestamp kssj, Timestamp jssj);
@@ -63,6 +63,69 @@ public interface GkwxhwzyfzblhhzbDao extends
 	@Query(value="select count(1) from T_YJPT_GKWXHWZYFZBLHHZ h where record_status=2 and h.yxqjssj is not null and h.yxqjssj<?1",nativeQuery=true)
 	public String count2(Date day);
 	
+	@Query(value="SELECT COUNT(*)  FROM ( select count(*) from T_YJPT_GKWXHWZYFZBLHHZ h where  record_status=2 and SZD like ?1 AND YXQKSSJ<=TRUNC(SYSDATE) AND YXQJSSJ>=TRUNC(SYSDATE) group by JYR)",nativeQuery=true)
+	public List<Object[]> countValidFz(String szd);
+	@Query(value="SELECT COUNT(*)  FROM ( select count(*) from T_YJPT_GKWXHWZYFZBLHHZ h where  record_status=2 and SZD like ?1 and SSGQ=?2 AND YXQKSSJ<=TRUNC(SYSDATE) AND YXQJSSJ>=TRUNC(SYSDATE) group by JYR)",nativeQuery=true)
+	public List<Object[]> countValidFz_1(String szd,long gq);
+	@Query(value="SELECT COUNT(*)  FROM ( select count(*) from T_YJPT_GKWXHWZYFZBLHHZ h where  record_status=2 and SZD like ?1 and WHDJ=?2 AND YXQKSSJ<=TRUNC(SYSDATE) AND YXQJSSJ>=TRUNC(SYSDATE) group by JYR)",nativeQuery=true)
+	public List<Object[]> countValidFz_2(String szd,long whdj);
+	@Query(value="SELECT COUNT(*)  FROM ( select count(*) from T_YJPT_GKWXHWZYFZBLHHZ h where  record_status=2 and SZD like ?1 and SSGQ=?2 and WHDJ=?3 AND YXQKSSJ<=TRUNC(SYSDATE) AND YXQJSSJ>=TRUNC(SYSDATE) group by JYR)",nativeQuery=true)
+	public List<Object[]> countValidFz(String szd,long gq,long whdj);
+	
+	
+	
+	@Query(value=" select count(*) from (SELECT A.JYR,B.GKJYR,B.QYXZ FROM  (select  distinct(JYR) JYR from T_YJPT_GKWXHWZYFZBLHHZ h where" +
+			"  record_status=2 and SZD like ?1 AND YXQKSSJ<=TRUNC(SYSDATE) AND YXQJSSJ>=TRUNC(SYSDATE)) A " +
+			"LEFT JOIN T_YJPT_JYRJCXX B ON A.JYR=B.ID) C WHERE SUBSTR(C.QYXZ,1,1)='Y' ",nativeQuery=true)
+	public List<Object[]> countValidFzJyr_Mt(String szd);
+	@Query(value=" select count(*) from (SELECT A.JYR,B.GKJYR,B.QYXZ FROM  (select  distinct(JYR) JYR from T_YJPT_GKWXHWZYFZBLHHZ h where" +
+			"  record_status=2 and SZD like ?1 and SSGQ=?2 AND YXQKSSJ<=TRUNC(SYSDATE) AND YXQJSSJ>=TRUNC(SYSDATE)) A " +
+			"LEFT JOIN T_YJPT_JYRJCXX B ON A.JYR=B.ID) C WHERE SUBSTR(C.QYXZ,1,1)='Y' ",nativeQuery=true)
+	public List<Object[]> countValidFzJyr_Mt_1(String szd,long gq);
+	@Query(value=" select count(*) from (SELECT A.JYR,B.GKJYR,B.QYXZ FROM  (select  distinct(JYR) JYR from T_YJPT_GKWXHWZYFZBLHHZ h where" +
+			"  record_status=2 and SZD like ?1 and WHDJ=?2 AND YXQKSSJ<=TRUNC(SYSDATE) AND YXQJSSJ>=TRUNC(SYSDATE)) A " +
+			"LEFT JOIN T_YJPT_JYRJCXX B ON A.JYR=B.ID) C WHERE SUBSTR(C.QYXZ,1,1)='Y' ",nativeQuery=true)
+	public List<Object[]> countValidFzJyr_Mt_2(String szd,long whdj);
+	@Query(value=" select count(*) from (SELECT A.JYR,B.GKJYR,B.QYXZ FROM  (select  distinct(JYR) JYR from T_YJPT_GKWXHWZYFZBLHHZ h where" +
+			"  record_status=2 and SZD like ?1 and SSGQ=?2 and WHDJ=?3 AND YXQKSSJ<=TRUNC(SYSDATE) AND YXQJSSJ>=TRUNC(SYSDATE)) A " +
+			"LEFT JOIN T_YJPT_JYRJCXX B ON A.JYR=B.ID) C WHERE SUBSTR(C.QYXZ,1,1)='Y' ",nativeQuery=true)
+	public List<Object[]> countValidFzJyr_Mt(String szd,long gq,long whdj);
+	
+	@Query(value=" select count(*) from (SELECT A.JYR,B.GKJYR,B.QYXZ FROM  (select  distinct(JYR) JYR from T_YJPT_GKWXHWZYFZBLHHZ h where" +
+			"  record_status=2 and SZD like ?1 AND YXQKSSJ<=TRUNC(SYSDATE) AND YXQJSSJ>=TRUNC(SYSDATE)) A " +
+			"LEFT JOIN T_YJPT_JYRJCXX B ON A.JYR=B.ID) C WHERE SUBSTR(C.QYXZ,3,1)='Y' ",nativeQuery=true)
+	public List<Object[]> countValidFzJyr_MtJzx(String szd);
+	@Query(value=" select count(*) from (SELECT A.JYR,B.GKJYR,B.QYXZ FROM  (select  distinct(JYR) JYR from T_YJPT_GKWXHWZYFZBLHHZ h where" +
+			"  record_status=2 and SZD like ?1 and SSGQ=?2 AND YXQKSSJ<=TRUNC(SYSDATE) AND YXQJSSJ>=TRUNC(SYSDATE)) A " +
+			"LEFT JOIN T_YJPT_JYRJCXX B ON A.JYR=B.ID) C WHERE SUBSTR(C.QYXZ,3,1)='Y' ",nativeQuery=true)
+	public List<Object[]> countValidFzJyr_MtJzx_1(String szd,long gq);
+	@Query(value=" select count(*) from (SELECT A.JYR,B.GKJYR,B.QYXZ FROM  (select  distinct(JYR) JYR from T_YJPT_GKWXHWZYFZBLHHZ h where" +
+			"  record_status=2 and SZD like ?1 and WHDJ=?2 AND YXQKSSJ<=TRUNC(SYSDATE) AND YXQJSSJ>=TRUNC(SYSDATE)) A " +
+			"LEFT JOIN T_YJPT_JYRJCXX B ON A.JYR=B.ID) C WHERE SUBSTR(C.QYXZ,3,1)='Y' ",nativeQuery=true)
+	public List<Object[]> countValidFzJyr_MtJzx_2(String szd,long whdj);
+	@Query(value=" select count(*) from (SELECT A.JYR,B.GKJYR,B.QYXZ FROM  (select  distinct(JYR) JYR from T_YJPT_GKWXHWZYFZBLHHZ h where" +
+			"  record_status=2 and SZD like ?1 and SSGQ=?2 and WHDJ=?3 AND YXQKSSJ<=TRUNC(SYSDATE) AND YXQJSSJ>=TRUNC(SYSDATE)) A " +
+			"LEFT JOIN T_YJPT_JYRJCXX B ON A.JYR=B.ID) C WHERE SUBSTR(C.QYXZ,3,1)='Y' ",nativeQuery=true)
+	public List<Object[]> countValidFzJyr_MtJzx(String szd,long gq,long whdj);
+	
+	@Query(value=" select count(*) from (SELECT A.JYR,B.GKJYR,B.QYXZ FROM  (select  distinct(JYR) JYR from T_YJPT_GKWXHWZYFZBLHHZ h where" +
+			"  record_status=2 and SZD like ?1 AND YXQKSSJ<=TRUNC(SYSDATE) AND YXQJSSJ>=TRUNC(SYSDATE)) A " +
+			"LEFT JOIN T_YJPT_JYRJCXX B ON A.JYR=B.ID) C WHERE SUBSTR(C.QYXZ,2,1)='Y' ",nativeQuery=true)
+	public List<Object[]> countValidFzJyr_Cc(String szd);
+	@Query(value=" select count(*) from (SELECT A.JYR,B.GKJYR,B.QYXZ FROM  (select  distinct(JYR) JYR from T_YJPT_GKWXHWZYFZBLHHZ h where" +
+			"  record_status=2 and SZD like ?1 and SSGQ=?2 AND YXQKSSJ<=TRUNC(SYSDATE) AND YXQJSSJ>=TRUNC(SYSDATE)) A " +
+			"LEFT JOIN T_YJPT_JYRJCXX B ON A.JYR=B.ID) C WHERE SUBSTR(C.QYXZ,2,1)='Y' ",nativeQuery=true)
+	public List<Object[]> countValidFzJyr_Cc_1(String szd,long gq);
+	@Query(value=" select count(*) from (SELECT A.JYR,B.GKJYR,B.QYXZ FROM  (select  distinct(JYR) JYR from T_YJPT_GKWXHWZYFZBLHHZ h where" +
+			"  record_status=2 and SZD like ?1 and WHDJ=?2 AND YXQKSSJ<=TRUNC(SYSDATE) AND YXQJSSJ>=TRUNC(SYSDATE)) A " +
+			"LEFT JOIN T_YJPT_JYRJCXX B ON A.JYR=B.ID) C WHERE SUBSTR(C.QYXZ,2,1)='Y' ",nativeQuery=true)
+	public List<Object[]> countValidFzJyr_Cc_2(String szd,long whdj);
+	@Query(value=" select count(*) from (SELECT A.JYR,B.GKJYR,B.QYXZ FROM  (select  distinct(JYR) JYR from T_YJPT_GKWXHWZYFZBLHHZ h where" +
+			"  record_status=2 and SZD like ?1 and SSGQ=?2 and WHDJ=?3 AND YXQKSSJ<=TRUNC(SYSDATE) AND YXQJSSJ>=TRUNC(SYSDATE)) A " +
+			"LEFT JOIN T_YJPT_JYRJCXX B ON A.JYR=B.ID) C WHERE SUBSTR(C.QYXZ,2,1)='Y' ",nativeQuery=true)
+	public List<Object[]> countValidFzJyr_Cc(String szd,long gq,long whdj);
+ 
+	
 	
 	//删除附证申请被退回的待办
 	//这里采取将处理人ID置空的方式

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/dao/zysqbp/ZysqbpDao.java

@@ -30,30 +30,30 @@ public interface ZysqbpDao extends MyRepository<ZysqbpEntity, Long> {
 
 	@Query(value = " select g.mc,x.a,x.b from t_yjpt_ggdm g left join (select substr(W.Szd,0,5)szdid,"
 			+ "count(w.id)a,sum(w.zysl)/10000 b from T_YJPT_WXHWGKZYSBD W where W.RECORD_STATUS!=9  "
-			+ "AND W.QXZYSJ IS NULL group by substr(W.Szd,0,5))x "
+			+ "AND W.QXZYSJ IS NULL AND ?1<=W.ADD_DATE AND W.ADD_DATE<=?2 group by substr(W.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[]> countSpZxl();
+	public List<Object[]> countSpZxl(Date ks,Date js);
 
 	@Query(value = "SELECT G.GQMC,COUNT(W.ID),SUM(W.ZYSL)/10000 "
 			+ " FROM T_YJPT_GQ G " + " LEFT JOIN T_YJPT_WXHWGKZYSBD W "
 			+ " ON W.SZGQ=G.ID AND W.RECORD_STATUS!=9 AND W.QXZYSJ IS NULL"
-			+ " WHERE  G.SZD like ?1 AND G.RECORD_STATUS!=9  "
+			+ " WHERE  G.SZD like ?1 AND G.RECORD_STATUS!=9 AND ?2<=W.ADD_DATE AND W.ADD_DATE<=?3 "
 			+ " GROUP BY G.GQMC ORDER BY G.GQMC", nativeQuery = true)
-	public List<Object[]> countSpZxl(String string);
+	public List<Object[]> countSpZxl(String SZD,Date ks,Date js);
 
 	@Query(value = " select g.mc,x.a from t_yjpt_ggdm g left join "
 			+ "(select substr(A.Szd,0,5)szdid,count(A.id)a from T_YJPT_WXHWGKZYSBD A where "
-			+ "A.RECORD_STATUS!=9  and A.QXZYSJ is null  AND TO_CHAR(SYSDATE,:TYPE)=TO_CHAR(A.ADD_DATE,:TYPE) "
+			+ "A.RECORD_STATUS!=9  and A.QXZYSJ is null  AND ?1<=A.ADD_DATE AND A.ADD_DATE<=?2 "
 			+ "group by substr(A.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[]> countSp(@Param("TYPE") String type);
+	public List<Object[]> countSp(Date ks,Date js);
 
 	@Query(value = "SELECT G.GQMC,COUNT(W.ID) "
 			+ " FROM T_YJPT_GQ G "
 			+ " LEFT JOIN T_YJPT_WXHWGKZYSBD W "
-			+ " ON W.SZGQ=G.ID AND  W.RECORD_STATUS!=9 AND W.QXZYSJ IS NULL AND TO_CHAR(SYSDATE,?2)=TO_CHAR(W.ADD_DATE,?2)"
+			+ " ON W.SZGQ=G.ID AND  W.RECORD_STATUS!=9 AND W.QXZYSJ IS NULL AND ?2<=W.ADD_DATE AND W.ADD_DATE<=?3 "
 			+ " WHERE G.RECORD_STATUS!=9 AND G.SZD like ?1  "
 			+ " GROUP BY G.GQMC ORDER BY G.GQMC", nativeQuery = true)
-	public List<Object[]> countSp(String string, String type);
+	public List<Object[]> countSp(String string,Date ks,Date js);
 
 	@Query(value = "SELECT"
 			+ " SUM(CASE WHEN TO_CHAR(W.ADD_DATE,'YYYY')=TO_CHAR(ADD_MONTHS(SYSDATE,-48),'YYYY') THEN W.ZYSL ELSE 0 END)/10000"

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/entity/check/DcEntity.java

@@ -14,6 +14,7 @@ import javax.persistence.Table;
 import javax.persistence.Transient;
 import javax.xml.bind.annotation.XmlTransient;
 
+import org.hibernate.annotations.Proxy;
 import org.hibernate.annotations.Where;
 import org.springframework.flex.remoting.RemotingExclude;
 
@@ -26,6 +27,7 @@ import com.jtgh.yjpt.entity.gg.GgEntity;
 import com.jtgh.yjpt.entity.gkgq.GqEntity;
 import com.jtgh.yjpt.entity.jyr.JyrEntity;
 
+@Proxy(lazy=false)
 @Entity
 @Table(name = "T_YJPT_DC")
 public class DcEntity extends BaseEntity<Long> implements Cloneable {

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/entity/jyr/JyrEntity.java

@@ -2,6 +2,7 @@ package com.jtgh.yjpt.entity.jyr;
 
 import java.util.Date;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.Id;
@@ -126,6 +127,17 @@ public class JyrEntity extends BaseEntity<Long> implements Cloneable {
 
 	/** 行政区划 */
 	private CodeEntity xzqh;
+	
+	private Integer dangerSrcUnitNum;
+
+	@Column(name = "DANGER_SRC_UNIT_NUM")
+	public Integer getDangerSrcUnitNum() {
+		return dangerSrcUnitNum;
+	}
+
+	public void setDangerSrcUnitNum(Integer dangerSrcUnitNum) {
+		this.dangerSrcUnitNum = dangerSrcUnitNum;
+	}
 
 	@ManyToOne(fetch = FetchType.EAGER, targetEntity = JyrEntity.class)
 	@JoinColumn(name = "parent_jyr_id")

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

@@ -104,5 +104,9 @@ public interface DcService extends BaseWorkFlowService {
 	public void xiafaToQy(DcEntity entity);
 
 	public Collection<DcEntity> findAll(Specification<DcEntity> spec);
+	
+	public List<DcEntity> findBySync();
+	
+	public List<DcEntity> findByZxjcId(Long id);
 
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/check/ZcService.java

@@ -48,7 +48,7 @@ public interface ZcService {
 
 	public void logicDelete(Long id);
 
-	public List<Map<String, Object>> countZcdc(Long szd);
+	public List<Map<String, Object>> countZcdc(Long szd,String type);
 
 	public List<Map<String, Object>> countZdyh(Long szd, String type);
 

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/impl/check/DcServiceImpl.java

@@ -607,5 +607,16 @@ public class DcServiceImpl extends BaseWorkFlowServiceImpl<DcEntity, Long>
 			e.printStackTrace();
 		}
 	}
+	
+	public List<DcEntity> findBySync(){
+		return dcDao.findBySync();
+	}
+	
+	
+	public List<DcEntity> findByZxjcId(Long id){
+		return dcDao.findByZxjcId(id);
+	}
+	
+	
 
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/impl/check/ZcServiceImpl.java

@@ -64,12 +64,12 @@ public class ZcServiceImpl extends BaseService<ZcEntity, Long> implements
 	}
 
 	@Override
-	public List<Map<String, Object>> countZcdc(Long szd) {
+	public List<Map<String, Object>> countZcdc(Long szd,String type) {
 		List<Object[]> res = null;
 		if (null == szd) {
-			res = zcDao.countZcdc();
+			res = zcDao.countZcdc(type);
 		} else {
-			res = zcDao.countZcdc(szd + "%");
+			res = zcDao.countZcdc(szd + "%",type);
 		}
 		List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
 		for (Iterator<Object[]> iterator = res.iterator(); iterator.hasNext();) {

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

@@ -561,19 +561,11 @@ public class JyrServiceImpl extends BaseService<JyrEntity, Long> implements
 		BusinessContext bc = new BusinessContext();
 		bc.setAttribute("dcList", jyrdcxxDao.findByQymc(entity));
 		bc.setAttribute("bwList", jyrbwxxDao.findByQymc(entity));
-		bc.setAttribute("ckList", jyrckxxDao.findBySsjyrAndRecordStatusNot(
-				entity, JyrEntity.RECORD_STATE_DELETE));
-		bc.setAttribute("cgList", cgDao.findByDwmcAndRecordStatusNot(entity,
-				JyrEntity.RECORD_STATE_DELETE));
-		bc.setAttribute("mtList", mtDao.findByJyrAndRecordStatusNot(entity,
-				JyrEntity.RECORD_STATE_DELETE));
-		bc.setAttribute("fzList", fzbDao
-				.findByJyrAndRecordStatusNotAndFzhzIsNull(entity,
-						JyrEntity.RECORD_STATE_DELETE));
-		bc.setAttribute(
-				"shxxList",
-				jyrShxxDao.findByGnmkAndSsid(Constants.GNMK_JYRJCXX,
-						entity.getId()));
+		bc.setAttribute("ckList", jyrckxxDao.findBySsjyrAndRecordStatusNot(entity, JyrEntity.RECORD_STATE_DELETE));
+		bc.setAttribute("cgList", cgDao.findByDwmcAndRecordStatusNot(entity,JyrEntity.RECORD_STATE_DELETE));
+		bc.setAttribute("mtList", mtDao.findByJyrAndRecordStatusNot(entity,JyrEntity.RECORD_STATE_DELETE));
+		bc.setAttribute("fzList", fzbDao.findByJyrAndRecordStatusNotAndFzhzIsNull(entity,JyrEntity.RECORD_STATE_DELETE));
+		bc.setAttribute("shxxList",jyrShxxDao.findByGnmkAndSsid(Constants.GNMK_JYRJCXX,entity.getId()));
 		return bc;
 	}
 
@@ -1184,4 +1176,12 @@ public class JyrServiceImpl extends BaseService<JyrEntity, Long> implements
 	public List<JyrEntity> findByGg(Long ggid) {
 		return jyrDao.findByGg(ggid);
 	}
+	
+	public List<Object[]> countDangerSrcUnit(){
+		return jyrDao.countDangerSrcUnit();
+	}
+	
+	public List<Object[]> countDangerSrcUnit(String szd){
+		return jyrDao.countDangerSrcUnit(szd);
+	}
 }

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

@@ -82,12 +82,19 @@ public class CgServiceImp extends BaseService<CgEntity, Long> implements
 	public List<Map<String, Object>> countYjgl(Long szd) {
 		List<Object[]> cg = null;
 		List<Object[]> sg = null;
+		List<Object[]> dangerSrcUnit = null;
 		if (null == szd) {
+			//省
 			cg = cgDao.countCg();
 			sg = sgalglDao.countSg();
+			//重大危险源单元个数统计
+			dangerSrcUnit = jyrService.countDangerSrcUnit();
 		} else {
+			//市
 			cg = cgDao.countCg(szd + "%");
 			sg = sgalglDao.countSg(szd + "%");
+			//重大危险源单元个数统计
+			dangerSrcUnit = jyrService.countDangerSrcUnit(szd + "%");
 		}
 		int length = cg.size();
 		List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
@@ -98,6 +105,7 @@ public class CgServiceImp extends BaseService<CgEntity, Long> implements
 			row.put("GSNUM", null == cg.get(i)[2] ? 0 : cg.get(i)[2]);
 			row.put("SGNUM", sg.get(i)[1]);
 			row.put("SWNUM", null == sg.get(i)[2] ? 0 : sg.get(i)[2]);
+			row.put("DangerSrcUnit",null == dangerSrcUnit.get(i)[0] ? 0 : dangerSrcUnit.get(i)[0]);
 			list.add(row);
 		}
 		return list;

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

@@ -50,7 +50,9 @@ import com.jtgh.yjpt.entity.BaseEntity;
 import com.jtgh.yjpt.entity.auth.UserEntity;
 import com.jtgh.yjpt.entity.common.AccessoryEntity;
 import com.jtgh.yjpt.entity.common.BlobEntity;
+import com.jtgh.yjpt.entity.common.CodeEntity;
 import com.jtgh.yjpt.entity.common.TaskInfoEntity;
+import com.jtgh.yjpt.entity.gkgq.GqEntity;
 import com.jtgh.yjpt.entity.jlrxxgl.GlzdxxEntity;
 import com.jtgh.yjpt.entity.jyr.BwEntity;
 import com.jtgh.yjpt.entity.jyr.JyrEntity;
@@ -689,10 +691,69 @@ public class GkwxhwzyfzblhhzServiceImpl extends
 		} else {
 			return gkwxhwzyfzblhhzDao.count2(Utils.getDateFirstTime(new Date()));
 		}
+	}
+
+	public Map<String,String> countValidFz(CodeEntity szd,GqEntity gq,CodeEntity whdj){
+		String szdStr = szd.getId()+"%";
+		Map<String,String> rtnMap = new HashMap<String,String>();
+		List<Object[]> fz,mt,mtJzx,Cc;
+		if(gq==null && whdj == null){
+			fz = gkwxhwzyfzblhhzDao.countValidFz(szdStr);
+			mt = gkwxhwzyfzblhhzDao.countValidFzJyr_Mt(szdStr);
+			mtJzx = gkwxhwzyfzblhhzDao.countValidFzJyr_MtJzx(szdStr);
+			Cc = gkwxhwzyfzblhhzDao.countValidFzJyr_Cc(szdStr);
+		}
+		else if(gq==null && whdj !=null){
+			fz = gkwxhwzyfzblhhzDao.countValidFz_2(szdStr,whdj.getId());
+			mt = gkwxhwzyfzblhhzDao.countValidFzJyr_Mt_2(szdStr,whdj.getId());
+			mtJzx = gkwxhwzyfzblhhzDao.countValidFzJyr_MtJzx_2(szdStr,whdj.getId());
+			Cc = gkwxhwzyfzblhhzDao.countValidFzJyr_Cc_2(szdStr,whdj.getId());
+		}
+		else if(gq!=null && whdj==null){
+			fz = gkwxhwzyfzblhhzDao.countValidFz_1(szdStr,gq.getId());
+			mt = gkwxhwzyfzblhhzDao.countValidFzJyr_Mt_1(szdStr,gq.getId());
+			mtJzx = gkwxhwzyfzblhhzDao.countValidFzJyr_MtJzx_1(szdStr,gq.getId());
+			Cc = gkwxhwzyfzblhhzDao.countValidFzJyr_Cc_1(szdStr,gq.getId());
+		}
+		else{
+			fz = gkwxhwzyfzblhhzDao.countValidFz(szdStr,gq.getId(),whdj.getId());
+			mt = gkwxhwzyfzblhhzDao.countValidFzJyr_Mt(szdStr,gq.getId(),whdj.getId());
+			mtJzx = gkwxhwzyfzblhhzDao.countValidFzJyr_MtJzx(szdStr,gq.getId(),whdj.getId());
+			Cc = gkwxhwzyfzblhhzDao.countValidFzJyr_Cc(szdStr,gq.getId(),whdj.getId());
+		}
+		
+		
+		if(fz!=null){
+			rtnMap.put("fz", String.valueOf(fz.get(0)));
+		}
+		else{
+			rtnMap.put("fz", "0");
+		}
 		
+		if(mt!=null){
+			rtnMap.put("mt", String.valueOf(mt.get(0)));
+		}
+		else{
+			rtnMap.put("mt","0");
+		}
 		
+		if(mtJzx!=null){
+			rtnMap.put("mtJzx", String.valueOf(mtJzx.get(0)));
+		}
+		else{
+			rtnMap.put("mtJzx", "0");
+		}
+		
+		if(Cc!=null){
+			rtnMap.put("cc", String.valueOf(Cc.get(0)));
+		}
+		else{
+			rtnMap.put("cc","0");
+		}
+		return rtnMap;
 	}
 	
+	
 	//通过BYZD1 附证办理编号找到附证申请信息
 	public List<GkwxhwzyfzblhhzEntity> findByByzd1(String bh){
 		return gkwxhwzyfzblhhzDao.findByByzd1(bh);

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/impl/zysqbp/ZysqbpServiceImpl.java

@@ -123,13 +123,13 @@ public class ZysqbpServiceImpl extends
 	}
 
 	@Override
-	public List<Map<String, Object>> countSpZxl(Long szd) {
+	public List<Map<String, Object>> countSpZxl(Long szd,Date ks,Date js) {
 		List<Object[]> res;
 		List<Map<String, Object>> data = new ArrayList<Map<String, Object>>();
 		if (null == szd) {
-			res = zysqbpDao.countSpZxl();
+			res = zysqbpDao.countSpZxl(ks,js);
 		} else {
-			res = zysqbpDao.countSpZxl(szd + "%");
+			res = zysqbpDao.countSpZxl(szd + "%",ks,js);
 		}
 		for (Iterator<Object[]> iterator = res.iterator(); iterator.hasNext();) {
 			Object[] objects = iterator.next();
@@ -143,22 +143,22 @@ public class ZysqbpServiceImpl extends
 	}
 
 	@Override
-	public List<Map<String, Object>> countSp(Long szd, String type) {
+	public List<Map<String, Object>> countSp(Long szd,Date ks,Date js) {
 		List<Object[]> ss;
 		List<Object[]> fz;
 		List<Object[]> xm;
 		List<Object[]> zy;
 		List<Map<String, Object>> data = new ArrayList<Map<String, Object>>();
 		if (null == szd) {
-			ss = aqsszxysDao.countSp(type);
-			fz = gkwxhwzyfzDao.countSp(type);
-			xm = gkjsxmaqscDao.countSp(type);
-			zy = zysqbpDao.countSp(type);
+			ss = aqsszxysDao.countSp(ks,js);
+			fz = gkwxhwzyfzDao.countSp(ks,js);
+			xm = gkjsxmaqscDao.countSp(ks,js);
+			zy = zysqbpDao.countSp(ks,js);
 		} else {
-			ss = aqsszxysDao.countSp(szd + "%", type);
-			fz = gkwxhwzyfzDao.countSp(szd + "%", type);
-			xm = gkjsxmaqscDao.countSp(szd + "%", type);
-			zy = zysqbpDao.countSp(szd + "%", type);
+			ss = aqsszxysDao.countSp(szd + "%", ks,js);
+			fz = gkwxhwzyfzDao.countSp(szd + "%", ks,js);
+			xm = gkjsxmaqscDao.countSp(szd + "%", ks,js);
+			zy = zysqbpDao.countSp(szd + "%", ks,js);
 		}
 		int len = ss.size();
 		for (int i = 0; i < len; i++) {
@@ -517,6 +517,11 @@ public class ZysqbpServiceImpl extends
 		}
 		return returnList;
 	}
+	
+	
+	
+	
+	
 
 	public List<ZysqbpCountEntity> findTtlList(Long szd, Date bgsj1,
 			Date bgsj2, Date kgsj1, Date kgsj2, Date wgsj1, Date wgsj2,
@@ -2154,6 +2159,72 @@ public class ZysqbpServiceImpl extends
 		}
 		return bc;
 	}
+	
+	
+	
+	/**
+	 * 
+	 */
+	public List<Object[]> hzTj(Date bgsj1,
+			Date bgsj2, Date kgsj1, Date kgsj2, Date wgsj1, Date wgsj2,
+			String hzName, Boolean ttlOrTeu){
+		
+		String kgsj = null;
+		String wgsj = null;
+		Calendar c1 = Calendar.getInstance();
+		c1.set(Calendar.YEAR, 1900);
+		Calendar c2 = Calendar.getInstance();
+		c2.setTime(new Date());
+		c2.set(Calendar.HOUR_OF_DAY, 0);
+		c2.set(Calendar.MINUTE, 0);
+		c2.set(Calendar.SECOND, 0);
+		c2.set(Calendar.MILLISECOND, 0);
+		c2.add(Calendar.DATE, 1);
+		if (bgsj1 == null) {
+			bgsj1 = c1.getTime();
+		}
+		if (kgsj1 == null) {
+			kgsj1 = c1.getTime();
+		} else {
+			kgsj = "1";
+		}
+		if (wgsj1 == null) {
+			wgsj1 = c1.getTime();
+		} else {
+			wgsj = "1";
+		}
+		if (bgsj2 == null) {
+			bgsj2 = c2.getTime();
+		} else {
+			bgsj2 = DateUtil.addDate(bgsj2, 1);
+		}
+		if (kgsj2 == null) {
+			kgsj2 = c2.getTime();
+		} else {
+			kgsj = "1";
+			kgsj2 = DateUtil.addDate(kgsj2, 1);
+		}
+		if (wgsj2 == null) {
+			wgsj2 = c2.getTime();
+		} else {
+			wgsj = "1";
+			wgsj2 = DateUtil.addDate(wgsj2, 1);
+		}
+		
+		
+		// 查询吞吐量前n的货物
+		List<Object[]> ttlList = null;
+		if (ttlOrTeu)
+			ttlList = zysqbpDao.findTopTttlAndbasj(
+					Constants.SZD_ID_PROVINCE + "%", bgsj1, bgsj2, kgsj1,
+					kgsj2, wgsj1, wgsj2, kgsj, wgsj, 20, hzName);
+		else
+			ttlList = zysqbpDao.findTopAndbasjContainer(
+					Constants.SZD_ID_PROVINCE + "%", bgsj1, bgsj2, kgsj1,
+					kgsj2, wgsj1, wgsj2, kgsj, wgsj, 20, hzName);
+	    return ttlList;
+	}
+	
 
 	@Override
 	public ZysqbpGatherEntity gatherImformattion(Long szd) {

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

@@ -290,4 +290,8 @@ public interface JyrService {
 	
 	public List<JyrEntity> findByGg(Long ggid);
 	
+	public List<Object[]> countDangerSrcUnit();	
+	
+	public List<Object[]> countDangerSrcUnit(String szd);
+	
 }

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

@@ -9,6 +9,7 @@ import java.sql.Timestamp;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -17,6 +18,8 @@ import org.springframework.data.jpa.domain.Specification;
 
 import com.jtgh.yjpt.client.zyfzbl.ZyfzblWebService;
 import com.jtgh.yjpt.entity.auth.UserEntity;
+import com.jtgh.yjpt.entity.common.CodeEntity;
+import com.jtgh.yjpt.entity.gkgq.GqEntity;
 import com.jtgh.yjpt.entity.jlrxxgl.GlzdxxEntity;
 import com.jtgh.yjpt.entity.jyr.JyrEntity;
 import com.jtgh.yjpt.entity.jyrxxgl.RyjbxxEntity;
@@ -116,6 +119,8 @@ public interface GkwxhwzyfzblhhzService extends BaseWorkFlowService {
 
 	public String countFz(boolean flag);
 	
+	public Map<String,String> countValidFz(CodeEntity szd,GqEntity gq,CodeEntity whdj);
+	
 	//通过BYZD1 附证办理编号找到附证申请信息
 	public List<GkwxhwzyfzblhhzEntity> findByByzd1(String bh);
 	

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/zysqbp/ZysqbpService.java

@@ -41,9 +41,9 @@ public interface ZysqbpService extends BaseWorkFlowService {
 
 	public List<Map<String, Object>> countDetailData(String select);
 
-	public List<Map<String, Object>> countSpZxl(Long szd);
+	public List<Map<String, Object>> countSpZxl(Long szd,Date ks,Date js);
 
-	public List<Map<String, Object>> countSp(Long szd, String type);
+	public List<Map<String, Object>> countSp(Long szd,Date ks,Date js);
 
 	public List<Map<String, Object>> countZxlqs(Long szd, String type);
 
@@ -381,4 +381,8 @@ public interface ZysqbpService extends BaseWorkFlowService {
 	public String findDataMenu(String type);
 	
 	public String findRcharMenu(Long num, String type);
+	
+	public List<Object[]> hzTj(Date bgsj1,
+			Date bgsj2, Date kgsj1, Date kgsj2, Date wgsj1, Date wgsj2,
+			String hzName, Boolean ttlOrTeu);
 }

gkaq/yjpt-java/trunk/resources/spring/application.properties

@@ -1,18 +1,17 @@
 #***************************************  jdbc info  ********************************************#
 jdbc.driver                 = oracle.jdbc.driver.OracleDriver
 jdbc.url                      = jdbc:oracle:thin:@192.168.57.36:1521:orcl
-jdbc.username           = yjptzj
+jdbc.username           = yjptpro
 jdbc.password            = yjpt
 hibernate.dialect        = org.hibernate.dialect.Oracle10gDialect
 #********************************** qlyg jdbc info**********************************************#
-jdbc.qlyg.url               = jdbc:oracle:thin:@192.168.57.36:1521:orcl
+jdbc.qlyg.url               = jdbc:oracle:thin:@10.1.30.104:1521:JTTJJC
 jdbc.qlyg.username    = jsgk
 jdbc.qlyg.password     = jsgk
 #********************************** xzzx jdbc info**********************************************#
-jdbc.xzzx.url               = jdbc:oracle:thin:@192.168.57.36:1521:orcl
-jdbc.xzzx.username    = xzzx
-jdbc.xzzx.password     = xzzx
-
+jdbc.xzzx.url               = 
+jdbc.xzzx.username    =  
+jdbc.xzzx.password     =  
 #dbcp settings
 dbcp.maxIdle=30
 dbcp.minIdle=5
@@ -22,12 +21,10 @@ hibernate.hbm2ddl.auto=
 
 
 # local WebService
-web.service.url=192.168.57.76
+web.service.url=localhost
 web.service.port=8089
 
 # Province WebService 
-web.province.service.url=192.168.57.71
-web.province.service.port=8089
 
 #\u4f5c\u4e1a\u7533\u62a5\uff0c\u95f4\u9694\u7684\u65f6\u95f4\uff0c\u5fc5\u987b\u5b8c\u6210
 zysb.time=7

gkaq/yjpt-java/trunk/resources/sql/init/9.update.sql.ftl

@@ -8615,3 +8615,8 @@ COMMENT ON COLUMN T_YJPT_WXHWGKZYSBD.FR IS '完工报填报人FinishReport';
 INSERT INTO T_YJPT_GGDM(ID,CODE,PX,MC,RECORD_STATUS,BZ) VALUES(10000510,'FJSSLX',34,'T_YJPT_FZSQ',1,'港口危险作业附证,一个作业地点一个证');
 </#if>
 
+<#if versionDate?date("yyyyMMdd") lt "20161206"?date("yyyyMMdd")>
+ALTER TABLE T_YJPT_JYRJCXX ADD DANGER_SRC_UNIT_NUM NUMBER;
+COMMENT ON COLUMN T_YJPT_JYRJCXX.DANGER_SRC_UNIT_NUM IS '重大危险源单元';
+</#if>
+

gkaq/yjpt-java/trunk/yjpt/WEB-INF/web.xml

@@ -12,22 +12,22 @@
 	<context-param>
 		<description>0:省级;1:市级</description>
 		<param-name>deploy_mode</param-name>
-		<param-value>1</param-value>
+		<param-value>0</param-value>
 	</context-param>
 	<context-param>
 		<description>区域代码</description>
 		<param-name>city_code</param-name>
-		<param-value>90011</param-value>
+		<param-value>900</param-value>
 	</context-param>
 	<context-param>
 		<description>是否使用地图资源系统(Y/N)</description>
 		<param-name>open_map</param-name>
-		<param-value>N</param-value>
+		<param-value>Y</param-value>
 	</context-param>
 	<context-param>
 		<description>是否与权力阳光同步(Y/N)</description>
 		<param-name>qlyg_sync</param-name>
-		<param-value>N</param-value>
+		<param-value>Y</param-value>
 	</context-param>
 	<context-param>
 		<description>是否在危险品审批中启用签章功能(Y/N)</description>
@@ -35,11 +35,6 @@
 		<param-value>N</param-value>
 	</context-param>
 	<context-param>
-		<description>是否关闭经营人：码头、泊位、储罐、堆场的可编辑功能（增、删、改、复制）(Y/N)</description>
-		<param-name>JyrDisbleEdit</param-name>
-		<param-value>N</param-value>
-	</context-param>
-	<context-param>
 		<param-name>contextConfigLocation</param-name>
 		<param-value>
 			classpath*:spring/applicationContext*.xml
@@ -78,7 +73,7 @@
 	<context-param>
 		<description>默认密码</description>
 		<param-name>default_password</param-name>
-		<param-value>yjpt.123</param-value>
+		<param-value>123456</param-value>
 	</context-param>
 	<context-param>
 		<description>上传文件大小(M)</description>
@@ -103,7 +98,7 @@
 	<context-param>
 		<description>是否jax-ws同步(Y/N)</description>
 		<param-name>jaxws_sync</param-name>
-		<param-value>N</param-value>
+		<param-value>Y</param-value>
 	</context-param>
 	<context-param>
 		<description>同步UserId</description>