src/main/java/com/interplug/qcast/batch/system/AdminUserConfiguration.java

@@ -71,7 +71,12 @@ public class AdminUserConfiguration implements JobExecutionListener {
 
   @Bean
   public ItemProcessor<AdminUserSyncResponse, AdminUserSyncResponse> adminUserProcessor() {
-    return item -> item;
+    return item -> {
+      if (item.getCategory() != null && item.getCategory().length() > 20) {
+        item.setCategory(item.getCategory().substring(0, 20));
+      }
+      return item;
+    };
   }
 
   @Bean

src/main/java/com/interplug/qcast/config/Exception/GlobalExceptionHandler.java

@@ -1,6 +1,7 @@
 package com.interplug.qcast.config.Exception;
 
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.HttpRequestMethodNotSupportedException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
@@ -12,6 +13,7 @@ public class GlobalExceptionHandler {
   @ExceptionHandler(HttpRequestMethodNotSupportedException.class)
   protected ResponseEntity<ErrorResponse> handle(HttpRequestMethodNotSupportedException e) {
     return ResponseEntity.badRequest()
+        .contentType(MediaType.APPLICATION_JSON)
         .body(ErrorResponse.of(ErrorCode.METHOD_NOT_ALLOWED.getMessage()));
   }
 
@@ -19,6 +21,7 @@ public class GlobalExceptionHandler {
   protected ResponseEntity<ErrorResponse> handle(BaseException e) {
     final ErrorCode errorCode = e.getErrorCode();
     return ResponseEntity.status(errorCode.getStatus())
+        .contentType(MediaType.APPLICATION_JSON)
         .body(ErrorResponse.of(errorCode.getMessage()));
   }
 
@@ -27,14 +30,18 @@ public class GlobalExceptionHandler {
     final ErrorCode errorCode = e.getErrorCode();
     if (e.getMessage() == null) {
       return ResponseEntity.status(errorCode.getStatus())
+          .contentType(MediaType.APPLICATION_JSON)
           .body(ErrorResponse.of(errorCode.getMessage()));
     }
-    return ResponseEntity.status(errorCode.getStatus()).body(ErrorResponse.of(e.getMessage()));
+    return ResponseEntity.status(errorCode.getStatus())
+        .contentType(MediaType.APPLICATION_JSON)
+        .body(ErrorResponse.of(e.getMessage()));
   }
 
   @ExceptionHandler(Exception.class)
   protected ResponseEntity<ErrorResponse> handle(Exception e) {
     return ResponseEntity.internalServerError()
+        .contentType(MediaType.APPLICATION_JSON)
         .body(ErrorResponse.of(ErrorCode.INTERNAL_SERVER_ERROR.getMessage()));
   }
 }

src/main/java/com/interplug/qcast/util/InterfaceQsp.java

@@ -93,6 +93,7 @@ public class InterfaceQsp {
       sb = new StringBuilder();
       int status = con.getResponseCode();
       if (status == HttpURLConnection.HTTP_OK) {
+        log.info("[DEBUG] QSP Content-Type: {}", con.getContentType());
         br = new BufferedReader(new InputStreamReader(con.getInputStream(), "utf-8"));
 
         String line;

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

@@ -91,91 +91,94 @@
 
     <select id="selectEstimatePdfDetail" parameterType="com.interplug.qcast.biz.estimate.dto.EstimateRequest" resultType="com.interplug.qcast.biz.estimate.dto.EstimateResponse">
         /* sqlid : com.interplug.qcast.biz.estimate.selectPdfEstimateDetail */
-        SELECT Z.*
-             , SS3.ZIP_NO AS ZIP_NO3
-             , SS3.ADDRESS AS ADDRESS3
-             , SS3.TEL AS TEL3
-             , SS3.FAX AS FAX3
-             , CASE WHEN Z.CREATE_USER = 'T01' AND ISNULL(Z.FIRST_AGENT_ID,'') = ''  THEN Z.ZIP_NO2
-                    WHEN Z.CREATE_USER = 'T01' AND ISNULL(Z.FIRST_AGENT_ID,'') != '' THEN SS3.ZIP_NO
-                    ELSE Z.ZIP_NO1 END AS ZIP_NO
-             , CASE WHEN Z.CREATE_USER = 'T01' AND ISNULL(Z.FIRST_AGENT_ID,'') = ''  THEN Z.ADDRESS2
-                    WHEN Z.CREATE_USER = 'T01' AND ISNULL(Z.FIRST_AGENT_ID,'') != '' THEN SS3.ADDRESS
-                    ELSE Z.ADDRESS1 END AS ADDRESS
-             , CASE WHEN Z.CREATE_USER = 'T01' AND ISNULL(Z.FIRST_AGENT_ID,'') = ''  THEN Z.TEL2
-                    WHEN Z.CREATE_USER = 'T01' AND ISNULL(Z.FIRST_AGENT_ID,'') != '' THEN SS3.TEL
-                    ELSE Z.TEL1 END AS TEL
-             , CASE WHEN Z.CREATE_USER = 'T01' AND ISNULL(Z.FIRST_AGENT_ID,'') = ''  THEN Z.FAX2
-                    WHEN Z.CREATE_USER = 'T01' AND ISNULL(Z.FIRST_AGENT_ID,'') != '' THEN SS3.FAX
-                    ELSE Z.FAX1 END AS FAX
-        FROM (
-
-                 SELECT
-        T.*
-        , SS1.SALE_STORE_NAME AS CUST_SALE_STORE_NAME
-        , COALESCE(NULLIF(SS2.DISP_COMPANY_NAME, ''), SS2.SALE_STORE_NAME) AS SALE_STORE_NAME
-        , COALESCE(NULLIF(SS2.DISP_ZIP_NO, ''), SS2.ZIP_NO) AS ZIP_NO1
-        , COALESCE(NULLIF(SS2.DISP_ADDRESS, ''), SS2.ADDRESS) AS ADDRESS1
-        , COALESCE(NULLIF(SS2.DISP_TEL, ''), SS2.TEL) AS TEL1
-        , COALESCE(NULLIF(SS2.DISP_FAX, ''), SS2.FAX) AS FAX1
-        , SSI2.BIZ_NO
-        , SS1.ZIP_NO AS ZIP_NO2
-        , SS1.ADDRESS AS ADDRESS2
-        , SS1.TEL AS TEL2
-        , SS1.FAX AS FAX2
-        , SS1.FIRST_AGENT_ID
-        , (SELECT BC.BUSINESS_TEAM_CD  FROM M_BUSINESS_CHARGER BC WHERE  BC.BUSINESS_CHARGER_CD = T.BUSINESS_CHARGER_CD) AS BUSINESS_TEAM_CD
-        FROM
-        (
         SELECT
-        P.OBJECT_NO
+            T.*
-        , P.PLAN_NO
+             , SS1.SALE_STORE_NAME AS CUST_SALE_STORE_NAME
-        , CONVERT(VARCHAR(10), P.DRAWING_ESTIMATE_CREATE_DATE, 121) AS DRAWING_ESTIMATE_CREATE_DATE
+             , COALESCE(NULLIF(SS2.DISP_COMPANY_NAME, ''), SS2.SALE_STORE_NAME) AS SALE_STORE_NAME
-        , P.ESTIMATE_VALIDITY_TERM
+             <if test='saleStoreId != null and saleStoreId != "T01"'>
-        , P.SNOWFALL
+             , COALESCE(NULLIF(SS2.DISP_ZIP_NO, ''), SS2.ZIP_NO) AS ZIP_NO
-        , CONVERT(NVARCHAR(10), P.LAST_EDIT_DATETIME, 121) AS ESTIMATE_DATE
+             , COALESCE(NULLIF(SS2.DISP_ADDRESS, ''), SS2.ADDRESS) AS ADDRESS
-        , PI.ESTIMATE_TYPE
+             , COALESCE(NULLIF(SS2.DISP_TEL, ''), SS2.TEL) AS TEL
-        , PI.ESTIMATE_OPTION
+             , COALESCE(NULLIF(SS2.DISP_FAX, ''), SS2.FAX) AS FAX
-        , PI.PKG_ASP
+             </if>
-        , PI.REMARKS
+             <if test='saleStoreId != null and saleStoreId == "T01"'>
-        , PI.CREATE_USER
+             , ISNULL((SELECT
-        , O.SALE_STORE_ID
+                    SUBSTRING(MCL.REF_CHR3, CHARINDEX('〒', MCL.REF_CHR3) + 1,
-        , (SELECT SS.BUSINESS_CHARGER_CD FROM M_SALES_STORE SS WHERE SS.SALE_STORE_ID = O.SALE_STORE_ID ) AS BUSINESS_CHARGER_CD
+                        CHARINDEX(')', MCL.REF_CHR3, CHARINDEX('〒', MCL.REF_CHR3)) - CHARINDEX('〒', MCL.REF_CHR3) - 1)
-        , O.OBJECT_NAME
+                  FROM M_COMM_L MCL
-        , O.OBJECT_NAME_OMIT
+                  WHERE MCL.HEAD_CD = '103200'
-        , (SELECT SALE_STORE_ID FROM M_USER WHERE USER_ID = OI.CREATE_USER) AS CREATE_SALE_STORE_ID
+                    AND MCL.CODE = T.BUSINESS_TEAM_CD), '') AS ZIP_NO
-        , ISNULL(MP.PREF_NAME, '') AS PREF_NAME
+             , ISNULL((SELECT
-        , ISNULL(MPA.AREA_NAME, '') AS AREA_NAME
+                    LTRIM(SUBSTRING(MCL.REF_CHR3,
-        , ISNULL(C1.CODE_NM, '') AS STANDARD_WIND_SPEED_NAME
+                        CHARINDEX(')', MCL.REF_CHR3, CHARINDEX('〒', MCL.REF_CHR3)) + 1,
-        FROM T_PLAN P WITH (NOLOCK)
+                        LEN(MCL.REF_CHR3)))
-        INNER JOIN T_PLAN_INFO PI WITH (NOLOCK)
+                  FROM M_COMM_L MCL
-        ON P.OBJECT_NO = PI.OBJECT_NO
+                  WHERE MCL.HEAD_CD = '103200'
-        AND P.PLAN_NO = PI.PLAN_NO
+                    AND MCL.CODE = T.BUSINESS_TEAM_CD), '') AS ADDRESS
-        INNER JOIN T_OBJECT O WITH (NOLOCK)
+             , ISNULL((SELECT MCL.REF_CHR4
-        ON P.OBJECT_NO = O.OBJECT_NO
+                  FROM M_COMM_L MCL
-        INNER JOIN T_OBJECT_INFO OI WITH (NOLOCK)
+                  WHERE MCL.HEAD_CD = '103200'
-        ON O.OBJECT_NO = OI.OBJECT_NO
+                    AND MCL.CODE = T.BUSINESS_TEAM_CD), '') AS TEL
-        LEFT OUTER JOIN T_SIMULATION_PREFECTURE MP WITH (NOLOCK)
+             , ISNULL((SELECT MCL.REF_CHR5
-        ON O.PREF_ID = MP.PREF_ID
+                  FROM M_COMM_L MCL
-        LEFT OUTER JOIN T_SIMULATION_AREA MPA WITH (NOLOCK)
+                  WHERE MCL.HEAD_CD = '103200'
-        ON O.PREF_ID = MPA.PREF_ID
+                    AND MCL.CODE = T.BUSINESS_TEAM_CD), '') AS FAX
-        AND OI.AREA_ID = MPA.AREA_ID
+             </if>
-        AND MPA.DEL_FLG = 0
+             , SSI2.BIZ_NO
-        LEFT OUTER JOIN M_COMM_L C1 WITH (NOLOCK)
+        FROM
-        ON C1.HEAD_CD = '202000'
+            (
-        AND P.STANDARD_WIND_SPEED_ID = C1.CODE
+                SELECT
-        WHERE P.OBJECT_NO = #{objectNo}
+                    P.OBJECT_NO
-        AND P.PLAN_NO = #{planNo}
+                     , P.PLAN_NO
-        ) T
+                     , CONVERT(VARCHAR(10), P.DRAWING_ESTIMATE_CREATE_DATE, 121) AS DRAWING_ESTIMATE_CREATE_DATE
-        LEFT OUTER JOIN M_SALES_STORE SS1 WITH (NOLOCK)
+                     , P.ESTIMATE_VALIDITY_TERM
+                     , P.SNOWFALL
+                     , CONVERT(NVARCHAR(10), P.LAST_EDIT_DATETIME, 121) AS ESTIMATE_DATE
+                     , PI.ESTIMATE_TYPE
+                     , PI.ESTIMATE_OPTION
+                     , PI.PKG_ASP
+                     , PI.REMARKS
+                     , O.SALE_STORE_ID
+                     , O.OBJECT_NAME
+                     , O.OBJECT_NAME_OMIT
+                     , (SELECT SALE_STORE_ID FROM M_USER WHERE USER_ID = OI.CREATE_USER) AS CREATE_SALE_STORE_ID
+                     <if test='saleStoreId != null and saleStoreId == "T01"'>
+                     , (SELECT BC.BUSINESS_TEAM_CD
+                        FROM M_SALES_STORE SS WITH (NOLOCK)
+                        INNER JOIN M_BUSINESS_CHARGER BC WITH (NOLOCK)
+                            ON SS.BUSINESS_CHARGER_CD = BC.BUSINESS_CHARGER_CD
+                        WHERE SS.SALE_STORE_ID = O.SALE_STORE_ID
+                       ) AS BUSINESS_TEAM_CD
+                     </if>
+                     , ISNULL(MP.PREF_NAME, '') AS PREF_NAME
+                     , ISNULL(MPA.AREA_NAME, '') AS AREA_NAME
+                     , ISNULL(C1.CODE_NM, '') AS STANDARD_WIND_SPEED_NAME
+                FROM T_PLAN P WITH (NOLOCK)
+            INNER JOIN T_PLAN_INFO PI WITH (NOLOCK)
+                ON P.OBJECT_NO = PI.OBJECT_NO
+                    AND P.PLAN_NO = PI.PLAN_NO
+                    INNER JOIN T_OBJECT O WITH (NOLOCK)
+                ON P.OBJECT_NO = O.OBJECT_NO
+                    INNER JOIN T_OBJECT_INFO OI WITH (NOLOCK)
+                ON O.OBJECT_NO = OI.OBJECT_NO
+                    LEFT OUTER JOIN T_SIMULATION_PREFECTURE MP WITH (NOLOCK)
+                ON O.PREF_ID = MP.PREF_ID
+                    LEFT OUTER JOIN T_SIMULATION_AREA MPA WITH (NOLOCK)
+                ON O.PREF_ID = MPA.PREF_ID
+                    AND OI.AREA_ID = MPA.AREA_ID
+                    AND MPA.DEL_FLG = 0
+                    LEFT OUTER JOIN M_COMM_L C1 WITH (NOLOCK)
+                ON C1.HEAD_CD = '202000'
+                    AND P.STANDARD_WIND_SPEED_ID = C1.CODE
+                WHERE P.OBJECT_NO = #{objectNo}
+                  AND P.PLAN_NO = #{planNo}
+            ) T
+                LEFT OUTER JOIN M_SALES_STORE SS1 WITH (NOLOCK)
         ON T.SALE_STORE_ID = SS1.SALE_STORE_ID
-        LEFT OUTER JOIN M_SALES_STORE SS2 WITH (NOLOCK)
+            LEFT OUTER JOIN M_SALES_STORE SS2 WITH (NOLOCK)
         ON T.CREATE_SALE_STORE_ID = SS2.SALE_STORE_ID
-        LEFT OUTER JOIN M_SALES_STORE_INFO SSI2 WITH (NOLOCK)
+            LEFT OUTER JOIN M_SALES_STORE_INFO SSI2 WITH (NOLOCK)
         ON T.CREATE_SALE_STORE_ID = SSI2.SALE_STORE_ID
-        )Z
-        LEFT OUTER JOIN M_SALES_STORE SS3 WITH (NOLOCK)
-        ON Z.FIRST_AGENT_ID = SS3.SALE_STORE_ID
     </select>
 
     <select id="selectEstimateApiFailList" resultType="com.interplug.qcast.biz.estimate.dto.EstimateSendResponse">