|
|
@@ -144,12 +144,18 @@ class ScreenController extends BaseController
|
|
|
$data = ScrappCount::where('crt_time','>=',$startDate)
|
|
|
->where('crt_time','<',$endDate)
|
|
|
->where('del_time',0)
|
|
|
- ->select('crt_time as time','scrapp_num as value')
|
|
|
+ ->select('crt_time as time','scrapp_num as value','dispatch_sub_id')
|
|
|
->get()->toArray();
|
|
|
|
|
|
+ $dispatch_no = DispatchSub::whereIn('id',array_column($data, 'dispatch_sub_id'))
|
|
|
+ ->pluck('dispatch_no','id')
|
|
|
+ ->toArray();
|
|
|
+
|
|
|
if(! empty($data)){
|
|
|
foreach ($data as $value){
|
|
|
- $crt_time = date('Y-m-d',$value['time']);
|
|
|
+ $dispatch_t = $dispatch_no[$value['dispatch_sub_id']] ?? "";
|
|
|
+ if(empty($dispatch_t)) continue;
|
|
|
+ $crt_time = date("Y-m-d",strtotime(substr($dispatch_t,0,8)));
|
|
|
if(isset($return[$crt_time])){
|
|
|
$n = bcadd($return[$crt_time]['num'], $value['value'],3);
|
|
|
$return[$crt_time]['num'] = $n;
|
cqp