|
|
@@ -170,8 +170,9 @@
|
|
|
</select>
|
|
|
|
|
|
<select id="getOrder" resultMap="BaseResultMap" parameterType="com.ydtech.modules.order.entity.vo.OrderQueryVo">
|
|
|
- select * from ins_orders where orderno in
|
|
|
- (SELECT DISTINCT(o.orderno)
|
|
|
+ select * from ins_orders io
|
|
|
+
|
|
|
+ JOIN (SELECT DISTINCT(o.orderno) as orderno
|
|
|
FROM ins_orders o
|
|
|
LEFT JOIN ins_area_company a ON o.orderno = a.orderno
|
|
|
left join sys_user u on o.userid=u.id
|
|
|
@@ -199,7 +200,7 @@
|
|
|
</if>
|
|
|
<if test="startDate != null and endDate != null">
|
|
|
and o.createtime between #{startDate, jdbcType=TIMESTAMP} and #{endDate, jdbcType=TIMESTAMP}
|
|
|
- </if>)
|
|
|
+ </if>) as f on io.orderno=f.orderno
|
|
|
order by createtime desc
|
|
|
</select>
|
|
|
|
wks