Compare commits

..

No commits in common. "3a1a85caaec03b5179068afe6d9f5abf56228f9e" and "1de1a09f5d539cda0b00ffe712b2e05623b326ef" have entirely different histories.

2 changed files with 195 additions and 192 deletions

View File

@ -10,6 +10,7 @@ import java.math.BigDecimal;
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLConnection;
import java.security.cert.X509Certificate;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
@ -72,6 +73,7 @@ import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@Slf4j
@Service
@RequiredArgsConstructor
@ -1495,12 +1497,18 @@ public class EstimateService {
estimateResponse.setPwrGnrSim(pwrGnrSimResponse);
// 도면 이미지 셋팅
String baseDrawingImgName = estimateRequest.getObjectNo() + "_" + estimateRequest.getPlanNo();
URL url = new URL(drawingDirPath + File.separator + baseDrawingImgName + "_1.png");
URLConnection con = url.openConnection();
HttpURLConnection exitCode = (HttpURLConnection)con;
HttpURLConnection exitCode = (HttpURLConnection) con;
System.err.println("exitCode: " + exitCode);
System.err.println("Exit code: " + exitCode.getResponseCode());
if (exitCode.getResponseCode() == 200) {
InputStream imageInputStream =
new URL(drawingDirPath + File.separator + baseDrawingImgName + "_1.png").openStream();
@ -1517,7 +1525,7 @@ public class EstimateService {
String baseDrawingImgName2 = estimateRequest.getObjectNo() + "_" + estimateRequest.getPlanNo();
URL url2 = new URL(drawingDirPath + File.separator + baseDrawingImgName2 + "_2.png");
URLConnection con2 = url2.openConnection();
HttpURLConnection exitCode2 = (HttpURLConnection)con2;
HttpURLConnection exitCode2 = (HttpURLConnection) con2;
if (exitCode2.getResponseCode() == 200) {
InputStream imageInputStream2 =
new URL(drawingDirPath + File.separator + baseDrawingImgName2 + "_2.png").openStream();

View File

@ -362,12 +362,7 @@
<select id="selectEstimateRoofCertVolKw" parameterType="com.interplug.qcast.biz.estimate.dto.EstimateRequest" resultType="String">
/* sqlid : com.interplug.qcast.biz.estimate.selectEstimateRoofCertVolKw */
SELECT
-- FORMAT(ISNULL(SUM(CASE WHEN T.MODULE_VOL_KW <![CDATA[ <= ]]> T.PC_VOL_KW THEN T.MODULE_VOL_KW ELSE T.PC_VOL_KW END), 0), '#,##0.000') AS CERT_VOL_KW
REPLACE(CONVERT(VARCHAR, CAST(ISNULL(SUM(
CASE
WHEN T.MODULE_VOL_KW <![CDATA[ <= ]]> T.PC_VOL_KW THEN T.MODULE_VOL_KW
ELSE T.PC_VOL_KW
END), 0) AS NUMERIC(18, 3)), 1), ',', '') AS CERT_VOL_KW
FORMAT(ISNULL(SUM(CASE WHEN T.MODULE_VOL_KW <![CDATA[ <= ]]> T.PC_VOL_KW THEN T.MODULE_VOL_KW ELSE T.PC_VOL_KW END), 0), '#,##0.000') AS CERT_VOL_KW
FROM
(
SELECT