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

견적서 PDF 다운로드 인증용량 재계산 수정

Browse Source
This commit is contained in:
LAPTOP-L3VE7KK2\USER 2025-01-09 16:49:54 +09:00
parent d5a3e7ed24
commit 9c59324067
2 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -823,7 +823,6 @@ public class EstimateService {
itemRequest.setSpecification(roofItemResponse.getSpecification()); itemRequest.setSpecification(roofItemResponse.getSpecification());
itemRequest.setAmount(roofItemResponse.getAmount()); itemRequest.setAmount(roofItemResponse.getAmount());
itemRequest.setPcItemId(roofItemResponse.getPcItemId()); itemRequest.setPcItemId(roofItemResponse.getPcItemId());
itemRequest.setCircuit(roofItemResponse.getCircuit());
estimateMapper.insertEstimateRoofItem(itemRequest); estimateMapper.insertEstimateRoofItem(itemRequest);
} }

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

@ -298,33 +298,25 @@
SELECT SELECT
P.OBJECT_NO P.OBJECT_NO
, P.PLAN_NO , P.PLAN_NO
, RE.ROOF_NO , PE.ITEM_ID
, RE.ROOF_SURFACE , PE.AMOUNT
, ROUND(CAST(RE.SLOPE AS FLOAT), 2) AS SLOPE , PE.SPECIFICATION
, RIE.AMOUNT , I.ITEM_NAME
, CAST(RIE.SPECIFICATION AS FLOAT) SPECIFICATION , ROUND((PE.AMOUNT * CAST(ISNULL(PE.SPECIFICATION, 0) AS FLOAT) / 1000), 4) AS PC_VOL_KW
, ROUND((RIE.AMOUNT * CAST(ISNULL(RIE.SPECIFICATION, 0) AS FLOAT) / 1000), 4) AS PC_VOL_KW
, I.ITEM_ID
, I.ITEM_NO
, ISNULL(( , ISNULL((
SELECT SELECT
SUM((AMOUNT * CAST(ISNULL(SPECIFICATION, 0) AS FLOAT) / 1000)) SUM((AMOUNT * CAST(ISNULL(SPECIFICATION, 0) AS FLOAT) / 1000))
FROM T_ROOF_ITEM_ESTIMATE FROM T_ROOF_ITEM_ESTIMATE (NOLOCK)
WHERE ROOF_NO = RIE.ROOF_NO WHERE OBJECT_NO = PE.OBJECT_NO
AND OBJECT_NO = RIE.OBJECT_NO AND PLAN_NO = PE.PLAN_NO
AND PLAN_NO = RIE.PLAN_NO AND PC_ITEM_ID = PE.ITEM_ID
AND PC_ITEM_ID = RIE.ITEM_ID
), 0) AS MODULE_VOL_KW ), 0) AS MODULE_VOL_KW
FROM T_PLAN P WITH (NOLOCK) FROM T_PLAN P WITH (NOLOCK)
INNER JOIN T_ROOF_ESTIMATE RE WITH (NOLOCK) INNER JOIN T_PART_ESTIMATE PE WITH (NOLOCK)
ON P.OBJECT_NO = RE.OBJECT_NO ON P.OBJECT_NO = PE.OBJECT_NO
AND P.PLAN_NO = RE.PLAN_NO AND P.PLAN_NO = PE.PLAN_NO
INNER JOIN T_ROOF_ITEM_ESTIMATE RIE WITH (NOLOCK)
ON RE.ROOF_NO = RIE.ROOF_NO
AND RE.OBJECT_NO = RE.OBJECT_NO
AND RE.PLAN_NO = RE.PLAN_NO
INNER JOIN M_ITEM I WITH (NOLOCK) INNER JOIN M_ITEM I WITH (NOLOCK)
ON RIE.ITEM_ID = I.ITEM_ID ON PE.ITEM_ID = I.ITEM_ID
WHERE P.OBJECT_NO = #{objectNo} WHERE P.OBJECT_NO = #{objectNo}
AND P.PLAN_NO = #{planNo} AND P.PLAN_NO = #{planNo}
AND I.ITEM_GROUP = 'PC_' AND I.ITEM_GROUP = 'PC_'
@ -379,7 +371,6 @@
, ISNULL(PIE.SPECIFICATION, '') AS SPECIFICATION , ISNULL(PIE.SPECIFICATION, '') AS SPECIFICATION
, PIE.AMOUNT , PIE.AMOUNT
, PIE.PC_ITEM_ID , PIE.PC_ITEM_ID
, PIE.CIRCUIT
FROM T_ROOF_ITEM_ESTIMATE PIE WITH (NOLOCK) FROM T_ROOF_ITEM_ESTIMATE PIE WITH (NOLOCK)
WHERE PIE.OBJECT_NO = #{objectNo} WHERE PIE.OBJECT_NO = #{objectNo}
AND PIE.PLAN_NO = #{planNo} AND PIE.PLAN_NO = #{planNo}
@ -838,7 +829,6 @@
, SPECIFICATION , SPECIFICATION
, AMOUNT , AMOUNT
, PC_ITEM_ID , PC_ITEM_ID
, CIRCUIT
) )
SELECT SELECT
#{roofNo} AS ROOF_NO #{roofNo} AS ROOF_NO
@ -850,7 +840,6 @@
, I.PNOW_W , I.PNOW_W
, #{amount} , #{amount}
, #{pcItemId} , #{pcItemId}
, #{circuit}
FROM M_ITEM I WITH (NOLOCK) FROM M_ITEM I WITH (NOLOCK)
WHERE I.ITEM_ID = #{itemId} WHERE I.ITEM_ID = #{itemId}
</insert> </insert>