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

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

@@ -654,6 +654,7 @@ public class DcController extends BaseController {
 					map.put("NAME", "一般隐患");
 					map.put("NUM", zcDcCountEntity.getQzybyh());
 					list.add(map);
+					//2 pie
 					bc.setAttribute("tj2",list);
 					
 					list = new ArrayList<Map<String, Object>>();
@@ -665,6 +666,7 @@ public class DcController extends BaseController {
 					map.put("NAME", "罐区");
 					map.put("NUM", zcDcCountEntity.getYhqygq());
 					list.add(map);
+					//3 pie
 					bc.setAttribute("tj3",list);
 					continue;
 				}
@@ -674,24 +676,8 @@ public class DcController extends BaseController {
 				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);
+			} 
+			//1 ColumnChart
 			bc.setAttribute("tj1",list1);
 		}
 		else{

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

@@ -175,30 +175,30 @@ public class ZcController extends BaseController {
 				"港口企业安全隐患排查治理月报表", ReportExportHelper.REPORT_EXPORT_TYPE_WORD);
 	}
 
-	@RequestMapping(value = "dcTjJasper", 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 = null;
-		String reportFile = "";
-		Map<String, Object> parameters = new HashMap<String, Object>();
-		if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_PROVINCE)) {
-			dataList = (List<Map<String, Object>>) countZdyh(szd, type)
-					.getAttribute("records");
-		} else {
-			dataList = (List<Map<String, Object>>) countZdyhxx(szd, type)
-					.getAttribute("records");
-		}
-		reportFile = "iReport/zcdc/dcTj.jasper";
-		parameters.put("is_city",
-				Constants.DEPLOY_MODE_CITY.equals(GlobalData.DEPLOY_MODE));
-		ReportExportHelper.exportFromIreport(reportFile, response, parameters,
-				new JRBeanCollectionDataSource(dataList), "自查督查信息统计",
-				ReportExportHelper.REPORT_EXPORT_TYPE_WORD);
-	}
+//	@RequestMapping(value = "dcTjJasper", 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 = null;
+//		String reportFile = "";
+//		Map<String, Object> parameters = new HashMap<String, Object>();
+//		if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_PROVINCE)) {
+//			dataList = (List<Map<String, Object>>) countZdyh(szd, type)
+//					.getAttribute("records");
+//		} else {
+//			dataList = (List<Map<String, Object>>) countZdyhxx(szd, type)
+//					.getAttribute("records");
+//		}
+//		reportFile = "iReport/zcdc/dcTj.jasper";
+//		parameters.put("is_city",
+//				Constants.DEPLOY_MODE_CITY.equals(GlobalData.DEPLOY_MODE));
+//		ReportExportHelper.exportFromIreport(reportFile, response, parameters,
+//				new JRBeanCollectionDataSource(dataList), "自查督查信息统计",
+//				ReportExportHelper.REPORT_EXPORT_TYPE_WORD);
+//	}
 
 	public Collection<String[]> print(List<String> param) throws ParseException {
 		List<PredicateModel> filterList = new ArrayList<PredicateModel>();
@@ -480,12 +480,15 @@ public class ZcController extends BaseController {
 	 * @param szd
 	 * @return
 	 */
-	public BusinessContext countZcDc(String szd,String type) {
+	public BusinessContext countZcDc(String szd,Date ks,Date js) {
+		ks = Utils.getDateFirstTime(ks);
+		js = Utils.getDateLastTime(js);
+		
 		List<Map<String, Object>> list = null;
 		if (null == szd) {
-			list = zcService.countZcdc(null,type);
+			list = zcService.countZcdc(null,ks,js);
 		} else {
-			list = zcService.countZcdc(Long.parseLong(szd),type);
+			list = zcService.countZcdc(Long.parseLong(szd),ks,js);
 		}
 		BusinessContext bc = createBusinessContext();
 		bc.setAttribute("records", list);
@@ -499,12 +502,15 @@ public class ZcController extends BaseController {
 	 * @param type
 	 * @return
 	 */
-	public BusinessContext countZdyh(String szd, String type) {
+	public BusinessContext countZdyh(String szd,Date ks,Date js) {
+		ks = Utils.getDateFirstTime(ks);
+		js = Utils.getDateLastTime(js);
+		
 		List<Map<String, Object>> list = null;
 		if (null == szd) {
-			list = zcService.countZdyh(null, type);
+			list = zcService.countZdyh(null,ks,js);
 		} else {
-			list = zcService.countZdyh(Long.parseLong(szd), type);
+			list = zcService.countZdyh(Long.parseLong(szd),ks,js);
 		}
 		BusinessContext bc = createBusinessContext();
 		bc.setAttribute("records", list);

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/jyr/JyrController.java

@@ -28,8 +28,11 @@ import org.apache.poi.poifs.filesystem.POIFSFileSystem;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
+import org.springframework.data.domain.Sort.Order;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.flex.remoting.RemotingDestination;
 import org.springframework.flex.remoting.RemotingExclude;
@@ -215,7 +218,10 @@ public class JyrController extends BaseController {
 					return cb.and(list.toArray(new Predicate[] {}));
 				}
 			};
-			Page<JyrEntity> list1 = service.findAll(spec, pageRequest);
+			List<Order> orders = new ArrayList<Order>();
+			orders.add(new Order(Direction.DESC,"updateDate"));
+			Pageable page = new PageRequest(pageRequest.getPageNumber(),pageRequest.getPageSize(),new Sort(orders));
+			Page<JyrEntity> list1 = service.findAll(spec, page);
 			return createBusinessContext(list1);
 		} catch (Exception e) {
 			e.printStackTrace();

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

@@ -1365,6 +1365,9 @@ public class ZysqbpController extends BaseController {
 	 * @return
 	 */
 	public BusinessContext countSpZxl(String szd,Date ks,Date js) {
+		ks = Utils.getDateFirstTime(ks);
+		js = Utils.getDateLastTime(js);
+		
 		List<Map<String, Object>> list = null;
 		if (null == szd) {
 			list = zysqbpService.countSpZxl(null,ks,js);
@@ -1405,6 +1408,9 @@ public class ZysqbpController extends BaseController {
 	 * @return
 	 */
 	public BusinessContext countSp(String szd,Date ks,Date js) {
+		ks = Utils.getDateFirstTime(ks);
+		js = Utils.getDateLastTime(js);
+		
 		List<Map<String, Object>> list = null;
 		if (null == szd) {
 			list = zysqbpService.countSp(null,ks,js);
@@ -2119,7 +2125,12 @@ public class ZysqbpController extends BaseController {
 				// TODO 数据来源
 				List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
 				List<Object[]> hzTjList = zysqbpService.hzTj(bgsj1, bgsj2, kgsj1, kgsj2, wgsj1, wgsj2,hzName,false);
+				int count =0;
 				for(Object[] obj : hzTjList){
+					//只取前十个
+					count ++;
+					if(count>10)
+						continue;
 					if(null != obj){
 						Map<String, Object> map = new HashMap<String, Object>();
 						map.put("NAME", String.valueOf(obj[0])+String.valueOf(obj[2]));
@@ -5099,7 +5110,7 @@ public class ZysqbpController extends BaseController {
 		Date js = cal.getTime();//end
 		
 		//1.1
-		int year = Calendar.YEAR;
+		int year = cal.get(Calendar.YEAR);
 		String date = year + "-01-01";
 		
 		DateFormat fmt = new SimpleDateFormat("yyyy-MM-dd");

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 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) "
+			+ " LEFT JOIN T_YJPT_ZC Z ON G.ID=Z.SZGQ AND Z.RECORD_STATUS!=9 AND ?1<=Z.ADD_DATE AND Z.ADD_DATE<=?3 "
+			+ " LEFT JOIN T_YJPT_DC D ON G.ID=D.SZGQ AND D.RECORD_STATUS!=9 AND ?1<=D.ADD_DATE AND D.ADD_DATE<=?3 "
 			+ " 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,String type);
+	public List<Object[]> countZcdc(String szd,Date ks,Date js);
 
 	/**
 	 * 自查督查数量统计（省级）
@@ -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 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) "+
+       "LEFT JOIN T_YJPT_ZC Z ON G.ID=substr(Z.SZD,0,5) AND Z.RECORD_STATUS!=9 AND ?1<=Z.ADD_DATE AND Z.ADD_DATE<=?2 " +
+       "LEFT JOIN T_YJPT_DC D ON G.ID=substr(D.SZD,0,5) AND D.RECORD_STATUS!=9 AND ?1<=D.ADD_DATE AND D.ADD_DATE<=?2 "+
       "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(@Param("TYPE") String type);
+	public List<Object[]> countZcdc(Date ks,Date js);
 
 	/**
 	 * 重大隐患数量统计（省级）
@@ -53,15 +53,15 @@ public interface ZcDao extends MyRepository<ZcEntity, Long> {
        "T1.YHS,T1.ZGS FROM "+
        "( SELECT G.MC, SUM(Z.CCYHS) CCYHS, SUM(Z.ZGS) ZGS "+
        "FROM T_YJPT_GGDM  G LEFT JOIN T_YJPT_ZC Z "+
-       "ON substr(Z.SZD,0,5)=G.ID AND Z.RECORD_STATUS<>9 AND TO_CHAR(Z.ADD_DATE,:TYPE)=TO_CHAR(SYSDATE,:TYPE) "+
+       "ON substr(Z.SZD,0,5)=G.ID AND Z.RECORD_STATUS<>9 AND ?1<=Z.ADD_DATE AND Z.ADD_DATE<=?2 "+
        "WHERE G.GROUPCODE='SZD' and g.fid=900  GROUP BY G.MC,g.id, G.PX ORDER BY G.PX) T0 "+
        "LEFT JOIN "+
        "(SELECT G.MC,COUNT(D.ID) YHS,SUM(CASE WHEN D.MQZT=1 THEN 1 ELSE 0 END) ZGS "+
        "FROM T_YJPT_GGDM G LEFT JOIN T_YJPT_DC D "+
-       "ON G.ID=substr(D.SZD,0,5) AND D.RECORD_STATUS<>9 AND TO_CHAR(D.ADD_DATE,:TYPE)=TO_CHAR(SYSDATE,:TYPE) "+
+       "ON G.ID=substr(D.SZD,0,5) AND D.RECORD_STATUS<>9 AND ?1<=D.ADD_DATE AND D.ADD_DATE<=?2 "+
        "WHERE G.GROUPCODE='SZD' and g.fid=900  GROUP BY G.MC,G.ID, G.PX ORDER BY G.PX) T1 "+
        "ON T0.MC=T1.MC", nativeQuery = true)
-	public List<Object[]> countZdyh(@Param("TYPE") String type);
+	public List<Object[]> countZdyh(Date ks,Date js);
 
 	/**
 	 * 隐患趋势（月，省级）

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/dao/sgalgl/SgalglDao.java

@@ -289,7 +289,7 @@ public interface SgalglDao extends MyRepository<SgalglEntity, Long> {
 
 	@Query(value = "SELECT  G.MC,x.sgs, x.sws "
 			+ " FROM T_YJPT_GGDM G LEFT JOIN (select substr(S.szd,0,5)szdid,COUNT(S.ID)sgs, SUM(S.DEATHNUM)sws from T_YJPT_SGALGL S where S.RECORD_STATUS!=9 group by substr(s.szd,0,5))x on  x.szdid = g.id "
-			+ " WHERE  G.GROUPCODE='SZD' and g.fid=900   ORDER BY G.MC", nativeQuery = true)
+			+ " WHERE  G.GROUPCODE='SZD' and g.fid=900   ORDER BY G.PX", nativeQuery = true)
 	public List<Object[]> countSg();
 
 	@Query(value = "select count(j.rs) from T_YJPT_JYRJCXX j where j.ID IN ( select distinct b.sgdwmc from t_yjpt_sgalgl  b  "

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

@@ -5,7 +5,6 @@ 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.zysqbp.ZysqbpEntity;

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

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

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,String type) {
+	public List<Map<String, Object>> countZcdc(Long szd,Date ks,Date js) {
 		List<Object[]> res = null;
 		if (null == szd) {
-			res = zcDao.countZcdc(type);
+			res = zcDao.countZcdc(ks,js);
 		} else {
-			res = zcDao.countZcdc(szd + "%",type);
+			res = zcDao.countZcdc(szd + "%",ks,js);
 		}
 		List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
 		for (Iterator<Object[]> iterator = res.iterator(); iterator.hasNext();) {
@@ -84,10 +84,10 @@ public class ZcServiceImpl extends BaseService<ZcEntity, Long> implements
 	}
 
 	@Override
-	public List<Map<String, Object>> countZdyh(Long szd, String type) {
+	public List<Map<String, Object>> countZdyh(Long szd,Date ks,Date js) {
 		List<Object[]> res = null;
 		if (null == szd) {
-			res = zcDao.countZdyh(type);
+			res = zcDao.countZdyh(ks,js);
 		} else {
 			// res = zcDao.countZdyh(szd, type);
 		}

gkaq/yjpt-java/trunk/locale/zh_CN/select.properties

@@ -201,6 +201,7 @@ SZD.YANCHENGKAIFAQU=\u7ecf\u6d4e\u5f00\u53d1\u533a
 SZD.DONGTAI=\u4e1c\u53f0\u5e02
 SZD.JIANHU=\u5efa\u6e56\u53bf
 SZD.GKJ.ZHENJIANGNEIHE=\u9547\u6c5f\u5185\u6cb3\u6e2f\u53e3\u5c40
+SZD.TAIXINGNEIHE=\u6cf0\u5174\u5185\u6cb3