|
@@ -251,10 +251,28 @@
|
|
|
<if test='frontGb != null and frontGb != "" and frontGb != "A"'>
|
|
<if test='frontGb != null and frontGb != "" and frontGb != "A"'>
|
|
|
AND (FRONT_GB = 'A' OR FRONT_GB = #{frontGb} )
|
|
AND (FRONT_GB = 'A' OR FRONT_GB = #{frontGb} )
|
|
|
</if>
|
|
</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>
|
|
|
|
|
|
|
|
<sql id="getListPagingCondition_sql">
|
|
<sql id="getListPagingCondition_sql">
|