moral.git - Gitblit

summary
reflog
commits
tree
tickets
docs
forks
compare

cjl

2023-09-01 b2d11985e1cdd932deed8e2fb5749d6adf6afbdb

 screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java

@@ -73,6 +73,8 @@
        }
        if (form.getChooseTime().equals("true")) {
            endHourlyTime = form.getTime();
            Date time = DateUtils.convertDate(endHourlyTime);
            times = DateUtils.dateToDateString(time,DateUtils.yyyyMM_EN);
        }
        List<Map<String, Object>> listAll = deviceMapper.deviceList(organizationId,regionCode,region,type,sensorCode,times,endHourlyTime);
        //查询组织在对应地区下的站点以及设备

			@@ -73,6 +73,8 @@
			}
			if (form.getChooseTime().equals("true")) {
			endHourlyTime = form.getTime();
			Date time = DateUtils.convertDate(endHourlyTime);
			times = DateUtils.dateToDateString(time,DateUtils.yyyyMM_EN);
			}
			List<Map<String, Object>> listAll = deviceMapper.deviceList(organizationId,regionCode,region,type,sensorCode,times,endHourlyTime);
			//查询组织在对应地区下的站点以及设备