修改

src/main/java/com/minpay/common/service/impl/ReportServiceImpl.java

@@ -185,7 +185,6 @@ public class ReportServiceImpl implements IReportService {
     	if (Constant.REPORT_TYPE_00.equals(reportTypeId)) {
     		String monthNum = (String)param.get("monthNum");
     		String countNum = (String)param.get("countNum");
-    		
     		return reportTypeTQTDRB(range, timeRange, monthNum, countNum);
     	// 台区停电周报
     	} else if (Constant.REPORT_TYPE_01.equals(reportTypeId)) {
@@ -448,8 +447,8 @@ public class ReportServiceImpl implements IReportService {
 		
 		// monthNum个月内停电 countNum次以上的台区
 		String beginDay = DateUtil.dateAddMonth(rangeArray[1], Integer.parseInt("-" + monthNum));
-		param.put("beginDay", beginDay);
-		param.put("endDay", rangeArray[1]);
+		param.put("beginDay", beginDay + beginTime.substring(8, 14));
+		param.put("endDay", rangeArray[1] + endTime.substring(8, 14));
 		param.put("countNum", countNum);
 		List<Map<String, String>> mountCountList = db.getMybatisMapper(ReportServiceMapper.class).selectMountCount00(param);
 		Map<String, Integer> taiQuMap = new HashMap<String, Integer>();
@@ -495,8 +494,8 @@ public class ReportServiceImpl implements IReportService {
 		childList6.add(taiQuMap.get("heji").toString());
 		resList.add(childList6);
 		
-		// 查询昨日停电的数据
-		param.put("yesterday", DateUtil.dateAddDay(rangeArray[1], -1));
+		// 查询昨日停电的数据  改为当日停电
+		param.put("yesterday", rangeArray[1]);
 		List<Map<String, String>> yesterdayList = db.getMybatisMapper(ReportServiceMapper.class).queryYesterdayDetail(param);
 		
 		param.put("yesterdayDetail", yesterdayList);
@@ -538,7 +537,7 @@ public class ReportServiceImpl implements IReportService {
 			yesterdayTaiQuMap.put("heji",yesterdayTaiQuMap.get("heji") + 1);
 		}
 		List<String> childList7 = new ArrayList<String>();
-		childList7.add(monthNum+"个月停电" + countNum + "次及以上台区且昨日停电");
+		childList7.add(monthNum+"个月停电" + countNum + "次及以上台区且当日停电");
 		childList7.add(yesterdayTaiQuMap.get("xintai").toString());
 		childList7.add(yesterdayTaiQuMap.get("daiyue").toString());
 		childList7.add(yesterdayTaiQuMap.get("ningyang").toString());
@@ -550,9 +549,9 @@ public class ReportServiceImpl implements IReportService {
 		childList7.add(yesterdayTaiQuMap.get("heji").toString());
 		resList.add(childList7);
 		
-		// 2个月停电1次及以上台区且昨日停电的台区数据
+		// 2个月停电1次及以上台区且昨日停电的台区数据  改为且当日停电
 		beginDay = DateUtil.dateAddMonth(rangeArray[1], -2);
-		param.put("beginDay", beginDay);
+		param.put("beginDay", beginDay + beginTime.substring(8, 14));
 		param.put("countNum", 1);
 		List<Map<String, String>> yiciData = db.getMybatisMapper(ReportServiceMapper.class).selectMountCount00(param);
 		
@@ -587,7 +586,7 @@ public class ReportServiceImpl implements IReportService {
 			yiciMap.put("heji",yiciMap.get("heji") + 1);
 		}
 		List<String> childList8 = new ArrayList<String>();
-		childList8.add("2个月停电1次及以上台区且昨日停电");
+		childList8.add("2个月停电1次及以上台区且当日停电");
 		childList8.add(yiciMap.get("xintai").toString());
 		childList8.add(yiciMap.get("daiyue").toString());
 		childList8.add(yiciMap.get("ningyang").toString());

src/main/java/com/minpay/reportManage/action/TQTDReportAction.java

@@ -118,18 +118,18 @@ public class TQTDReportAction implements IMINAction {
 			selectByExample = Service.lookup(IFormatService.class).formatDate(selectByExample, "date");
 			selectByExample = Service.lookup(IFormatService.class).formatDateTime(selectByExample, "startTime", "endTime");
 			res.set(IMINBusinessConstant.F_PAGING_LAY, selectByExample);
-		// month个月停电count次及以上台区且昨日停电穿透
+		// month个月停电count次及以上台区且当日停电穿透
 		} else if ("TQTD03".equals(chuantouType)) {
 			String monthNum = reportInf.getTqtdMonth();
 			String countNum = reportInf.getTqtdCount();
 			// monthNum个月内停电 countNum次以上的台区
 			String beginDay = DateUtil.dateAddMonth(dayIntervalArray[1], Integer.parseInt("-" + monthNum));
-			param.put("beginDay", beginDay);
-			param.put("endDay", dayIntervalArray[1]);
+			param.put("beginDay", beginDay + timeIntervalArray[0]);
+			param.put("endDay", dayIntervalArray[1] + timeIntervalArray[1]);
 			param.put("countNum", countNum);
 			
-			// 查询昨日停电的数据
-			param.put("yesterday", DateUtil.dateAddDay(dayIntervalArray[1], -1));
+			// 查询当日停电的数据
+			param.put("yesterday", dayIntervalArray[1]);
 			List<Map<String, String>> yesterdayList = db.getMybatisMapper(ReportServiceMapper.class).queryYesterdayDetail(param);
 			param.put("yesterdayDetail", yesterdayList);
 			
@@ -137,32 +137,32 @@ public class TQTDReportAction implements IMINAction {
 			
 			List<String> addressNumList = CommonUtil.getIdFromList(mountCountList, "addressNum");
 			DwFileDetail00Example example = new DwFileDetail00Example();
-			example.createCriteria().andAddressNumIn(addressNumList).andStartTimeGreaterThanOrEqualTo(beginDay).andEndTimeLessThanOrEqualTo(dayIntervalArray[1]);
+			example.createCriteria().andAddressNumIn(addressNumList).andStartTimeGreaterThanOrEqualTo(beginDay + timeIntervalArray[0]).andEndTimeLessThanOrEqualTo(dayIntervalArray[1] + timeIntervalArray[1]);
 			example.setOrderByClause("DFD0_ADDRESS_NUM");
 			List<DwFileDetail00> selectByExample = db.selectByExample(DwFileDetail00Mapper.class, example);
 			selectByExample = Service.lookup(IFormatService.class).formatDate(selectByExample, "date");
 			selectByExample = Service.lookup(IFormatService.class).formatDateTime(selectByExample, "startTime", "endTime");
 			res.set(IMINBusinessConstant.F_PAGING_LAY, selectByExample);
-		// 2个月停电1次及以上台区且昨日停电穿透
+		// 2个月停电1次及以上台区且当日停电穿透
 		} else if ("TQTD04".equals(chuantouType)) {
 			String monthNum = "2";
 			String countNum = "1";
 			// monthNum个月内停电 countNum次以上的台区
 			String beginDay = DateUtil.dateAddMonth(dayIntervalArray[1], Integer.parseInt("-" + monthNum));
-			param.put("beginDay", beginDay);
-			param.put("endDay", dayIntervalArray[1]);
+			param.put("beginDay", beginDay + timeIntervalArray[0]);
+			param.put("endDay", dayIntervalArray[1] + timeIntervalArray[1]);
 			param.put("countNum", countNum);
 			
-			// 查询昨日停电的数据
-			param.put("yesterday", DateUtil.dateAddDay(dayIntervalArray[1], -1));
+			// 查询当日停电的数据
+			param.put("yesterday", dayIntervalArray[1]);
 			List<Map<String, String>> yesterdayList = db.getMybatisMapper(ReportServiceMapper.class).queryYesterdayDetail(param);
 			param.put("yesterdayDetail", yesterdayList);
 			
-			List<Map<String, String>> mountCountList = db.getMybatisMapper(ReportServiceMapper.class).selectMountCount00(param);
+//			List<Map<String, String>> mountCountList = db.getMybatisMapper(ReportServiceMapper.class).selectMountCount00(param);
 			
-			List<String> addressNumList = CommonUtil.getIdFromList(mountCountList, "addressNum");
+			List<String> addressNumList = CommonUtil.getIdFromList(yesterdayList, "addressNum");
 			DwFileDetail00Example example = new DwFileDetail00Example();
-			example.createCriteria().andAddressNumIn(addressNumList).andStartTimeGreaterThanOrEqualTo(beginDay).andEndTimeLessThanOrEqualTo(dayIntervalArray[1]);
+			example.createCriteria().andAddressNumIn(addressNumList).andStartTimeGreaterThanOrEqualTo(beginDay + timeIntervalArray[0]).andEndTimeLessThanOrEqualTo(dayIntervalArray[1] + timeIntervalArray[1]);
 			example.setOrderByClause("DFD0_ADDRESS_NUM");
 			List<DwFileDetail00> selectByExample = db.selectByExample(DwFileDetail00Mapper.class, example);
 			selectByExample = Service.lookup(IFormatService.class).formatDate(selectByExample, "date");