From 2a861d2e3a0bcc1e7d9f70429474741100f5ef88 Mon Sep 17 00:00:00 2001
From: zy <82248909@qq.com>
Date: Thu, 27 Nov 2025 15:22:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=9B=91=E6=B5=8B=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/appmana/service/impl/CommonServiceImpl.java   | 8 ++++++++
 1 file changed, 8 insertions(+)

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<SurvHisdataSoil> 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();