Ver código fonte

舍弃小数

Zhouzhendong 5 anos atrás
pai
commit
910a935e49

+ 1 - 1
app/Console/Commands/CreateWeightStatistic.php

@@ -45,7 +45,7 @@ sql;
             "date"=>$yesterday,
             "total"=>$model->total_count,
             "count"=>$model->un_weigh_count,
-            "value"=>$model->total_count ? round($model->un_weigh_count/$model->total_count,2)*100 : 0
+            "value"=>$model->total_count ? intval(($model->un_weigh_count/$model->total_count)*100) : 0
         ]);
     }
 }

+ 3 - 3
app/Http/Controllers/ControlPanelController.php

@@ -170,7 +170,7 @@ class ControlPanelController extends Controller
                 }else{
                     $dataTemp[$sign[$month]]["total"] += $datum["total"];
                     $dataTemp[$sign[$month]]["count"] += $datum["count"];
-                    $dataTemp[$sign[$month]]["value"] = (string)($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"] ? intval(($dataTemp[$sign[$month]]["count"]/$dataTemp[$sign[$month]]["total"])*100) : 0);
                 }
             }
             $data = $dataTemp;
@@ -195,12 +195,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"=>(string)($pack->total ? round($pack->count/$pack->total,2)*100 : 0)];
+            return ["date"=>$pack->date,"total"=>$pack->total,"count"=>$pack->count,"value"=>(string)($pack->total ? intval(($pack->count/$pack->total)*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"=>(string)($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 ? intval(($count->un_weigh_count/$count->total_count)*100) : 0)];
         },config("cache.expirations.forever"));
     }
 }

+ 2 - 2
app/Http/Controllers/TestController.php

@@ -137,7 +137,7 @@ class TestController extends Controller
             OrderPackageCountingRecord::query()->where("targeted_at",$yesterday)->delete();
             $sql = <<<sql
 SELECT DATE_FORMAT(created_at,'%Y-%m-%d') date,
-SUM(CASE WHEN weighed_at IS NULL THEN 1 ELSE 0 END) AS count,
+SUM(CASE WHEN weighed_at IS NOT NULL THEN 1 ELSE 0 END) AS count,
 COUNT(1) total FROM order_packages WHERE created_at BETWEEN '{$yesterday} 00:00:00' AND '{$yesterday} 23:59:59' GROUP BY date
 sql;
             $result = DB::selectOne(DB::raw($sql));
@@ -156,7 +156,7 @@ sql;
                 "date"=>$yesterday,
                 "total"=>$model->total_count,
                 "count"=>$model->un_weigh_count,
-                "value"=>$model->total_count ? round($model->un_weigh_count/$model->total_count,2)*100 : 0
+                "value"=>$model->total_count ? intval(($model->un_weigh_count/$model->total_count)*100) : 0
             ]);
         }
     }