|
@@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
|
|
|
<select id="selectBillInfList" parameterType="map" resultType="map">
|
|
|
(SELECT
|
|
|
+ b.create_time,
|
|
|
b.zbi_id 'zbiId',
|
|
|
b.zbi_number 'zbiNumber',
|
|
|
b.zbi_name 'zbiName',
|
|
@@ -62,9 +63,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
</if>
|
|
|
<if test="paramMap.end != null and paramMap.end != ''">
|
|
|
</if>
|
|
|
- ORDER BY b.create_time DESC)
|
|
|
+ )
|
|
|
UNION
|
|
|
(SELECT
|
|
|
+ b.create_time,
|
|
|
b.zbi_id 'zbiId',
|
|
|
b.zbi_number 'zbiNumber',
|
|
|
b.zbi_name 'zbiName',
|
|
@@ -124,8 +126,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
and b.zbi_pay_date between
|
|
|
#{paramMap.start} and #{paramMap.end}
|
|
|
</if>
|
|
|
- ORDER BY b.create_time DESC)
|
|
|
-
|
|
|
+ )
|
|
|
+ ORDER BY create_time DESC
|
|
|
</select>
|
|
|
|
|
|
|