pipIrr-SV.git - Gitblit

			@@ -342,10 +342,10 @@
			openTypeName = "用户远程开阀";
			break;
			case 11:
			openTypeName = "开关阀卡开阀";
			openTypeName = "巡检卡开阀";
			break;
			case 13:
			openTypeName = "开关阀卡开阀";
			openTypeName = "巡检卡开阀";
			break;
			default:
			openTypeName = "不知道您要查那种开阀类型";
			@@ -412,7 +412,7 @@
			closeTypeName = "用户远程关阀";
			break;
			case 10:
			closeTypeName = "开关阀卡关阀";
			closeTypeName = "巡检卡关阀";
			break;
			case 12:
			closeTypeName = "黑名单命令关阀";
			@@ -771,4 +771,41 @@
			rsVo.obj = rmLossDayLastMapper.getMonthLossAmount(params);
			return rsVo ;
			}

			/**
			* 最近未报数的取水口
			* @param qo
			* @return
			*/
			public QueryResultVo<List<VoIntakeUnReported>> getUnReportedIntakes(CommonQO qo) {
			String timeStart = qo.getTimeStart();
			String timeStop = qo.getTimeStop();
			if(timeStart == "") {
			timeStart = null;
			}
			if(timeStop == "") {
			timeStop = null;
			}
			if(timeStart != null && timeStart != "") {
			timeStart = timeStart + " 00:00:00";
			}
			qo.setTimeStart(timeStart);

			if(timeStop != null && timeStop != "") {
			timeStop = timeStop + " 23:59:59";
			}
			qo.setTimeStop(timeStop);


			Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
			Long itemTotal = rmOnHourReportLastMapper.getUnReportedIntakesCount(params);

			QueryResultVo<List<VoIntakeUnReported>> rsVo = new QueryResultVo<>() ;
			rsVo.pageSize = qo.pageSize ;
			rsVo.pageCurr = qo.pageCurr ;

			rsVo.calculateAndSet(itemTotal, params);
			rsVo.obj = rmOnHourReportLastMapper.getUnReportedIntakes(params);
			return rsVo ;
			}
			}