From 269c5f15cc7117c30e75be9fd964de47525f371a Mon Sep 17 00:00:00 2001
From: lyf66 <admin@cloudowr.com>
Date: Wed, 9 Apr 2025 17:27:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E5=80=BC=E6=9F=A5=E8=AF=A2=E6=9F=A5?=
 =?UTF-8?q?=E4=B8=8D=E5=88=B0=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98#598?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/gunshi/project/xyt/mapper/OsmoticPressRMapper.java  | 6 +++---
 .../gunshi/project/xyt/service/OsmoticPressRService.java    | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/gunshi/project/xyt/mapper/OsmoticPressRMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/OsmoticPressRMapper.java
index 4cb9db2..360fc68 100644
--- a/src/main/java/com/gunshi/project/xyt/mapper/OsmoticPressRMapper.java
+++ b/src/main/java/com/gunshi/project/xyt/mapper/OsmoticPressRMapper.java
@@ -74,13 +74,13 @@ public interface OsmoticPressRMapper extends BaseMapper<OsmoticPressR> {
                 <if test = "obj.type == 2">
                      t.q as value from public.osmotic_flow_r t
                 </if>
-                where to_char(t.tm, 'HH24:MI:SS') = '08:00:00' and t.station_code in
+                where t.station_code in
                 <foreach collection="obj.stationCodes" item="code" separator="," open="(" close=")">
                     #{code}
-                </foreach>	
+                </foreach>
                 <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.start != null">
                      and t.tm <![CDATA[>=]]> #{obj.dateTimeRangeSo.start}
-                </if>  
+                </if>
                 <if test="obj.dateTimeRangeSo != null and obj.dateTimeRangeSo.end != null">
                     and t.tm <![CDATA[<=]]> #{obj.dateTimeRangeSo.end}
                 </if>
diff --git a/src/main/java/com/gunshi/project/xyt/service/OsmoticPressRService.java b/src/main/java/com/gunshi/project/xyt/service/OsmoticPressRService.java
index 4fa5b5b..f38b6d8 100644
--- a/src/main/java/com/gunshi/project/xyt/service/OsmoticPressRService.java
+++ b/src/main/java/com/gunshi/project/xyt/service/OsmoticPressRService.java
@@ -49,6 +49,9 @@ public class OsmoticPressRService extends ServiceImpl<OsmoticPressRMapper, Osmot
      * @return
      */
     public List<OsmoticStationVo> queryValue(OsmoticQuerySo osmoticQuerySo,Integer year) {
+        if(osmoticQuerySo.getType() == null) {
+            osmoticQuerySo.setType(1);
+        }
         List<OsmoticStationVo> resList = new ArrayList<>();
         if(CollectionUtils.isEmpty(osmoticQuerySo.getStationCodes())){
             return resList;