From 560b96044a6413f0d8bd71079ff5a25add1a294a Mon Sep 17 00:00:00 2001 From: "LAPTOP-L3VE7KK2\\USER" Date: Tue, 14 Jan 2025 09:23:53 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9E=84=EC=8B=9C=EC=A0=80=EC=9E=A5=20?= =?UTF-8?q?=EC=83=81=ED=83=9C=20=EB=B3=80=EA=B2=BD=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qcast/biz/estimate/EstimateMapper.java | 3 ++ .../qcast/biz/estimate/EstimateService.java | 9 +++++- .../mappers/estimate/estimateMapper.xml | 29 +++++++++++++++++++ 3 files changed, 40 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/interplug/qcast/biz/estimate/EstimateMapper.java b/src/main/java/com/interplug/qcast/biz/estimate/EstimateMapper.java index fc7acf1a..407a594c 100644 --- a/src/main/java/com/interplug/qcast/biz/estimate/EstimateMapper.java +++ b/src/main/java/com/interplug/qcast/biz/estimate/EstimateMapper.java @@ -108,6 +108,9 @@ public interface EstimateMapper { // 견적서 복사 public int insertEstimateCopy(EstimateCopyRequest estimateCopyRequest); + // 견적서 도면 아이템 복사 + public int insertEstimateDrawingItemCopy(EstimateCopyRequest estimateCopyRequest); + // Plan 확정 동기화 public int updatePlanConfirmSync(PlanSyncResponse planSyncData); } 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 57d1f494..fd576929 100644 --- a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java +++ b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java @@ -784,6 +784,7 @@ public class EstimateService { itemRequest.setPkgMaterialFlg(itemResponse.getPkgMaterialFlg()); itemRequest.setFileUploadFlg(itemResponse.getFileUploadFlg()); itemRequest.setItemGroup(itemResponse.getItemGroup()); + itemRequest.setOpenFlg(itemResponse.getOpenFlg()); break; } @@ -810,7 +811,7 @@ public class EstimateService { estimateMapper.insertEstimateItem(itemRequest); } - // [6]. 견적서 지붕재 복사 + // [6]. 견적서 지붕재 및 도면 초기 데이터 복사 List roofList = estimateMapper.selectEstimateRoofList(estimateRequest); List roofItemList = estimateMapper.selectEstimateRoofItemList(estimateRequest); List circuitItemList = @@ -868,9 +869,13 @@ public class EstimateService { estimateMapper.insertEstimateCircuitItem(circuitItemRequest); } + // 도면 초기 데이타 복사(초기화 위해 필요) + estimateMapper.insertEstimateDrawingItemCopy(estimateCopyRequest); + // [7]. 견적서 도면 복사 (추후 개발 필요) // [8]. QSP Q.CAST SEND API + /* List resultList = new ArrayList(); estimateRequest.setObjectNo(estimateCopyRequest.getCopyObjectNo()); estimateRequest.setPlanNo(estimateCopyRequest.getCopyPlanNo()); @@ -885,6 +890,7 @@ public class EstimateService { estimateMapper.updateEstimateApi(estimateRequest); } + */ } catch (Exception e) { throw new QcastException(ErrorCode.INTERNAL_SERVER_ERROR); @@ -960,6 +966,7 @@ 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); diff --git a/src/main/resources/mappers/estimate/estimateMapper.xml b/src/main/resources/mappers/estimate/estimateMapper.xml index 09fba332..7e7e8f84 100644 --- a/src/main/resources/mappers/estimate/estimateMapper.xml +++ b/src/main/resources/mappers/estimate/estimateMapper.xml @@ -1011,6 +1011,8 @@ , CONSTRUCT_SPECIFICATION_MULTI , SURFACE_TYPE , ANGLE + , TEMP_FLG + , LOCK_FLG , SYNC_FLG , CREATE_DATETIME , CREATE_USER @@ -1062,6 +1064,8 @@ , P.CONSTRUCT_SPECIFICATION_MULTI , P.SURFACE_TYPE , P.ANGLE + , '1' AS TEMP_FLG + , '0' AS LOCK_FLG , '0' AS SYNC_FLG , GETDATE() AS CREATE_DATETIME , #{userId} AS CREATE_USER @@ -1071,6 +1075,31 @@ AND P.DEL_FLG = '0' + + /* sqlid : com.interplug.qcast.biz.estimate.insertEstimateDrawingItemCopy */ + INSERT INTO T_PART_DRAWING_ESTIMATE + ( + OBJECT_NO + , PLAN_NO + , DISP_ORDER + , ITEM_ID + , AMOUNT + , LAST_EDIT_DATETIME + , LAST_EDIT_USER + ) + SELECT + #{copyObjectNo} AS OBJECT_NO + , #{copyPlanNo} AS PLAN_NO + , PDE.DISP_ORDER + , PDE.ITEM_ID + , PDE.AMOUNT + , GETDATE() AS LAST_EDIT_DATETIME + , #{userId} AS LAST_EDIT_USER + FROM T_PART_DRAWING_ESTIMATE PDE WITH (NOLOCK) + WHERE PDE.OBJECT_NO = #{objectNo} + AND PDE.PLAN_NO = #{planNo} + + /* sqlid : com.interplug.qcast.biz.estimate.updatePlanConfirmSync */ UPDATE T_PLAN