feat: [mng] develop 일괄 반영
- fire-shutter 가이드레일/셔터박스/3D 렌더링 - sales 가격시뮬레이터/프로모션 할인 - bim 뷰어/생성기, pmis 작업일보/출면일보 - demo-tenant 체험 관리 - 전표/급여/전자서명 버그 수정
This commit is contained in:
@@ -22,7 +22,7 @@ private function tenantId(): int
|
||||
public function show(Request $request): JsonResponse
|
||||
{
|
||||
$date = $request->input('date', now()->toDateString());
|
||||
$company = $request->input('company', '');
|
||||
$company = $request->input('company') ?? '';
|
||||
|
||||
$report = PmisDailyWorkReport::tenant($this->tenantId())
|
||||
->where('date', $date)
|
||||
@@ -48,7 +48,7 @@ public function monthStatus(Request $request): JsonResponse
|
||||
{
|
||||
$year = $request->integer('year', now()->year);
|
||||
$month = $request->integer('month', now()->month);
|
||||
$company = $request->input('company', '');
|
||||
$company = $request->input('company') ?? '';
|
||||
|
||||
$reports = PmisDailyWorkReport::tenant($this->tenantId())
|
||||
->whereYear('date', $year)
|
||||
|
||||
Reference in New Issue
Block a user