From 00165e5d50f47c99d9eb7c2fc784bef4d3f72aca Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 16 Nov 2023 15:05:24 +0800
Subject: [PATCH] 预测返回测站名称

---
 skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/mapper/ArimaPredictMapper.xml |   38 +++++++++++++++++++++++++++++++-------
 1 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/mapper/ArimaPredictMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/mapper/ArimaPredictMapper.xml
index c1e9aa7..5a135bd 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/mapper/ArimaPredictMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/mapper/ArimaPredictMapper.xml
@@ -3,24 +3,48 @@
 <mapper namespace="cn.gistack.nky.mapper.ArimaPredictMapper">
 
 
-    <select id="getFutureData" resultType="cn.gistack.nky.entity.ArimaPredict">
+    <select id="getFutureData" resultType="cn.gistack.nky.vo.ArimaPredictVO">
 
-        SELECT * FROM NKY_ARIMA_PREDICT
+        SELECT NAP.*, acb."cd_nm" cdNm FROM NKY_ARIMA_PREDICT NAP
+        LEFT JOIN SJZT_MD."att_cd_base" acb ON acb."res_cd" = NAP.DAM_ID AND NAP.POINT_ID = acb."cd"
         WHERE DATE_FORMAT(create_time,'%Y-%m-%d')>= CURDATE()
         <if test="resCd != null and resCd !='' ">
-            AND DAM_ID = #{resCd}
+            AND NAP.DAM_ID = #{resCd}
         </if>
         <if test="type != null and type !='' and type == 1 ">
-            AND type = #{type}
+            AND NAP.type = #{type}
         </if>
         <if test="type != null and type !='' and type == 2">
-            AND type = #{type}
+            AND NAP.type = #{type}
         </if>
         <if test="type != null and type !='' and type == 3">
-            AND (type = '3' or type = '4' or type = '5')
+            AND (NAP.type = '3' or NAP.type = '4' or NAP.type = '5')
         </if>
-        ORDER BY POINT_ID ASC
+        ORDER BY NAP.POINT_ID ASC
     </select>
+
+    <select id="getFutureDataWy" resultType="cn.gistack.nky.vo.ArimaPredictVO">
+        SELECT NAP.*, awcb."cd_nm" cdNm FROM NKY_ARIMA_PREDICT NAP
+        LEFT JOIN SJZT_MD."att_wy_cd_base" awcb ON awcb."res_cd" = NAP.dam_id and awcb."cd" = NAP.point_id
+        WHERE DATE_FORMAT(create_time,'%Y-%m-%d')>= CURDATE()
+        <if test="resCd != null and resCd !='' ">
+            AND NAP.DAM_ID = #{resCd}
+        </if>
+        <if test="type != null and type !='' and type == 1 ">
+            AND NAP.type = #{type}
+        </if>
+        <if test="type != null and type !='' and type == 2">
+            AND NAP.type = #{type}
+        </if>
+        <if test="type != null and type !='' and type == 3">
+            AND (NAP.type = '3' or NAP.type = '4' or NAP.type = '5')
+        </if>
+        ORDER BY NAP.POINT_ID ASC
+    </select>
+
+
+
+
     <select id="selectTodayData" resultType="cn.gistack.nky.entity.ArimaPredict">
         SELECT  id FROM NKY_ARIMA_PREDICT
         WHERE 1=1

--
Gitblit v1.9.3