|
@@ -791,7 +791,7 @@ from t_order a,t_equipment b
|
|
|
where b.id = a.equipment_id
|
|
|
and a.status='1'
|
|
|
<if test="adminId != null and adminId !=''">
|
|
|
- and a.admin_id= #{adminId} -- 所属商家id
|
|
|
+ and b.admin_id= #{adminId} -- 设备所属商家id
|
|
|
</if>
|
|
|
AND a.create_date >= STR_TO_DATE(CONCAT(#{startDate},' 00:00:00'),'%Y/%m/%d %H:%i:%s')
|
|
|
<![CDATA[ AND a.create_date <= STR_TO_DATE(CONCAT(#{endDate},' 23:59:59'),'%Y/%m/%d %H:%i:%s') ]]>
|