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

@@ -71,12 +71,7 @@ public class AdminUserConfiguration implements JobExecutionListener {
 
   @Bean
   public ItemProcessor<AdminUserSyncResponse, AdminUserSyncResponse> adminUserProcessor() {
-    return item -> {
+    return item -> 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,7 +1,6 @@
 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;
@@ -13,7 +12,6 @@ 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()));
   }
 
@@ -21,7 +19,6 @@ 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()));
   }
 
@@ -30,18 +27,14 @@ 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())
+    return ResponseEntity.status(errorCode.getStatus()).body(ErrorResponse.of(e.getMessage()));
-        .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,7 +93,6 @@ 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,94 +91,91 @@
 
     <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
+        SELECT Z.*
-            T.*
+             , SS3.ZIP_NO AS ZIP_NO3
-             , SS1.SALE_STORE_NAME AS CUST_SALE_STORE_NAME
+             , SS3.ADDRESS AS ADDRESS3
-             , COALESCE(NULLIF(SS2.DISP_COMPANY_NAME, ''), SS2.SALE_STORE_NAME) AS SALE_STORE_NAME
+             , SS3.TEL AS TEL3
-             <if test='saleStoreId != null and saleStoreId != "T01"'>
+             , SS3.FAX AS FAX3
-             , COALESCE(NULLIF(SS2.DISP_ZIP_NO, ''), SS2.ZIP_NO) AS ZIP_NO
+             , CASE WHEN Z.CREATE_USER = 'T01' AND ISNULL(Z.FIRST_AGENT_ID,'') = ''  THEN Z.ZIP_NO2
-             , COALESCE(NULLIF(SS2.DISP_ADDRESS, ''), SS2.ADDRESS) AS ADDRESS
+                    WHEN Z.CREATE_USER = 'T01' AND ISNULL(Z.FIRST_AGENT_ID,'') != '' THEN SS3.ZIP_NO
-             , COALESCE(NULLIF(SS2.DISP_TEL, ''), SS2.TEL) AS TEL
+                    ELSE Z.ZIP_NO1 END AS ZIP_NO
-             , COALESCE(NULLIF(SS2.DISP_FAX, ''), SS2.FAX) AS FAX
+             , CASE WHEN Z.CREATE_USER = 'T01' AND ISNULL(Z.FIRST_AGENT_ID,'') = ''  THEN Z.ADDRESS2
-             </if>
+                    WHEN Z.CREATE_USER = 'T01' AND ISNULL(Z.FIRST_AGENT_ID,'') != '' THEN SS3.ADDRESS
-             <if test='saleStoreId != null and saleStoreId == "T01"'>
+                    ELSE Z.ADDRESS1 END AS ADDRESS
-             , ISNULL((SELECT
+             , CASE WHEN Z.CREATE_USER = 'T01' AND ISNULL(Z.FIRST_AGENT_ID,'') = ''  THEN Z.TEL2
-                    SUBSTRING(MCL.REF_CHR3, CHARINDEX('〒', MCL.REF_CHR3) + 1,
+                    WHEN Z.CREATE_USER = 'T01' AND ISNULL(Z.FIRST_AGENT_ID,'') != '' THEN SS3.TEL
-                        CHARINDEX(')', MCL.REF_CHR3, CHARINDEX('〒', MCL.REF_CHR3)) - CHARINDEX('〒', MCL.REF_CHR3) - 1)
+                    ELSE Z.TEL1 END AS TEL
-                  FROM M_COMM_L MCL
+             , CASE WHEN Z.CREATE_USER = 'T01' AND ISNULL(Z.FIRST_AGENT_ID,'') = ''  THEN Z.FAX2
-                  WHERE MCL.HEAD_CD = '103200'
+                    WHEN Z.CREATE_USER = 'T01' AND ISNULL(Z.FIRST_AGENT_ID,'') != '' THEN SS3.FAX
-                    AND MCL.CODE = T.BUSINESS_TEAM_CD), '') AS ZIP_NO
+                    ELSE Z.FAX1 END AS FAX
-             , ISNULL((SELECT
+        FROM (
-                    LTRIM(SUBSTRING(MCL.REF_CHR3,
+
-                        CHARINDEX(')', MCL.REF_CHR3, CHARINDEX('〒', MCL.REF_CHR3)) + 1,
+                 SELECT
-                        LEN(MCL.REF_CHR3)))
+        T.*
-                  FROM M_COMM_L MCL
+        , SS1.SALE_STORE_NAME AS CUST_SALE_STORE_NAME
-                  WHERE MCL.HEAD_CD = '103200'
+        , COALESCE(NULLIF(SS2.DISP_COMPANY_NAME, ''), SS2.SALE_STORE_NAME) AS SALE_STORE_NAME
-                    AND MCL.CODE = T.BUSINESS_TEAM_CD), '') AS ADDRESS
+        , COALESCE(NULLIF(SS2.DISP_ZIP_NO, ''), SS2.ZIP_NO) AS ZIP_NO1
-             , ISNULL((SELECT MCL.REF_CHR4
+        , COALESCE(NULLIF(SS2.DISP_ADDRESS, ''), SS2.ADDRESS) AS ADDRESS1
-                  FROM M_COMM_L MCL
+        , COALESCE(NULLIF(SS2.DISP_TEL, ''), SS2.TEL) AS TEL1
-                  WHERE MCL.HEAD_CD = '103200'
+        , COALESCE(NULLIF(SS2.DISP_FAX, ''), SS2.FAX) AS FAX1
-                    AND MCL.CODE = T.BUSINESS_TEAM_CD), '') AS TEL
+        , SSI2.BIZ_NO
-             , ISNULL((SELECT MCL.REF_CHR5
+        , SS1.ZIP_NO AS ZIP_NO2
-                  FROM M_COMM_L MCL
+        , SS1.ADDRESS AS ADDRESS2
-                  WHERE MCL.HEAD_CD = '103200'
+        , SS1.TEL AS TEL2
-                    AND MCL.CODE = T.BUSINESS_TEAM_CD), '') AS FAX
+        , SS1.FAX AS FAX2
-             </if>
+        , SS1.FIRST_AGENT_ID
-             , SSI2.BIZ_NO
+        , (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
+        SELECT
-                    P.OBJECT_NO
+        P.OBJECT_NO
-                     , P.PLAN_NO
+        , P.PLAN_NO
-                     , CONVERT(VARCHAR(10), P.DRAWING_ESTIMATE_CREATE_DATE, 121) AS DRAWING_ESTIMATE_CREATE_DATE
+        , CONVERT(VARCHAR(10), P.DRAWING_ESTIMATE_CREATE_DATE, 121) AS DRAWING_ESTIMATE_CREATE_DATE
-                     , P.ESTIMATE_VALIDITY_TERM
+        , P.ESTIMATE_VALIDITY_TERM
-                     , P.SNOWFALL
+        , P.SNOWFALL
-                     , CONVERT(NVARCHAR(10), P.LAST_EDIT_DATETIME, 121) AS ESTIMATE_DATE
+        , CONVERT(NVARCHAR(10), P.LAST_EDIT_DATETIME, 121) AS ESTIMATE_DATE
-                     , PI.ESTIMATE_TYPE
+        , PI.ESTIMATE_TYPE
-                     , PI.ESTIMATE_OPTION
+        , PI.ESTIMATE_OPTION
-                     , PI.PKG_ASP
+        , PI.PKG_ASP
-                     , PI.REMARKS
+        , PI.REMARKS
-                     , O.SALE_STORE_ID
+        , PI.CREATE_USER
-                     , O.OBJECT_NAME
+        , O.SALE_STORE_ID
-                     , O.OBJECT_NAME_OMIT
+        , (SELECT SS.BUSINESS_CHARGER_CD FROM M_SALES_STORE SS WHERE SS.SALE_STORE_ID = O.SALE_STORE_ID ) AS BUSINESS_CHARGER_CD
-                     , (SELECT SALE_STORE_ID FROM M_USER WHERE USER_ID = OI.CREATE_USER) AS CREATE_SALE_STORE_ID
+        , O.OBJECT_NAME
-                     <if test='saleStoreId != null and saleStoreId == "T01"'>
+        , O.OBJECT_NAME_OMIT
-                     , (SELECT BC.BUSINESS_TEAM_CD
+        , (SELECT SALE_STORE_ID FROM M_USER WHERE USER_ID = OI.CREATE_USER) AS CREATE_SALE_STORE_ID
-                        FROM M_SALES_STORE SS WITH (NOLOCK)
+        , ISNULL(MP.PREF_NAME, '') AS PREF_NAME
-                        INNER JOIN M_BUSINESS_CHARGER BC WITH (NOLOCK)
+        , ISNULL(MPA.AREA_NAME, '') AS AREA_NAME
-                            ON SS.BUSINESS_CHARGER_CD = BC.BUSINESS_CHARGER_CD
+        , ISNULL(C1.CODE_NM, '') AS STANDARD_WIND_SPEED_NAME
-                        WHERE SS.SALE_STORE_ID = O.SALE_STORE_ID
+        FROM T_PLAN P WITH (NOLOCK)
-                       ) AS BUSINESS_TEAM_CD
+        INNER JOIN T_PLAN_INFO PI WITH (NOLOCK)
-                     </if>
+        ON P.OBJECT_NO = PI.OBJECT_NO
-                     , ISNULL(MP.PREF_NAME, '') AS PREF_NAME
+        AND P.PLAN_NO = PI.PLAN_NO
-                     , ISNULL(MPA.AREA_NAME, '') AS AREA_NAME
+        INNER JOIN T_OBJECT O WITH (NOLOCK)
-                     , ISNULL(C1.CODE_NM, '') AS STANDARD_WIND_SPEED_NAME
+        ON P.OBJECT_NO = O.OBJECT_NO
-                FROM T_PLAN P WITH (NOLOCK)
+        INNER JOIN T_OBJECT_INFO OI WITH (NOLOCK)
-            INNER JOIN T_PLAN_INFO PI WITH (NOLOCK)
+        ON O.OBJECT_NO = OI.OBJECT_NO
-                ON P.OBJECT_NO = PI.OBJECT_NO
+        LEFT OUTER JOIN T_SIMULATION_PREFECTURE MP WITH (NOLOCK)
-                    AND P.PLAN_NO = PI.PLAN_NO
+        ON O.PREF_ID = MP.PREF_ID
-                    INNER JOIN T_OBJECT O WITH (NOLOCK)
+        LEFT OUTER JOIN T_SIMULATION_AREA MPA WITH (NOLOCK)
-                ON P.OBJECT_NO = O.OBJECT_NO
+        ON O.PREF_ID = MPA.PREF_ID
-                    INNER JOIN T_OBJECT_INFO OI WITH (NOLOCK)
+        AND OI.AREA_ID = MPA.AREA_ID
-                ON O.OBJECT_NO = OI.OBJECT_NO
+        AND MPA.DEL_FLG = 0
-                    LEFT OUTER JOIN T_SIMULATION_PREFECTURE MP WITH (NOLOCK)
+        LEFT OUTER JOIN M_COMM_L C1 WITH (NOLOCK)
-                ON O.PREF_ID = MP.PREF_ID
+        ON C1.HEAD_CD = '202000'
-                    LEFT OUTER JOIN T_SIMULATION_AREA MPA WITH (NOLOCK)
+        AND P.STANDARD_WIND_SPEED_ID = C1.CODE
-                ON O.PREF_ID = MPA.PREF_ID
+        WHERE P.OBJECT_NO = #{objectNo}
-                    AND OI.AREA_ID = MPA.AREA_ID
+        AND P.PLAN_NO = #{planNo}
-                    AND MPA.DEL_FLG = 0
+        ) T
-                    LEFT OUTER JOIN M_COMM_L C1 WITH (NOLOCK)
+        LEFT OUTER JOIN M_SALES_STORE SS1 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">