|
|
@@ -103,8 +103,10 @@ class Report extends Base
|
|
|
|
|
|
public function attendancereport()
|
|
|
{
|
|
|
-
|
|
|
$goups = (new GroupsModel)->where(['status' => 1])->select();
|
|
|
+ $serday1 = date("Y-m-d",strtotime('-8 day'));
|
|
|
+ $serday2 = date("Y-m-d",strtotime('-1 day'));
|
|
|
+ $defday = $serday1.','.$serday2;
|
|
|
|
|
|
if (request()->isAjax()) {
|
|
|
|
|
|
@@ -118,7 +120,7 @@ class Report extends Base
|
|
|
}
|
|
|
list($zone, $sgroup) = explode('|', $param);
|
|
|
if (empty($zone)) {
|
|
|
- $zoneArray1 = [date("Y-m-d")];
|
|
|
+ $zoneArray1 = [$serday1,$serday2];
|
|
|
} else {
|
|
|
$zonesarr = explode(',', $zone);
|
|
|
$dd = $this->Date_segmentation($zonesarr['0'], $zonesarr['1']);
|
|
|
@@ -143,6 +145,8 @@ class Report extends Base
|
|
|
}
|
|
|
|
|
|
$this->assign('groups', $goups);
|
|
|
+ $this->assign('dzone', $defday);
|
|
|
+
|
|
|
return $this->fetch();
|
|
|
}
|
|
|
|