mkm/engineering
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
weiz 2024-03-13 14:42:25 +08:00
parent 98de7b1676
commit c66db094c7
8 changed files with 106 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/adminapi/lists/ApprovalIssuanceAchievementDocumentsLists.php
View File

@ -39,8 +39,8 @@ class ApprovalIssuanceAchievementDocumentsLists extends BaseAdminDataLists imple
public function setSearch(): array public function setSearch(): array
{ {
return [ return [
'=' => ['project', 'project_num'], '=' => ['project_id'],
'%like%' => ['task','num']
]; ];
} }

4
app/adminapi/lists/DataReceptionLists.php
View File

@ -39,8 +39,8 @@ class DataReceptionLists extends BaseAdminDataLists implements ListsSearchInterf
public function setSearch(): array public function setSearch(): array
{ {
return [ return [
'=' => ['num', 'project', 'project_num'], '=' => ['project_id'],
'%like%' => ['num','person']
]; ];
} }

2
app/adminapi/lists/ProjectCommissionDetailLists.php
View File

@ -38,7 +38,7 @@ class ProjectCommissionDetailLists extends BaseAdminDataLists implements ListsSe
public function setSearch(): array public function setSearch(): array
{ {
return [ return [
'=' => ['engineer', 'task_name'], '%like%' => ['engineer', 'task_name'],
]; ];
} }

4
app/adminapi/lists/ProjectCommissionLists.php
View File

@ -40,8 +40,8 @@ class ProjectCommissionLists extends BaseAdminDataLists implements ListsSearchIn
public function setSearch(): array public function setSearch(): array
{ {
return [ return [
'=' => ['num', 'project', 'project_num'], '=' => ['project_id'],
'%like%' => ['num']
]; ];
} }

9
app/adminapi/lists/TaskHandlingThreeLevelReviewLists.php
View File

@ -55,7 +55,16 @@ class TaskHandlingThreeLevelReviewLists extends BaseAdminDataLists implements Li
*/ */
public function lists(): array public function lists(): array
{ {
$params = $this->request->get();
return TaskHandlingThreeLevelReview::where($this->searchWhere) return TaskHandlingThreeLevelReview::where($this->searchWhere)
->where(function ($query) use($params) {
if (!empty($params['kg_start_time']) && !empty($params['kg_end_time'])) {
$query->whereBetweenTime('kaigong', $params['kg_start_time'], $params['kg_end_time']);
}
if (!empty($params['jg_start_time']) && !empty($params['jg_end_time'])) {
$query->whereBetweenTime('jungong', $params['jg_start_time'], $params['jg_end_time']);
}
})
->with(['projectInfo']) ->with(['projectInfo'])
->limit($this->limitOffset, $this->limitLength) ->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc']) ->order(['id' => 'desc'])

2
app/adminapi/lists/task/TaskAllocationLists.php
View File

@ -39,7 +39,7 @@ class TaskAllocationLists extends BaseAdminDataLists implements ListsSearchInter
public function setSearch(): array public function setSearch(): array
{ {
return [ return [
'=' => ['project'], '=' => ['cost_project_id'],
]; ];
} }

8
app/adminapi/logic/TaskHandlingThreeLevelReviewLogic.php
View File

@ -71,8 +71,8 @@ class TaskHandlingThreeLevelReviewLogic extends BaseLogic
'xmhd' => $params['xmhd'], 'xmhd' => $params['xmhd'],
'bmhd' => $params['bmhd'], 'bmhd' => $params['bmhd'],
'shbhd' => $params['shbhd'], 'shbhd' => $params['shbhd'],
'kaigong' => $params['kaigong'], 'kaigong' => !empty($params['kaigong']) ? strtotime($params['kaigong']) : 0,
'jungong' => $params['jungong'], 'jungong' => !empty($params['jungong']) ? strtotime($params['jungong']) : 0,
'bz' => $params['bz'], 'bz' => $params['bz'],
'result_file' => $params['result_file'] ? json_encode($params['result_file']) : null, 'result_file' => $params['result_file'] ? json_encode($params['result_file']) : null,
'master_annex' => $params['master_annex'] ? json_encode($params['master_annex']) : null, 'master_annex' => $params['master_annex'] ? json_encode($params['master_annex']) : null,
@ -129,8 +129,8 @@ class TaskHandlingThreeLevelReviewLogic extends BaseLogic
'xmhd' => $params['xmhd'], 'xmhd' => $params['xmhd'],
'bmhd' => $params['bmhd'], 'bmhd' => $params['bmhd'],
'shbhd' => $params['shbhd'], 'shbhd' => $params['shbhd'],
'kaigong' => $params['kaigong'], 'kaigong' => !empty($params['kaigong']) ? strtotime($params['kaigong']) : 0,
'jungong' => $params['jungong'], 'jungong' => !empty($params['jungong']) ? strtotime($params['jungong']) : 0,
'bz' => $params['bz'], 'bz' => $params['bz'],
'result_file' => $params['result_file'] ? json_encode($params['result_file']) : null, 'result_file' => $params['result_file'] ? json_encode($params['result_file']) : null,
'master_annex' => $params['master_annex'] ? json_encode($params['master_annex']) : null, 'master_annex' => $params['master_annex'] ? json_encode($params['master_annex']) : null,

10
app/common/model/TaskHandlingThreeLevelReview.php
View File

@ -35,4 +35,14 @@ class TaskHandlingThreeLevelReview extends BaseModel
{ {
return $this->hasOne(CostProject::class, 'id', 'project_id'); return $this->hasOne(CostProject::class, 'id', 'project_id');
} }
public function getKaigongAttr($value): string
{
return !empty($value) ? date('Y-m-d',$value) : '';
}
public function getJungongAttr($value): string
{
return !empty($value) ? date('Y-m-d',$value) : '';
}
} }