Compare commits

..

No commits in common. "f5a585f0503e64b40191d101afdcbe50ee91e40c" and "353f780bb9577b179be162e5ae6345a015951b32" have entirely different histories.

3 changed files with 112 additions and 78 deletions

View File

@ -1824,10 +1824,6 @@ public class EstimateService {
byte[] excelBytes = byte[] excelBytes =
excelUtil.download(request, response, excelData, excelList, excelTemplateNam); excelUtil.download(request, response, excelData, excelList, excelTemplateNam);
if (excelBytes == null || excelBytes.length == 0) {
throw new RuntimeException("Excel template processing returned empty result. Template: " + excelTemplateNam);
}
InputStream in = new ByteArrayInputStream(excelBytes); InputStream in = new ByteArrayInputStream(excelBytes);
workbook = WorkbookFactory.create(in); // JXLS POI 엑셀로 재변환 workbook = WorkbookFactory.create(in); // JXLS POI 엑셀로 재변환

View File

@ -69,8 +69,7 @@ public class ExcelUtil {
excelBytes = byteArrayOutputStream.toByteArray(); excelBytes = byteArrayOutputStream.toByteArray();
} }
} catch (Exception e) { } catch (Exception e) {
log.error("ExcelUtil.download error: {}", e.getMessage(), e); log.debug(e.getMessage());
throw new RuntimeException("Excel template processing failed", e);
} }
return excelBytes; return excelBytes;
@ -119,8 +118,7 @@ public class ExcelUtil {
JxlsHelper.getInstance().processTemplate(is, os, context); JxlsHelper.getInstance().processTemplate(is, os, context);
} }
} catch (Exception e) { } catch (Exception e) {
log.error("ExcelUtil.download error: {}", e.getMessage(), e); log.debug(e.getMessage());
throw new RuntimeException("Excel template processing failed", e);
} }
} }

View File

