Merge pull request '[1096] 담당자명 원본 견적서를 계속 표시하고 있음' (#74) from feature/cha into dev

Reviewed-on: #74

src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java

@@ -899,6 +899,7 @@ public class EstimateService {
       // [4]. 견적서 복사
       estimateCopyRequest.setCopyObjectNo(objectRequest.getObjectNo());
       estimateCopyRequest.setCopyPlanNo("1");
+      estimateCopyRequest.setCopyReceiveUser(objectRequest.getReceiveUser()); //담당자
       estimateMapper.insertEstimateCopy(estimateCopyRequest);
       estimateMapper.insertEstimateInfoCopy(estimateCopyRequest);
       estimateMapper.insertCanvasPopupStatusCopy(estimateCopyRequest);

src/main/resources/config/application-dev.yml

@@ -51,7 +51,7 @@ file:
   root.path: /home/development/public/files
   ini.root.path: /home/development/public/files/NewEstimate
   ini.base.filename: 料金シミュレーション.ini
-  ini.drawing.img.path: https://files.hanasys.jp/Drawing
+  ini.drawing.img.path: https://files.hanasys.jp/Drawing/dev
 
 front:
   url: http://1.248.227.176:3000

src/main/resources/config/application-prd.yml

@@ -6,12 +6,12 @@ server:
 spring:
   datasource:
     driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-#    jdbc-url: jdbc:log4jdbc:sqlserver://10.31.0.21:1433;databaseName=NEWPVCAD;encrypt=false;trustServerCertificate=true
-#    username: pvDBuser
-#    password: ENC(Zc3J45rtPR/uQDeDOcrnF/iGLlU6U3y6)
-    jdbc-url: jdbc:log4jdbc:sqlserver://124.35.22.21:1433;databaseName=NEWPVCAD;encrypt=false;trustServerCertificate=false
-    password: ENC(Zc3J45rtPR/uQDeDOcrnF/iGLlU6U3y6)
+    jdbc-url: jdbc:log4jdbc:sqlserver://10.31.0.21:1433;databaseName=NEWPVCAD;encrypt=false;trustServerCertificate=true
     username: pvDBuser
+    password: ENC(Zc3J45rtPR/uQDeDOcrnF/iGLlU6U3y6)
+#    jdbc-url: jdbc:log4jdbc:sqlserver://124.35.22.21:1433;databaseName=NEWPVCAD;encrypt=false;trustServerCertificate=false
+#    password: ENC(Zc3J45rtPR/uQDeDOcrnF/iGLlU6U3y6)
+#    username: pvDBuser
     maximum-pool-size: 4
     pool-name: Master-HikariPool
   jackson:
@@ -31,7 +31,7 @@ batch:
 #QSP url 하나시스개발 #http://121.168.9.37:8080
 #QSP url interplug dev #http://1.248.227.176:8120
 qsp:
-  url: http://121.168.9.37:8080
+  url: https://jp.qsalesplatform.com
   master-store-batch-url: /api/master/storeAdditionalInfo
   master-material-batch-url: /api/master/materialList
   master-bom-batch-url: /api/master/bomList
@@ -50,7 +50,7 @@ file:
   root.path: /home/production/public/files
   ini.root.path: /home/production/public/files/NewEstimate
   ini.base.filename: 料金シミュレーション.ini
-  ini.drawing.img.path: https://files.hanasys.jp/Drawing
+  ini.drawing.img.path: https://files.hanasys.jp/Drawing/prd
 
 front:
   url: https://hanasys.jp

src/main/resources/mappers/estimate/estimateMapper.xml

@@ -1180,7 +1180,7 @@
             , P.SUPPORT_METHOD_ID
             , P.MODULE_MODEL
             , GETDATE() AS DRAWING_ESTIMATE_CREATE_DATE
-            , P.CHARGER
+            , #{copyReceiveUser} AS CHARGER
             , P.ESTIMATE_VALIDITY_TERM
             , P.DECISION_PLAN
             , P.NUMBER

src/main/resources/mappers/pwrGnrSimulation/pwrGnrSimMapper.xml

@@ -81,7 +81,12 @@
                  , B.ITEM_ID
                  , SUM(B.AMOUNT) AS AMOUNT
                  , B.ITEM_NO
-                 , ISNULL((SUM(B.AMOUNT) * TRY_CAST(MAX(B.SPECIFICATION) AS FLOAT)),0) AS TOT_SPECIFICATION /* 용량 */
+                 , ISNULL((SUM(B.AMOUNT) *
+                           CASE
+                               WHEN ISNUMERIC(MAX(B.SPECIFICATION)) = 1 THEN CAST(MAX(B.SPECIFICATION) AS FLOAT)
+                               ELSE NULL -- 또는 기본값 (예: 0)으로 대체할 수도 있음
+                               END
+                              ),0) AS TOT_SPECIFICATION /* 용량 */
                  , MAX(C.ITEM_GROUP) AS ITEM_GROUP /* 추후 지붕재테이블로 봐야함. */
                  , MAX(D.TEMP_LOSS) AS TEMP_LOSS
                  , MAX(D.TEMP_COEFF ) AS TEMP_COEFF