diff --git a/src/main/java/com/interplug/qcast/biz/pwrGnrSimulation/PwrGnrSimService.java b/src/main/java/com/interplug/qcast/biz/pwrGnrSimulation/PwrGnrSimService.java index 3385bb0a..c36b2b15 100644 --- a/src/main/java/com/interplug/qcast/biz/pwrGnrSimulation/PwrGnrSimService.java +++ b/src/main/java/com/interplug/qcast/biz/pwrGnrSimulation/PwrGnrSimService.java @@ -490,7 +490,7 @@ public class PwrGnrSimService { double direction = pwrGnrSimReq.getHoui()[i]; // 설치면 발전량 계산 - if (!Double.isNaN(angle) && angle > 0 && angle <= (Math.PI / 2) ) { + if (!Double.isNaN(angle) && angle >= 0 && angle <= (Math.PI / 2) ) { if(!Double.isNaN(direction) && direction >= (-Math.PI) && direction <= (Math.PI)){ // 설치면의 사면 일사량 계산 double[] shamen_nissha = this.shamenNissharyou2(angle, direction, simulationPointCode); diff --git a/src/main/resources/mappers/pwrGnrSimulation/pwrGnrSimMapper.xml b/src/main/resources/mappers/pwrGnrSimulation/pwrGnrSimMapper.xml index 47d09722..1de4403d 100644 --- a/src/main/resources/mappers/pwrGnrSimulation/pwrGnrSimMapper.xml +++ b/src/main/resources/mappers/pwrGnrSimulation/pwrGnrSimMapper.xml @@ -66,9 +66,10 @@ ON B.ITEM_ID = C.ITEM_ID LEFT OUTER JOIN M_ITEM_INFO D WITH (NOLOCK) ON C.ITEM_ID = D.ITEM_ID - WHERE C.POWER_COM_FLG ='1' /* PCS만 */ - AND B.OBJECT_NO = #{objectNo} + WHERE + B.OBJECT_NO = #{objectNo} AND B.PLAN_NO = #{planNo} + /* AND C.POWER_COM_FLG ='1' -- 하이브리드 때문에 제거*/ ORDER BY C.PNOW_W /* TODO :: 직렬,병렬 조건 추가필요 */