|
@@ -1128,6 +1128,8 @@ class ApiController extends BaseController
|
|
|
return self::errorResponse(ApiEnum::STATUS_CODE_EMPTY);
|
|
|
}
|
|
|
|
|
|
+ $result['data']['title'] = date('Y年n月j日', strtotime($riqi)).'值班信息';
|
|
|
+
|
|
|
$zbInfo = DB::connection('mysql_fwe10')->table('uf_gggs_zbgl')->where('riqi',$riqi)->orderBy('CREATE_TIME','desc')->first();
|
|
|
|
|
|
if (!$zbInfo) {
|
|
@@ -1247,7 +1249,7 @@ class ApiController extends BaseController
|
|
|
$mobile = '('.$people->dh.')';
|
|
|
}
|
|
|
|
|
|
- $result['title'] = $name.$mobile.date('Y年n月j日', strtotime($start_date)).'至'.date('Y年n月j日', strtotime($end_date)).'的值班记录';
|
|
|
+ $result['title'] = $name.$mobile.date('Y年n月j日', strtotime($start_date)).'至'.date('Y年n月j日', strtotime($end_date)).'值班记录';
|
|
|
|
|
|
$list = DB::connection('mysql_fwe10')->table('uf_gggs_zbgl')->whereBetween('riqi', [$start_date, $end_date])
|
|
|
->whereIn('id', function($subQuery) {
|