~whyclxw/LockBltooth.git

			@@ -22,7 +22,7 @@
			his.setLockId(lockId);
			his.setAlmId(almId);
			PageInfo pageInfo=util.getPageInfo(pageNum,pageSize, ThreadLocalUtil.parse(startTime,1),ThreadLocalUtil.parse(endTime,1)
			,"db_lock_alarm","tb_lock_alarm_",his);
			,"db_lock_alarm","tb_lock_alarm",his);
			return new Response().setII(1,pageInfo.getList()!=null,pageInfo,"查询锁告警的历史状态");
			}
			}

			@@ -49,7 +49,7 @@
			continue;
			}
			//====== 根据不同类型类型对象对应调整 ======
			if(pojo instanceof LockHis) {
			if(pojo instanceof LockAlarmHis) {
			LockAlarmHis his = new LockAlarmHis();
			BeanUtils.copyProperties(pojo, his);
			his.setStartTime(queryTime.get(0));
			@@ -88,7 +88,7 @@
			List<Date> queryTime = queryTimeForSubTables.get(key);
			//====== 根据不同类型类型对象对应调整 ======
			String recordYear = tablePrefix + "_" + key;
			if(pojo instanceof LockHis) {
			if(pojo instanceof LockAlarmHis) {
			LockAlarmHis his = new LockAlarmHis();
			BeanUtils.copyProperties(pojo, his);
			his.setStartTime(queryTime.get(0));

	src/main/java/com/whyc/service/LockAlarmHisService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/whyc/util/SubTablePageInfoUtil.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史