|
|
@@ -171,8 +171,7 @@ class ControlPanelController extends Controller
|
|
|
}else{
|
|
|
$dataTemp[$sign[$month]]["total"] += $datum["total"];
|
|
|
$dataTemp[$sign[$month]]["count"] += $datum["count"];
|
|
|
- $dataTemp[$sign[$month]]["value"] = $dataTemp[$sign[$month]]["total"] ?
|
|
|
- round($dataTemp[$sign[$month]]["count"]/$dataTemp[$sign[$month]]["total"],2)*100 : 0;
|
|
|
+ $dataTemp[$sign[$month]]["value"] = (string)($dataTemp[$sign[$month]]["total"] ? round($dataTemp[$sign[$month]]["count"]/$dataTemp[$sign[$month]]["total"],2)*100 : 0);
|
|
|
}
|
|
|
}
|
|
|
$data = $dataTemp;
|
|
|
@@ -197,12 +196,12 @@ sql;
|
|
|
|
|
|
$pack = DB::selectOne(DB::raw($sql));
|
|
|
if (!$pack)return ["date"=>$date,"total"=>0,"count"=>0,"value"=>0];
|
|
|
- return ["date"=>$pack->date,"total"=>$pack->total,"count"=>$pack->count,"value"=>round($pack->count/$pack->total,2)*100];
|
|
|
+ return ["date"=>$pack->date,"total"=>$pack->total,"count"=>$pack->count,"value"=>(string)($pack->total ? round($pack->count/$pack->total,2)*100 : 0)];
|
|
|
}
|
|
|
return app(CacheService::class)->getOrExecute("weight.".$date,function ()use($date){
|
|
|
$count = OrderPackageCountingRecord::query()->where("targeted_at",$date)->first();
|
|
|
if (!$count)return ["date"=>$date,"total"=>0,"count"=>0,"value"=>0];
|
|
|
- return ["date"=>$count->targeted_at,"total"=>$count->total_count,"count"=>$count->un_weigh_count,"value"=>$count->total_count ? round($count->un_weigh_count/$count->total_count,2)*100 : 0];
|
|
|
+ return ["date"=>$count->targeted_at,"total"=>$count->total_count,"count"=>$count->un_weigh_count,"value"=>(string)($count->total_count ? round($count->un_weigh_count/$count->total_count,2)*100 : 0)];
|
|
|
},config("cache.expirations.forever"));
|
|
|
}
|
|
|
}
|