diff --git a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java index 1e5d7383..cf738b13 100644 --- a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java +++ b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java @@ -935,7 +935,6 @@ public class EstimateService { String[] arrItemId = new String[itemList.size()]; int i = 0; for (ItemRequest itemRequest : itemList) { - System.out.println(">>>>>>>>>>>>>>>>" + itemRequest.getItemId()); arrItemId[i++] = itemRequest.getItemId(); } estimateRequest.setArrItemId(arrItemId); @@ -1266,7 +1265,7 @@ public class EstimateService { estimateResponse.setNoteList(noteList); } - // 지붕재 목록 조회 + // 지붕면 목록 조회 RoofInfoResponse roofInfoResponse = new RoofInfoResponse(); List roofList = estimateMapper.selectEstimateRoofList(estimateRequest); List circuitItemList = diff --git a/src/main/resources/mappers/estimate/estimateMapper.xml b/src/main/resources/mappers/estimate/estimateMapper.xml index 1ef6efd6..94c24600 100644 --- a/src/main/resources/mappers/estimate/estimateMapper.xml +++ b/src/main/resources/mappers/estimate/estimateMapper.xml @@ -424,6 +424,7 @@ , T.SLOPE , T.ANGLE , T.CLASS_TYPE + , T.ITEM_ID , SUM(T.AMOUNT) AS AMOUNT , ROUND(SUM(T.AMOUNT * T.SPECIFICATION / 1000), 4) AS VOL_KW FROM @@ -446,8 +447,8 @@ AND P.PLAN_NO = RE.PLAN_NO INNER JOIN T_PART_ROOF_ITEM_ESTIMATE RIE WITH (NOLOCK) ON RE.ROOF_SURFACE_ID = RIE.ROOF_SURFACE_ID - AND RE.OBJECT_NO = RE.OBJECT_NO - AND RE.PLAN_NO = RE.PLAN_NO + AND RE.OBJECT_NO = RIE.OBJECT_NO + AND RE.PLAN_NO = RIE.PLAN_NO INNER JOIN M_ITEM I WITH (NOLOCK) ON RIE.ITEM_ID = I.ITEM_ID WHERE P.OBJECT_NO = #{objectNo} @@ -456,7 +457,8 @@ AND I.ITEM_GROUP = #{schItemGroup} ) T - GROUP BY T.OBJECT_NO, T.PLAN_NO, T.ROOF_SURFACE_ID, T.ROOF_SURFACE, T.SLOPE, T.ANGLE, T.CLASS_TYPE + GROUP BY T.OBJECT_NO, T.PLAN_NO, T.ROOF_SURFACE_ID, T.ROOF_SURFACE, T.SLOPE, T.ANGLE, T.CLASS_TYPE, T.ITEM_ID + ORDER BY T.ROOF_SURFACE_ID, T.ITEM_ID