qcast3/qcast-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'dev_ysCha' (#355) from dev_ysCha into dev-deploy

Browse Source 
Reviewed-on: #355
This commit is contained in:
ysCha 2026-01-30 10:16:51 +09:00
commit 17e5dd1c2d
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java
View File

@ -1763,7 +1763,7 @@ public class EstimateService {
List<ItemResponse> circuitItemList11 = estimateResponse.getRoofInfo().getCircuitItemList(); List<ItemResponse> circuitItemList11 = estimateResponse.getRoofInfo().getCircuitItemList();
if (circuitItemList11.size() < 12){ if (circuitItemList11 != null && circuitItemList11.size() < 12){
// 12개 미만인 경우, 나머지 아이템을 빈 값으로 채움 // 12개 미만인 경우, 나머지 아이템을 빈 값으로 채움
for (int k = circuitItemList11.size(); k < 11; k++) { for (int k = circuitItemList11.size(); k < 11; k++) {
ItemResponse emptyItem = new ItemResponse(); ItemResponse emptyItem = new ItemResponse();
@ -1778,7 +1778,7 @@ public class EstimateService {
// 지붕면 목록에서 8개로 자름 // 지붕면 목록에서 8개로 자름
List<PwrGnrSimRoofResponse> roofModuleList8 = estimateResponse.getPwrGnrSim().getRoofModuleList(); List<PwrGnrSimRoofResponse> roofModuleList8 = estimateResponse.getPwrGnrSim().getRoofModuleList();
if (roofModuleList8.size() < 9) { if (roofModuleList8 != null && roofModuleList8.size() < 9) {
// 9개 미만인 경우, 나머지 아이템을 빈 값으로 채움 // 9개 미만인 경우, 나머지 아이템을 빈 값으로 채움
for (int k = roofModuleList8.size(); k < 8; k++) { for (int k = roofModuleList8.size(); k < 8; k++) {
PwrGnrSimRoofResponse emptyRoof = new PwrGnrSimRoofResponse(); PwrGnrSimRoofResponse emptyRoof = new PwrGnrSimRoofResponse();
@ -1792,7 +1792,7 @@ public class EstimateService {
//pcs list 3개 //pcs list 3개
List<PwrGnrSimRoofResponse> pcsList3 = estimateResponse.getPwrGnrSim().getPcsList(); List<PwrGnrSimRoofResponse> pcsList3 = estimateResponse.getPwrGnrSim().getPcsList();
if (pcsList3.size() < 4) { if (pcsList3 != null && pcsList3.size() < 4) {
// 4개 미만인 경우, 나머지 아이템을 빈 값으로 채움 // 4개 미만인 경우, 나머지 아이템을 빈 값으로 채움
for (int k = pcsList3.size(); k < 4; k++) { for (int k = pcsList3.size(); k < 4; k++) {
PwrGnrSimRoofResponse emptyPcs = new PwrGnrSimRoofResponse(); PwrGnrSimRoofResponse emptyPcs = new PwrGnrSimRoofResponse();

8
src/main/resources/mappers/estimate/estimateMapper.xml
View File

@ -1438,10 +1438,14 @@
<update id="updatePlanConfirmSync" parameterType="com.interplug.qcast.biz.estimate.dto.PlanSyncResponse"> <update id="updatePlanConfirmSync" parameterType="com.interplug.qcast.biz.estimate.dto.PlanSyncResponse">
/* sqlid : com.interplug.qcast.biz.estimate.updatePlanConfirmSync */ /* sqlid : com.interplug.qcast.biz.estimate.updatePlanConfirmSync */
UPDATE T_PLAN UPDATE T_PLAN
SET LAST_EDIT_DATETIME = GETDATE()
, LAST_EDIT_USER = 'system'
WHERE OBJECT_NO = #{objectNo}
AND PLAN_NO = #{planNo};
UPDATE T_PLAN_INFO
SET SET
ORDER_FLG = '1' ORDER_FLG = '1'
, LAST_EDIT_DATETIME = GETDATE()
, LAST_EDIT_USER = 'system'
WHERE OBJECT_NO = #{objectNo} WHERE OBJECT_NO = #{objectNo}
AND PLAN_NO = #{planNo} AND PLAN_NO = #{planNo}
</update> </update>