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

Reviewed-on: #64

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

@@ -28,10 +28,10 @@ batch:
   job:
     enabled: false
 #QSP url 하나시스운영 #https://jp.qsalesplatform.com
-#QSP url 하나시스개발 #https://121.168.9.37:8080
+#QSP url 하나시스개발 #http://121.168.9.37:8080
 #QSP url interplug dev #http://1.248.227.176:8120
 qsp:
-  url: https://121.168.9.37:8080
+  url: http://121.168.9.37:8080
   master-store-batch-url: /api/master/storeAdditionalInfo
   master-material-batch-url: /api/master/materialList
   master-bom-batch-url: /api/master/bomList

src/main/resources/mappers/object/objectMapper.xml

@@ -327,11 +327,11 @@
             <choose>
                 <when test='schDateType != null and schDateType == "U" and (schFromDt != null and schFromDt != "") and (schToDt != null and schToDt != "")'>
                 /* 갱신일 시작일,종료일 검색조건 */
-                AND O.LAST_EDIT_DATETIME BETWEEN CONVERT(DATETIME, CONVERT(VARCHAR(10), PARSE(#{schFromDt} AS DATE USING 'en-US')) + ' 00:00:00') AND CONVERT(DATETIME, CONVERT(VARCHAR(10), PARSE(#{schToDt} AS DATE USING 'en-US')) + ' 23:59:59')
+                AND O.LAST_EDIT_DATETIME BETWEEN CONVERT(DATETIME, CONVERT(VARCHAR(10), #{schFromDt}, 120) + ' 00:00:00', 120) AND CONVERT(DATETIME, CONVERT(VARCHAR(10), #{schToDt}, 120) + ' 23:59:59', 120)
                 </when>
                 <when test='schDateType != null and schDateType == "R" and (schFromDt != null and schFromDt != "") and (schToDt != null and schToDt != "")'>
                 /* 등록일 시작일,종료일 검색조건 */
-                AND OI.CREATE_DATETIME BETWEEN CONVERT(DATETIME, CONVERT(VARCHAR(10), PARSE(#{schFromDt} AS DATE USING 'en-US')) + ' 00:00:00') AND CONVERT(DATETIME, CONVERT(VARCHAR(10), PARSE(#{schToDt} AS DATE USING 'en-US')) + ' 23:59:59')
+                AND OI.CREATE_DATETIME BETWEEN CONVERT(DATETIME, CONVERT(VARCHAR(10), #{schFromDt}, 120) + ' 00:00:00', 120) AND CONVERT(DATETIME, CONVERT(VARCHAR(10), #{schToDt}, 120) + ' 23:59:59', 120)
                 </when>
             </choose>
             <if test='schTempFlg != null and schTempFlg != ""'>