|
@@ -137,7 +137,7 @@ class ScreenController extends BaseController
|
|
|
$date = date('Ymd',time());
|
|
|
|
|
|
$startDate = strtotime(date('Y-m-01 00:00:00', time()));
|
|
|
- $endDate = strtotime(date('Y-m-t 23:59:59', time()));
|
|
|
+ $endDate = time();
|
|
|
$return = $this->getDayInMonth();
|
|
|
|
|
|
//获取数据
|
|
@@ -155,7 +155,8 @@ class ScreenController extends BaseController
|
|
|
foreach ($data as $value){
|
|
|
$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)));
|
|
|
+// $crt_time = date("Y-m-d",strtotime(substr($dispatch_t,0,8)));
|
|
|
+ $crt_time = date("Y-m-d",$value['time']);
|
|
|
if(isset($return[$crt_time])){
|
|
|
$n = bcadd($return[$crt_time]['num'], $value['value'],3);
|
|
|
$return[$crt_time]['num'] = $n;
|