Merge pull request 'dev' (#29) from dev into dev-deploy

Reviewed-on: #29

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

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

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

@@ -43,7 +43,7 @@ spring:
 
 #QSP
 qsp:
-  url: http://localhost:8120
+  url: http://1.248.227.176:8120
   master-store-batch-url: /api/master/storeAdditionalInfo
   master-material-batch-url: /api/master/materialList
   master-bom-batch-url: /api/master/bomList

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

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

src/main/resources/config/application.yml

@@ -72,7 +72,7 @@ file:
   root.path: /home/development/public/files
   ini.root.path: /home/development/public/files/NewEstimate
   ini.base.filename: 料金シミュレーション.ini
-  ini.drawing.img.path: /home/development/public/files/NewEstimate/Drawing
+  ini.drawing.img.path: https://files.hanasys.jp/Drawing
 
 # log
 logging:

src/main/resources/logback/logback-dev-interplug.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:noNamespaceSchemaLocation="http://www.padual.com/java/logback.xsd">
+    <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
+    <springProperty scope="context" name="ACTIVE_PROFILE" source="spring.profiles.active"/>
+    <property name="LOG_HOME" value="c:/qcast3/logs/api/"/>
+    <property name="LOG_FILE" value="${LOG_HOME}${ACTIVE_PROFILE}.qcast.api"/>
+    <property name="LOG_FILE_EXT" value=".log"/>
+
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
+            <charset>${CONSOLE_LOG_CHARSET}</charset>
+        </encoder>
+    </appender>
+
+    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${LOG_FILE}${LOG_FILE_EXT}</file>
+        <encoder>
+            <pattern>${FILE_LOG_PATTERN}</pattern>
+            <charset>${FILE_LOG_CHARSET}</charset>
+        </encoder>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_FILE}.%d{yyyy-MM-dd}${LOG_FILE_EXT}</fileNamePattern>
+        </rollingPolicy>
+    </appender>
+
+    <logger name="jdbc" level="warn"/>
+    <logger name="com.zaxxer.hikari" level="info"/>
+    <logger name="jdbc.sqltiming" level="debug"/>
+
+    <logger name="com.interplug.qcast" level="debug"/>
+
+    <root level="warn">
+        <appender-ref ref="CONSOLE"/>
+        <appender-ref ref="FILE"/>
+    </root>
+
+</configuration>

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

@@ -362,7 +362,12 @@
     <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
+              -- 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
         FROM
         (
             SELECT