pipIrr-SV.git - Gitblit

			@@ -1,6 +1,6 @@
			package com.dy.pipIrrRemote.report;

			import com.dy.common.mw.protocol.p206V1_0_0.CommonV1_0_1;
			import com.dy.common.mw.protocol.p206V1.CommonV1;
			import com.dy.common.webUtil.QueryResultVo;
			import com.dy.pipIrrGlobal.daoRm.*;
			import com.dy.pipIrrGlobal.voRm.VoOnHour;
			@@ -14,8 +14,6 @@
			import org.apache.dubbo.common.utils.PojoUtils;
			import org.springframework.stereotype.Service;

			import java.time.LocalDate;
			import java.time.LocalDateTime;
			import java.util.List;
			import java.util.Map;

			@@ -105,8 +103,8 @@
			List<VoOpenCloseValve> list = rmOpenCloseValveHistoryMapper.getOpenCloseValveReports_history(params);
			if (list != null && list.size() > 0) {
			for (VoOpenCloseValve vo : list) {
			vo.setOpenType(CommonV1_0_1.openCloseValveType(vo.getOpenType_()==null?(byte)100:vo.getOpenType_()));
			vo.setCloseType(CommonV1_0_1.openCloseValveType(vo.getCloseType_()==null?(byte)100:vo.getCloseType_()));
			vo.setOpenType(CommonV1.openCloseValveType(vo.getOpType()==null?(byte)100:vo.getOpType()));
			vo.setCloseType(CommonV1.openCloseValveType(vo.getClType()==null?(byte)100:vo.getClType()));
			}
			}
			rsVo.obj = list;
			@@ -132,8 +130,8 @@
			List<VoOpenCloseValve> list = rmOpenCloseValveLastMapper.getOpenCloseValveReports_last(params);
			if (list != null && list.size() > 0) {
			for (VoOpenCloseValve vo : list) {
			vo.setOpenType(CommonV1_0_1.openCloseValveType(vo.getOpenType_()==null?(byte)100:vo.getOpenType_()));
			vo.setCloseType(CommonV1_0_1.openCloseValveType(vo.getCloseType_()==null?(byte)100:vo.getCloseType_()));
			vo.setOpenType(CommonV1.openCloseValveType(vo.getOpType()==null?(byte)100:vo.getOpType()));
			vo.setCloseType(CommonV1.openCloseValveType(vo.getClType()==null?(byte)100:vo.getClType()));
			}
			}
			rsVo.obj = list;