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 cf3773c0..6993f882 100644 --- a/src/main/java/com/interplug/qcast/biz/pwrGnrSimulation/PwrGnrSimService.java +++ b/src/main/java/com/interplug/qcast/biz/pwrGnrSimulation/PwrGnrSimService.java @@ -107,9 +107,21 @@ public class PwrGnrSimService { PwrGnrSimPlanResponse planInfo = pwrGnrSimMapper.selectPlanInfo(pwrGnrSimRequest); // 지역이 없으면 계산 불가능 - if (planInfo == null || planInfo.getAreaId() == 0) { - log.error("지역값이 없음."); + if (planInfo == null) { + log.error("물건정보 없음."); return exceptionRes; + } else { + exceptionRes.setObjectNo(planInfo.getObjectNo()); + exceptionRes.setPlanNo(planInfo.getPlanNo()); + exceptionRes.setDrawingEstimateCreateDate(planInfo.getDrawingEstimateCreateDate()); + exceptionRes.setPrefName(planInfo.getPrefName()); + exceptionRes.setAreaName(planInfo.getAreaName()); + exceptionRes.setSnowfall(planInfo.getSnowfall()); + exceptionRes.setStandardWindSpeedId(planInfo.getStandardWindSpeedId()); + if (planInfo.getAreaId() == 0) { + log.error("지역값이 없음."); + return exceptionRes; + } } // 2. 견적서 지붕재 목록 조회 @@ -131,6 +143,8 @@ public class PwrGnrSimService { if (roofGroupModuleList.isEmpty()) { log.error("모듈 아이템이 없음."); return exceptionRes; + } else { + exceptionRes.setRoofModuleList(roofGroupModuleList); } // 4. 계산을 위해 order by 변경 (총용량 DESC) -계산용 @@ -149,6 +163,8 @@ public class PwrGnrSimService { if (pcsGroupList.isEmpty()) { log.error("PCS 아이템이 없음."); return exceptionRes; + } else { + exceptionRes.setPcsList(pcsGroupList); } // 견적서 정보 기준으로 발전시뮬레이션 계산을 진행한다.