五温趋势图sql调整

src/main/java/com/chinaitop/depot/supervise/mapper/TestDatasMapper.xml

@@ -87,46 +87,35 @@
   <select id="selectByDays" resultType="java.util.Map" parameterType="java.util.Map" >
     select * from (
       SELECT
-            row_number() over(partition by to_date(t.t_time, 'yyyy-mm-dd')) rn,
-            to_date(t.t_time, 'yyyy-mm-dd') jcsj,
-            t.t_max zgwd,
-            t.t_min zdwd,
-            t.t_avg lswd,
-            t.outTemp cwwd,
-            t.inTemp cnwd,
-            t3.t_time
-        FROM
-            (
-                SELECT
-                    *
-                FROM
-                    t_testdata
-                WHERE
-                    iLq_yq = 0
-                AND org_id = #{orgid,jdbcType=VARCHAR}
-                ORDER BY
-                    t_time DESC
-            ) t
-        JOIN basic_storehouse bs ON bs.storehouse_code = t.storehouse AND bs.del_flag = 1
-        LEFT JOIN (
+        row_number() over(partition by to_date(t.t_time, 'yyyy-mm-dd') order by t_time desc) rn,
+        to_date(t.t_time, 'yyyy-mm-dd') jcsj,
+        t.t_max zgwd,
+        t.t_min zdwd,
+        t.t_avg lswd,
+        t.outTemp cwwd,
+        t.inTemp cnwd,
+        t3.t_times t_time
+      FROM t_testdata t
+      JOIN basic_storehouse bs ON bs.storehouse_code = t.storehouse 
+      LEFT JOIN (
             SELECT
-                max(to_date(t2.t_time, 'yyyy-mm-dd')) over() t_time,
+                max(to_date(t2.t_time, 'yyyy-mm-dd')) t_times,
                 t2.storehouse
-            FROM
-                t_testdata t2,
-                basic_storehouse bs
-            WHERE
-                bs.storehouse_id = #{houseid,jdbcType=VARCHAR}
-            AND bs.storehouse_code = t2.storehouse
+            FROM t_testdata t2, basic_storehouse bs
+            WHERE bs.storehouse_id = #{houseid,jdbcType=VARCHAR}
+            AND bs.storeh ouse_code = t2.storehouse
             AND bs.del_flag = 1
             AND t2.iLq_yq = 0
             AND t2.org_id = #{orgid,jdbcType=VARCHAR}
-        ) t3 ON t3.storehouse = t.storehouse
-        WHERE
-            bs.storehouse_id = #{houseid,jdbcType=VARCHAR}
-        AND t.org_id = #{orgid,jdbcType=VARCHAR}
-        AND to_date(to_char(t3.t_time - ${dayCount},'yyyy/mm/dd'),'yyyy/mm/dd') &lt;= to_date(t.t_time, 'yyyy-mm-dd')
-    )a where rn = 1
+            group by t2.storehouse
+      ) t3 ON t3.storehouse = t.storehouse
+      where 1=1 
+      and t.iLq_yq = 0 
+      AND t.org_id = #{orgid,jdbcType=VARCHAR}
+      AND bs.del_flag = 1
+      and bs.storehouse_id = #{houseid,jdbcType=VARCHAR}
+      AND to_date(t.t_time, 'yyyy-mm-dd') >= to_date(to_char(t3.t_times - ${dayCount},'yyyy/mm/dd'),'yyyy/mm/dd')
+    ) a where rn = 1
   </select>
 
     <select id="selectByHours" resultType="java.util.Map" parameterType="java.util.Map" >