Merge remote-tracking branch 'TSIT/ST24PRJ-709' into develop

src/main/java/com/style24/persistence/mybatis/shop/TsaWithdraw.xml

@@ -194,10 +194,10 @@
 		    AND    A.RECALL_STAT  = #{recallStat}
 			</if>
 			<if test='stDate != null and stDate != ""'>
-		    AND    A.DATE_CREATED <![CDATA[>= ]]> STR_TO_DATE(REPLACE(#{stDate},'-',''), '%Y%m%d%H%i%s') 
+		    AND    A.DATE_CREATED <![CDATA[>= ]]> STR_TO_DATE(REPLACE(#{stDate},'-',''), '%Y%m%d') 
 			</if>
 			<if test='edDate != null and edDate != ""'>
-		    AND    A.DATE_CREATED <![CDATA[<]]> DATE_ADD(STR_TO_DATE(REPLACE(#{edDate},'-','') + 1 , '%Y%m%d%H%i%s'), INTERVAL 1 DAY) 
+		    AND    A.DATE_CREATED <![CDATA[<]]> DATE_ADD(STR_TO_DATE(REPLACE(#{edDate},'-',''), '%Y%m%d'), INTERVAL 1 DAY) 
 			</if>
 			<if test='reasonCode != null and reasonCode != ""'>
 		    AND    B.REASON_CODE = #{reasonCode}
@@ -366,10 +366,10 @@
 		            AND    A.RECALL_STAT  = #{recallStat}
 					</if>
 					<if test='stDate != null and stDate != ""'>
-		            AND    A.DATE_CREATED <![CDATA[>= ]]> STR_TO_DATE(REPLACE(#{stDate},'-',''), '%Y%m%d%H%i%s') 
+		            AND    A.DATE_CREATED <![CDATA[>= ]]> STR_TO_DATE(REPLACE(#{stDate},'-',''), '%Y%m%d') 
 					</if>
 					<if test='edDate != null and edDate != ""'>
-		            AND    A.DATE_CREATED <![CDATA[<]]> DATE_ADD(STR_TO_DATE(REPLACE(#{edDate},'-','')+ 1, '%Y%m%d%H%i%s'), INTERVAL 1 DAY)
+		            AND    A.DATE_CREATED <![CDATA[<]]> DATE_ADD(STR_TO_DATE(REPLACE(#{edDate},'-',''), '%Y%m%d'), INTERVAL 1 DAY)
 					</if>
 					<if test='reasonCode != null and reasonCode != ""'>
 		            AND    B.REASON_CODE = #{reasonCode}
@@ -480,10 +480,10 @@
 		            AND    A.RECALL_STAT  = #{recallStat}
 					</if>
 					<if test='stDate != null and stDate != ""'>
-		            AND    A.DATE_CREATED <![CDATA[>= ]]> STR_TO_DATE(REPLACE(#{stDate},'-',''), '%Y%m%d%H%i%s') 
+		            AND    A.DATE_CREATED <![CDATA[>= ]]> STR_TO_DATE(REPLACE(#{stDate},'-',''), '%Y%m%d') 
 					</if>
 					<if test='edDate != null and edDate != ""'>
-		            AND    A.DATE_CREATED <![CDATA[<]]> DATE_ADD(STR_TO_DATE(REPLACE(#{edDate},'-','')+ 1, '%Y%m%d%H%i%s'), INTERVAL 1 DAY)
+		            AND    A.DATE_CREATED <![CDATA[<]]> DATE_ADD(STR_TO_DATE(REPLACE(#{edDate},'-',''), '%Y%m%d'), INTERVAL 1 DAY)
 					</if>
 					<if test='reasonCode != null and reasonCode != ""'>
 		            AND    B.REASON_CODE = #{reasonCode}
@@ -594,10 +594,10 @@
 		            AND    A.RECALL_STAT  = #{recallStat}
 					</if>
 					<if test='stDate != null and stDate != ""'>
-		            AND    A.DATE_CREATED <![CDATA[>= ]]> STR_TO_DATE(REPLACE(#{stDate},'-',''), '%Y%m%d%H%i%s') 
+		            AND    A.DATE_CREATED <![CDATA[>= ]]> STR_TO_DATE(REPLACE(#{stDate},'-',''), '%Y%m%d') 
 					</if>
 					<if test='edDate != null and edDate != ""'>
-		            AND   A.DATE_CREATED <![CDATA[<]]> DATE_ADD(STR_TO_DATE(REPLACE(#{edDate},'-','')+ 1, '%Y%m%d%H%i%s'), INTERVAL 1 DAY)
+		            AND   A.DATE_CREATED <![CDATA[<]]> DATE_ADD(STR_TO_DATE(REPLACE(#{edDate},'-',''), '%Y%m%d'), INTERVAL 1 DAY)
 					</if>
 					<if test='reasonCode != null and reasonCode != ""'>
 		            AND   B.REASON_CODE = #{reasonCode}