diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/CommonServiceImpl.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/CommonServiceImpl.java index 7769b99..39e33c8 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/CommonServiceImpl.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/CommonServiceImpl.java @@ -115,6 +115,14 @@ public class CommonServiceImpl { dataList.add(BeanUtils.describe(fHisdataLive).getOrDefault(survItem, "").toString()); } } + }else if (PollutionConstants.WATER_QULITY.equals(deploy.getDeployType())) {//水质 + List waterList = hisdataSoilService.listByParams(deploy.getDeployCode(),startDateTime,endDateTime); + if (waterList.size() > 0) { + for (SurvHisdataSoil fHisdataSoil : waterList) { + timeList.add(sdf.format(fHisdataSoil.getDataDateTime())); + dataList.add(BeanUtils.describe(fHisdataSoil).getOrDefault(survItem, "").toString()); + } + } } } catch (Exception e) { e.printStackTrace();