|
|
@ -24,7 +24,7 @@ |
|
|
|
t_logistics_environment_record AS er |
|
|
|
LEFT JOIN t_logistics_equipment AS e ON er.equipment_num = e.equipment_number |
|
|
|
LEFT JOIN t_logistics_warehouse AS w ON w.id = e.warehouse_id |
|
|
|
WHERE er.rec_status = 0 AND e.rec_status = 0 AND w.rec_status = 0 AND er.num_type = 0 AND e.warehouse_id = #{warehouseId} AND w.park_id = 1 |
|
|
|
WHERE er.rec_status = 0 AND e.rec_status = 0 AND w.rec_status = 0 AND er.num_type = 1 AND e.warehouse_id = #{warehouseId} AND w.park_id = 1 |
|
|
|
) AS newEr ON newEr.recordTime = s.date |
|
|
|
group by s.date ORDER BY s.date |
|
|
|
</select> |
|
|
@ -51,7 +51,7 @@ |
|
|
|
t_logistics_environment_record AS er |
|
|
|
LEFT JOIN t_logistics_equipment AS e ON er.equipment_num = e.equipment_number |
|
|
|
LEFT JOIN t_logistics_warehouse AS w ON w.id = e.warehouse_id |
|
|
|
WHERE er.rec_status = 0 AND e.rec_status = 0 AND w.rec_status = 0 AND er.num_type = 1 AND e.warehouse_id = #{warehouseId} AND w.park_id = 1 |
|
|
|
WHERE er.rec_status = 0 AND e.rec_status = 0 AND w.rec_status = 0 AND er.num_type = 0 AND e.warehouse_id = #{warehouseId} AND w.park_id = 1 |
|
|
|
) AS newEr ON newEr.recordTime = s.date |
|
|
|
group by s.date ORDER BY s.date |
|
|
|
</select> |
|
|
|