|
@@ -159,6 +159,7 @@
|
|
|
|
|
|
|
|
<select id="getList" resultMap="BaseResultMap">
|
|
<select id="getList" resultMap="BaseResultMap">
|
|
|
SELECT
|
|
SELECT
|
|
|
|
|
+ DISTINCT
|
|
|
dict1.dict_label as xingbie_text,
|
|
dict1.dict_label as xingbie_text,
|
|
|
dict2.dict_label as yylx_text,
|
|
dict2.dict_label as yylx_text,
|
|
|
<include refid="Base_Column_List"/>
|
|
<include refid="Base_Column_List"/>
|
|
@@ -188,7 +189,7 @@
|
|
|
and t.yylx=#{yylx}
|
|
and t.yylx=#{yylx}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="operationDate!=null and operationDate!=''">
|
|
<if test="operationDate!=null and operationDate!=''">
|
|
|
- and t.operation_date=#{operationDate}
|
|
|
|
|
|
|
+ and STR_TO_DATE(t.operation_date,'%Y-%m-%d')=#{operationDate}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="gzms!=null and gzms!=''">
|
|
<if test="gzms!=null and gzms!=''">
|
|
|
and t.gzms=#{gzms}
|
|
and t.gzms=#{gzms}
|
|
@@ -210,7 +211,7 @@
|
|
|
</if>
|
|
</if>
|
|
|
</where>
|
|
</where>
|
|
|
<if test="orderBy!=null and orderBy!=''">
|
|
<if test="orderBy!=null and orderBy!=''">
|
|
|
- order by t.${orderBy}
|
|
|
|
|
|
|
+ order by STR_TO_DATE(t.${orderBy},'%Y-%m-%d')
|
|
|
</if>
|
|
</if>
|
|
|
<if test="isAsc!=null and isAsc!=''">
|
|
<if test="isAsc!=null and isAsc!=''">
|
|
|
<if test="isAsc == '1'.toString()">
|
|
<if test="isAsc == '1'.toString()">
|