@ -396,76 +396,116 @@
<select id="selectEstimateRoofCertVolKw" parameterType="com.interplug.qcast.biz.estimate.dto.EstimateRequest" resultType="String"> <select id="selectEstimateRoofCertVolKw" parameterType="com.interplug.qcast.biz.estimate.dto.EstimateRequest" resultType="String">
/* sqlid : com.interplug.qcast.biz.estimate.selectEstimateRoofCertVolKw */ /* sqlid : com.interplug.qcast.biz.estimate.selectEstimateRoofCertVolKw */
<![CDATA[ <![CDATA[
;WITH SELECT
CS AS ( CAST(
SELECT SUM(
cie.CIRCUIT_NO, cie.OBJECT_NO, cie.PLAN_NO, CASE
cie.ITEM_ID AS CIRCUIT_ITEM_ID, cie.CIRCUIT_CFG, WHEN (X.M_VOL_KW + X.M_VOL_KW2) < X.PC_VOL_KW THEN (X.M_VOL_KW + X.M_VOL_KW2)
(SELECT SUM(CAST(LTRIM(RTRIM(x.X.value('.','VARCHAR(10)'))) AS INT)) WHEN X.PC_VOL_KW <= (X.M_VOL_KW + X.M_VOL_KW2) THEN X.PC_VOL_KW
FROM (SELECT CAST('<X>'+REPLACE(cie.CIRCUIT_CFG,',','</X><X>')+'</X>' AS XML) AS d) t ELSE 0
CROSS APPLY t.d.nodes('/X') AS x(X) END
) AS CIRCUIT_SUM ) AS DECIMAL(18,3)
FROM T_PART_CIRCUIT_ITEM_ESTIMATE cie ) AS CERT_VOL_KW
WHERE cie.OBJECT_NO = #{objectNo} AND cie.PLAN_NO = #{planNo} FROM (
AND cie.CIRCUIT_CFG IS NOT NULL SELECT DISTINCT
), Y.M_ITEM_ID,
CC AS ( Y.M_SPEC,
SELECT cs.*, (Y.M_AMT2 - Y.M_AMT) AS M_CNT,
ISNULL((SELECT SUM(c2.CIRCUIT_SUM) FROM CS c2 ROUND((Y.M_AMT * CAST(ISNULL(Y.M_SPEC, 0) AS FLOAT) / 1000), 4) AS M_VOL,
WHERE c2.OBJECT_NO=cs.OBJECT_NO AND c2.PLAN_NO=cs.PLAN_NO ROUND((Y.M_AMT2 * CAST(ISNULL(Y.M_SPEC, 0) AS FLOAT) / 1000), 4) AS M_VOL2,
AND c2.CIRCUIT_NO < cs.CIRCUIT_NO), 0) AS CUM_START, ROUND(((Y.M_AMT2 - Y.M_AMT) * CAST(ISNULL(Y.M_SPEC, 0) AS FLOAT) / 1000), 4) AS R_VOL,
ISNULL((SELECT SUM(c2.CIRCUIT_SUM) FROM CS c2 CASE
WHERE c2.OBJECT_NO=cs.OBJECT_NO AND c2.PLAN_NO=cs.PLAN_NO WHEN Y.M_AMT < Y.M_AMT2
AND c2.CIRCUIT_NO <= cs.CIRCUIT_NO), 0) AS CUM_END THEN ROUND((Y.M_AMT * CAST(ISNULL(Y.M_SPEC, 0) AS FLOAT) / 1000), 4)
FROM CS cs ELSE
), ROUND((Y.M_AMT2 * CAST(ISNULL(Y.M_SPEC, 0) AS FLOAT) / 1000), 4)
RC AS ( END AS M_VOL_KW,
SELECT ROUND((Y.P_AMT * CAST(ISNULL(Y.P_SPEC, 0) AS FLOAT) / 1000), 4) AS PC_VOL_KW,
rie.ROOF_ITEM_NO, rie.ROOF_SURFACE_ID, rie.OBJECT_NO, rie.PLAN_NO, CASE
rie.ITEM_ID AS ROOF_ITEM_ID, rie.ITEM_NAME, WHEN 0 < (Y.M_AMT2 - Y.M_AMT)
CAST(rie.SPECIFICATION AS FLOAT) AS SPEC, rie.AMOUNT, rie.PC_ITEM_ID, THEN ROUND(((Y.M_AMT2 - Y.M_AMT) * CAST(ISNULL(Y.M_SPEC2, 0) AS FLOAT) / 1000), 4)
ISNULL((SELECT SUM(r2.AMOUNT) FROM T_PART_ROOF_ITEM_ESTIMATE r2 ELSE 0
WHERE r2.OBJECT_NO=rie.OBJECT_NO AND r2.PLAN_NO=rie.PLAN_NO END AS M_VOL_KW2
AND r2.ROOF_SURFACE_ID=rie.ROOF_SURFACE_ID FROM (
AND r2.ROOF_ITEM_NO < rie.ROOF_ITEM_NO), 0) AS CUM_START, SELECT
ISNULL((SELECT SUM(r2.AMOUNT) FROM T_PART_ROOF_ITEM_ESTIMATE r2 ZC.ROOF_ITEM_NO,
WHERE r2.OBJECT_NO=rie.OBJECT_NO AND r2.PLAN_NO=rie.PLAN_NO ZC.M_ITEM_ID,
AND r2.ROOF_SURFACE_ID=rie.ROOF_SURFACE_ID ZC.M_SPEC,
AND r2.ROOF_ITEM_NO <= rie.ROOF_ITEM_NO), 0) AS CUM_END ZC.M_AMT,
FROM T_PART_ROOF_ITEM_ESTIMATE rie (ZC.M_1 + ZC.M_2 + ZC.M_3) AS M_AMT2,
WHERE rie.OBJECT_NO = #{objectNo} AND rie.PLAN_NO = #{planNo} ZC.P_ITEM_ID,
), ZC.P_AMT,
ALLOC AS ( ZC.PC_ITEM_ID,
SELECT ZC.QCAST_CUST_PRD_ID,
cc.CIRCUIT_NO, cc.CIRCUIT_ITEM_ID, cc.CIRCUIT_CFG, cc.CIRCUIT_SUM, CASE
rc.ROOF_ITEM_NO, rc.ROOF_ITEM_ID, rc.SPEC, rc.PC_ITEM_ID, WHEN ZC.P_SPEC != '0' THEN P_SPEC
-- 할당량 = MIN(끝,끝) - MAX(시작,시작) WHEN ZC.CUST_SPEC != '0' THEN CUST_SPEC
CASE WHEN cc.CUM_END < rc.CUM_END THEN cc.CUM_END ELSE rc.CUM_END END WHEN ZC.PC_SPEC != '0' THEN PC_SPEC
- CASE WHEN cc.CUM_START > rc.CUM_START THEN cc.CUM_START ELSE rc.CUM_START END AS ALLOCATED_QTY ELSE '0'
FROM CC cc END AS P_SPEC,
INNER JOIN RC rc ON cc.OBJECT_NO = rc.OBJECT_NO AND cc.PLAN_NO = rc.PLAN_NO (SELECT SPECIFICATION
WHERE cc.CUM_START < rc.CUM_END AND cc.CUM_END > rc.CUM_START FROM T_PART_ROOF_ITEM_ESTIMATE
), WHERE OBJECT_NO = ZC.OBJECT_NO
DETAIL AS ( AND PLAN_NO = ZC.PLAN_NO
SELECT AND ROOF_ITEM_NO = (ZC.ROOF_ITEM_NO + 1)) AS M_SPEC2
a.CIRCUIT_NO, a.CIRCUIT_ITEM_ID, a.CIRCUIT_CFG, a.CIRCUIT_SUM, FROM (
a.ROOF_ITEM_NO, a.ROOF_ITEM_ID, a.ALLOCATED_QTY, SELECT
ROUND(a.SPEC, 3) * a.ALLOCATED_QTY AS SPEC_X_QTY, Z.*,
(SELECT mi.PNOW_W FROM M_ITEM mi WHERE mi.ITEM_ID = a.CIRCUIT_ITEM_ID) AS PNOW_W CAST(ISNULL(SPLIT.M_1, 0) AS INT) AS M_1,
FROM ALLOC a CAST(ISNULL(SPLIT.M_2, 0) AS INT) AS M_2,
), CAST(ISNULL(SPLIT.M_3, 0) AS INT) AS M_3
CIRCUIT_AGG AS ( FROM (
SELECT SELECT
CIRCUIT_NO, CIRCUIT_ITEM_ID, CIRCUIT_CFG, CIRCUIT_SUM, TRI.ROOF_ITEM_NO,
SUM(SPEC_X_QTY) AS SUM_SPEC_X_QTY, PNOW_W, TRI.OBJECT_NO,
CASE WHEN SUM(SPEC_X_QTY) <= PNOW_W THEN SUM(SPEC_X_QTY) ELSE PNOW_W END AS MIN_VALUE TRI.PLAN_NO,
FROM DETAIL TRI.ITEM_ID AS M_ITEM_ID,
GROUP BY CIRCUIT_NO, CIRCUIT_ITEM_ID, CIRCUIT_CFG, CIRCUIT_SUM, PNOW_W TRI.ITEM_NO,
) TRI.SPECIFICATION AS M_SPEC,
TRI.AMOUNT AS M_AMT,
SELECT ROUND((SUM(MIN_VALUE) / 1000), 4) AS CERT_VOL_KW TCI.ITEM_ID AS P_ITEM_ID,
FROM CIRCUIT_AGG TRI.PC_ITEM_ID,
TRI.QCAST_CUST_PRD_ID,
TCI.P_AMT,
(SELECT ISNULL(M.PNOW_W,0) FROM M_ITEM M WHERE M.ITEM_ID = TCI.ITEM_ID) AS P_SPEC,
(SELECT ISNULL(M.PNOW_W,0) FROM M_ITEM M WHERE M.ITEM_ID = TRI.PC_ITEM_ID) AS PC_SPEC,
(SELECT ISNULL(M.PNOW_W,0) FROM M_ITEM M WHERE M.ITEM_ID = TRI.QCAST_CUST_PRD_ID) AS CUST_SPEC,
TCI.CIRCUIT_CFG
FROM T_PART_ROOF_ITEM_ESTIMATE TRI
INNER JOIN (
SELECT
TI.CIRCUIT_NO,
TI.OBJECT_NO,
TI.PLAN_NO,
TI.ITEM_ID,
TI.CIRCUIT_CFG,
COUNT(*) AS P_AMT
FROM T_PART_CIRCUIT_ITEM_ESTIMATE TI
GROUP BY TI.CIRCUIT_NO, TI.OBJECT_NO, TI.PLAN_NO, TI.ITEM_ID, TI.CIRCUIT_CFG
) TCI
ON TRI.ROOF_ITEM_NO = TCI.CIRCUIT_NO
AND TRI.OBJECT_NO = TCI.OBJECT_NO
AND TRI.PLAN_NO = TCI.PLAN_NO
WHERE
TRI.OBJECT_NO = #{objectNo}
AND TRI.PLAN_NO = #{planNo}
) Z
CROSS APPLY (
SELECT
X.value('(/x[1]/v[1])[1]', 'VARCHAR(50)') AS M_1,
X.value('(/x[1]/v[2])[1]', 'VARCHAR(50)') AS M_2,
X.value('(/x[1]/v[3])[1]', 'VARCHAR(50)') AS M_3
FROM (
SELECT CAST('<x><v>' + REPLACE(ISNULL(Z.CIRCUIT_CFG, ''), ',', '</v><v>') + '</v></x>' AS XML)
) A(X)
) SPLIT
) ZC
INNER JOIN T_PART_ESTIMATE TE
ON ZC.OBJECT_NO = TE.OBJECT_NO
AND ZC.PLAN_NO = TE.PLAN_NO
AND TE.ITEM_ID IN (ZC.P_ITEM_ID, ZC.PC_ITEM_ID, ZC.QCAST_CUST_PRD_ID)
) Y
) X
]]> ]]>
</select> </select>