Merge pull request '[1131] 발전 시뮬레이션 선택 지역 수정 発電シミュレーションの選択地域の修正 (M_PREFECTURE_AREA => T_SIMULATION_AREA)' (#145) from feature/cha into dev
Reviewed-on: #145
This commit is contained in:
commit
b285e398af
@ -130,7 +130,7 @@
|
||||
ON O.OBJECT_NO = OI.OBJECT_NO
|
||||
LEFT OUTER JOIN M_PREFECTURE MP WITH (NOLOCK)
|
||||
ON O.PREF_ID = MP.PREF_ID
|
||||
LEFT OUTER JOIN M_PREFECTURE_AREA MPA WITH (NOLOCK)
|
||||
LEFT OUTER JOIN T_SIMULATION_AREA MPA WITH (NOLOCK)
|
||||
ON O.PREF_ID = MPA.PREF_ID
|
||||
AND OI.AREA_ID = MPA.AREA_ID
|
||||
LEFT OUTER JOIN M_COMM_L C1 WITH (NOLOCK)
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
A.AREA_ID
|
||||
, A.PREF_ID
|
||||
, A.AREA_NAME AS PREF_NAME
|
||||
FROM M_PREFECTURE_AREA A WITH (NOLOCK)
|
||||
FROM T_SIMULATION_AREA A WITH (NOLOCK)
|
||||
WHERE A.PREF_ID = #{prefId}
|
||||
ORDER BY A.AREA_ID ASC
|
||||
</select>
|
||||
@ -392,7 +392,7 @@
|
||||
ON O.SALE_STORE_ID = S.SALE_STORE_ID
|
||||
LEFT OUTER JOIN M_PREFECTURE P
|
||||
ON O.PREF_ID = P.PREF_ID
|
||||
LEFT OUTER JOIN M_PREFECTURE_AREA PA
|
||||
LEFT OUTER JOIN T_SIMULATION_AREA PA
|
||||
ON OI.AREA_ID = PA.AREA_ID
|
||||
WHERE O.OBJECT_NO = #{objectNo}
|
||||
AND OI.SOURCE_ORIGIN = 'QCAST_III'
|
||||
|
||||
@ -15,8 +15,8 @@
|
||||
, ISNULL(C1.CODE_NM, '') AS STANDARD_WIND_SPEED_ID/* 풍속조건명 */
|
||||
, B.PREF_ID /* 도도부현 */
|
||||
, (SELECT PREF_NAME FROM M_PREFECTURE WHERE PREF_ID = B.PREF_ID ) AS PREF_NAME
|
||||
, (SELECT SIMULATION_NO FROM T_SIMULATION_AREA AS S WHERE S.AREA_ID = B1.AREA_ID) AS AREA_ID/* 일사량 관측지점 */
|
||||
, (SELECT AREA_NAME FROM M_PREFECTURE_AREA WHERE AREA_ID = B1.AREA_ID ) AS AREA_NAME
|
||||
, B1.AREA_ID /* 일사량 관측지점 */
|
||||
, (SELECT AREA_NAME FROM T_SIMULATION_AREA WHERE AREA_ID = B1.AREA_ID ) AS AREA_NAME
|
||||
FROM T_PLAN A WITH (NOLOCK)
|
||||
INNER JOIN T_PLAN_INFO A1 WITH (NOLOCK)
|
||||
ON A.OBJECT_NO = A1.OBJECT_NO
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user