From 461f399fc4b8c1f69e0301ffbea36afac7b0af65 Mon Sep 17 00:00:00 2001 From: "LAPTOP-L3VE7KK2\\USER" Date: Thu, 13 Feb 2025 18:07:16 +0900 Subject: [PATCH] =?UTF-8?q?Q.CAST=20>=20Q.ORDER=20=EC=8B=9C=EA=B3=B5?= =?UTF-8?q?=ED=83=80=EC=9E=85=20=EC=9A=B0=EC=84=A0=20=EC=84=A0=EC=A0=95=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EA=B0=9C=EB=B0=9C?= 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 | 14 +++++++------ .../mappers/estimate/estimateMapper.xml | 21 +++++++++++++++++++ 3 files changed, 32 insertions(+), 6 deletions(-) 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 2d5c137c..2097c5b2 100644 --- a/src/main/java/com/interplug/qcast/biz/estimate/EstimateMapper.java +++ b/src/main/java/com/interplug/qcast/biz/estimate/EstimateMapper.java @@ -122,4 +122,7 @@ public interface EstimateMapper { // Plan 확정 동기화 public int updatePlanConfirmSync(PlanSyncResponse planSyncData); + + // 견적서 Q.ORDER 연동 시공타입 조회 + public String selectEstimateConstructSpecification(EstimateRequest estimateRequest); } 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 c7d0ba91..4f909227 100644 --- a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java +++ b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java @@ -1709,12 +1709,13 @@ public class EstimateService { if (estimateSendResponse == null) { throw new QcastException(ErrorCode.NOT_FOUND, message.getMessage("common.message.no.data")); } else { + String constructSpecification = + estimateMapper.selectEstimateConstructSpecification(estimateRequest); + estimateSendResponse.setSaveType("3"); estimateSendResponse.setSyncFlg("0"); estimateSendResponse.setConstructSpecification( - !StringUtils.isEmpty(estimateSendResponse.getConstructSpecification()) - ? estimateSendResponse.getConstructSpecification().split("、")[0] - : ""); + !StringUtils.isEmpty(constructSpecification) ? constructSpecification : ""); estimateSendResponse.setDelFlg("1".equals(estimateSendResponse.getDelFlg()) ? "Y" : "N"); // 아이템 목록 조회 @@ -2182,12 +2183,13 @@ public class EstimateService { estimateRequest.setObjectNo(estimateSendResponse.getObjectNo()); estimateRequest.setPlanNo(estimateSendResponse.getPlanNo()); + String constructSpecification = + estimateMapper.selectEstimateConstructSpecification(estimateRequest); + estimateSendResponse.setSaveType("3"); estimateSendResponse.setSyncFlg("0"); estimateSendResponse.setConstructSpecification( - !StringUtils.isEmpty(estimateSendResponse.getConstructSpecification()) - ? estimateSendResponse.getConstructSpecification().split("、")[0] - : ""); + !StringUtils.isEmpty(constructSpecification) ? constructSpecification : ""); estimateSendResponse.setDelFlg("1".equals(estimateSendResponse.getDelFlg()) ? "Y" : "N"); // 아이템 목록 조회 diff --git a/src/main/resources/mappers/estimate/estimateMapper.xml b/src/main/resources/mappers/estimate/estimateMapper.xml index 171dce19..2936d96d 100644 --- a/src/main/resources/mappers/estimate/estimateMapper.xml +++ b/src/main/resources/mappers/estimate/estimateMapper.xml @@ -1205,4 +1205,25 @@ AND PLAN_NO = #{planNo} + + \ No newline at end of file