Merge pull request '시뮬레이션 물건명, 경칭 추가' (#200) from dev into prd-deploy
Reviewed-on: #200
This commit is contained in:
commit
c34b9b4c2d
@ -299,6 +299,8 @@ public class PwrGnrSimService {
|
||||
pwrGnrSimRes.setStandardWindSpeedId(planInfo.getStandardWindSpeedId());
|
||||
pwrGnrSimRes.setRoofModuleList(roofGroupModuleList);
|
||||
pwrGnrSimRes.setPcsList(pcsGroupList);
|
||||
pwrGnrSimRes.setObjectName(planInfo.getObjectName());
|
||||
pwrGnrSimRes.setObjectNameOmit(planInfo.getObjectNameOmit());
|
||||
|
||||
return pwrGnrSimRes;
|
||||
}
|
||||
|
||||
@ -35,4 +35,11 @@ public class PwrGnrSimPlanResponse {
|
||||
|
||||
@Schema(description = "일사량 관측지점명")
|
||||
private String areaName;
|
||||
// 물건정보 정보
|
||||
@Schema(description = "물건명")
|
||||
private String objectName;
|
||||
|
||||
@Schema(description = "경칭")
|
||||
private String objectNameOmit;
|
||||
|
||||
}
|
||||
|
||||
@ -68,4 +68,11 @@ public class PwrGnrSimResponse {
|
||||
|
||||
@Schema(description = "안내문구")
|
||||
private String guideInfo = "";
|
||||
|
||||
// 물건정보 정보
|
||||
@Schema(description = "물건명")
|
||||
private String objectName;
|
||||
|
||||
@Schema(description = "경칭")
|
||||
private String objectNameOmit;
|
||||
}
|
||||
|
||||
@ -17,6 +17,8 @@
|
||||
, (SELECT PREF_NAME FROM T_SIMULATION_PREFECTURE WHERE PREF_ID = B.PREF_ID ) AS PREF_NAME
|
||||
, B1.AREA_ID /* 일사량 관측지점 */
|
||||
, (SELECT AREA_NAME FROM T_SIMULATION_AREA WHERE AREA_ID = B1.AREA_ID ) AS AREA_NAME
|
||||
, B.OBJECT_NAME /* 물건명 */
|
||||
, B.OBJECT_NAME_OMIT /* 물건명(영문) */
|
||||
FROM T_PLAN A WITH (NOLOCK)
|
||||
INNER JOIN T_PLAN_INFO A1 WITH (NOLOCK)
|
||||
ON A.OBJECT_NO = A1.OBJECT_NO
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user