Ver Fonte

핫딜 기간 수정

bin2107 há 4 anos atrás
pai
commit
c16948859b

+ 22 - 4
src/main/java/com/style24/persistence/mybatis/shop/TsaSocial.xml

@@ -251,10 +251,28 @@
 		<if test='frontGb != null and frontGb != "" and frontGb != "A"'>
 			AND (FRONT_GB = 'A' OR FRONT_GB = #{frontGb} )
 		</if>
-		<if test="stDate != null and stDate != '' and edDate != null and edDate != ''">
-        AND    SOCIAL_STDT <![CDATA[ >= ]]> DATE_FORMAT(#{stDate},'%Y-%m-%d %H:%i:%S')
-        AND    SOCIAL_EDDT <![CDATA[ <= ]]> DATE_FORMAT(#{stDate},'%Y-%m-%d %H:%i:%S')
-		</if>
+		<choose>
+			<when test="stDate != null and stDate != '' and edDate != null and edDate != ''">
+				AND    (
+				SOCIAL_EDDT <![CDATA[ >= ]]> DATE_FORMAT(#{stDate},'%Y-%m-%d %H:%i:%S')
+				AND
+				SOCIAL_STDT <![CDATA[ <= ]]> DATE_FORMAT(#{stDate},'%Y-%m-%d %H:%i:%S')
+				) OR
+				(
+				SOCIAL_EDDT <![CDATA[ >= ]]> DATE_FORMAT(#{edDate},'%Y-%m-%d %H:%i:%S')
+				AND
+				SOCIAL_STDT <![CDATA[ <= ]]> DATE_FORMAT(#{edDate},'%Y-%m-%d %H:%i:%S')
+				)
+			</when>
+			<when test="stDate != null and stDate != ''">
+			AND    SOCIAL_EDDT <![CDATA[ >= ]]> DATE_FORMAT(#{stDate},'%Y-%m-%d %H:%i:%S')
+			AND    SOCIAL_STDT <![CDATA[ <= ]]> DATE_FORMAT(#{stDate},'%Y-%m-%d %H:%i:%S')
+			</when>
+			<when test="edDate != null and edDate != ''">
+			AND    SOCIAL_EDDT <![CDATA[ >= ]]> DATE_FORMAT(#{edDate},'%Y-%m-%d %H:%i:%S')
+			AND    SOCIAL_STDT <![CDATA[ <= ]]> DATE_FORMAT(#{edDate},'%Y-%m-%d %H:%i:%S')
+			</when>
+		</choose>
 	</sql>
 
 	<sql id="getListPagingCondition_sql">