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

Merge pull request '[1765] 출력한 견적서의 지붕 면이 이중으로 표시' (#440) from dev into dev-deploy

Browse Source 
Reviewed-on: #440
This commit is contained in:
ysCha 2026-03-20 17:45:03 +09:00
commit 49babdb45c
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -474,7 +474,7 @@
<select id="selectEstimateRoofList" parameterType="com.interplug.qcast.biz.estimate.dto.EstimateRequest" resultType="com.interplug.qcast.biz.estimate.dto.RoofResponse"> <select id="selectEstimateRoofList" parameterType="com.interplug.qcast.biz.estimate.dto.EstimateRequest" resultType="com.interplug.qcast.biz.estimate.dto.RoofResponse">
/* sqlid : com.interplug.qcast.biz.estimate.selectEstimateRoofList */ /* sqlid : com.interplug.qcast.biz.estimate.selectEstimateRoofList */
SELECT DISTINCT SELECT
P.OBJECT_NO P.OBJECT_NO
, P.PLAN_NO , P.PLAN_NO
, CASE WHEN ISNUMERIC(P.SETUP_HEIGHT) = 1 THEN CAST(CONVERT(FLOAT, P.SETUP_HEIGHT) AS INT) ELSE 0 END AS SETUP_HEIGHT , CASE WHEN ISNUMERIC(P.SETUP_HEIGHT) = 1 THEN CAST(CONVERT(FLOAT, P.SETUP_HEIGHT) AS INT) ELSE 0 END AS SETUP_HEIGHT
@ -496,7 +496,11 @@
INNER JOIN T_PLAN_INFO PI WITH (NOLOCK) INNER JOIN T_PLAN_INFO PI WITH (NOLOCK)
ON P.OBJECT_NO = PI.OBJECT_NO ON P.OBJECT_NO = PI.OBJECT_NO
AND P.PLAN_NO = PI.PLAN_NO AND P.PLAN_NO = PI.PLAN_NO
INNER JOIN T_PART_ROOF_ESTIMATE RE WITH (NOLOCK) INNER JOIN (
SELECT *,
ROW_NUMBER() OVER (PARTITION BY OBJECT_NO, PLAN_NO, ROOF_MATERIAL_ID ORDER BY CREATE_DATETIME) AS RE_RN
FROM T_PART_ROOF_ESTIMATE WITH (NOLOCK)
) RE
ON P.OBJECT_NO = RE.OBJECT_NO ON P.OBJECT_NO = RE.OBJECT_NO
AND P.PLAN_NO = RE.PLAN_NO AND P.PLAN_NO = RE.PLAN_NO
LEFT OUTER JOIN M_COMM_L C1 WITH (NOLOCK) LEFT OUTER JOIN M_COMM_L C1 WITH (NOLOCK)
@ -508,10 +512,22 @@
LEFT OUTER JOIN M_COMM_L C3 WITH (NOLOCK) LEFT OUTER JOIN M_COMM_L C3 WITH (NOLOCK)
ON C3.HEAD_CD = '201300' ON C3.HEAD_CD = '201300'
AND RE.CONSTRUCT_SPECIFICATION = C3.CODE AND RE.CONSTRUCT_SPECIFICATION = C3.CODE
LEFT OUTER JOIN TB_CANVAS_ROOF_MATERIALS_ADD CR WITH (NOLOCK) OUTER APPLY (
ON P.OBJECT_NO = CR.OBJECT_NO SELECT ROOF_HAJEBICHI
AND P.PLAN_NO = CR.PLAN_NO FROM (
AND RE.ROOF_MATERIAL_ID = CR.ROOF_MATL_CD SELECT ROOF_HAJEBICHI,
ROW_NUMBER() OVER (ORDER BY ROOF_SEQ) AS SEQ_RN,
COUNT(*) OVER () AS TOTAL_CNT
FROM TB_CANVAS_ROOF_MATERIALS_ADD WITH (NOLOCK)
WHERE OBJECT_NO = P.OBJECT_NO
AND PLAN_NO = P.PLAN_NO
AND ROOF_MATL_CD = RE.ROOF_MATERIAL_ID
) NUMBERED
WHERE NUMBERED.SEQ_RN = CASE
WHEN RE.RE_RN <![CDATA[<=]> NUMBERED.TOTAL_CNT THEN RE.RE_RN
ELSE 1
END
) CR
WHERE P.OBJECT_NO = #{objectNo} WHERE P.OBJECT_NO = #{objectNo}
AND P.PLAN_NO = #{planNo} AND P.PLAN_NO = #{planNo}
</select> </select>