diff --git a/app/adminapi/lists/ApprovalIssuanceAchievementDocumentsLists.php b/app/adminapi/lists/ApprovalIssuanceAchievementDocumentsLists.php index 0e4dde767..cf0929846 100644 --- a/app/adminapi/lists/ApprovalIssuanceAchievementDocumentsLists.php +++ b/app/adminapi/lists/ApprovalIssuanceAchievementDocumentsLists.php @@ -39,8 +39,8 @@ class ApprovalIssuanceAchievementDocumentsLists extends BaseAdminDataLists imple public function setSearch(): array { return [ - '=' => ['project', 'project_num'], - + '=' => ['project_id'], + '%like%' => ['task','num'] ]; } diff --git a/app/adminapi/lists/DataReceptionLists.php b/app/adminapi/lists/DataReceptionLists.php index 7d4c6ab1e..d7d10c034 100644 --- a/app/adminapi/lists/DataReceptionLists.php +++ b/app/adminapi/lists/DataReceptionLists.php @@ -39,8 +39,8 @@ class DataReceptionLists extends BaseAdminDataLists implements ListsSearchInterf public function setSearch(): array { return [ - '=' => ['num', 'project', 'project_num'], - + '=' => ['project_id'], + '%like%' => ['num','person'] ]; } diff --git a/app/adminapi/lists/ProjectCommissionDetailLists.php b/app/adminapi/lists/ProjectCommissionDetailLists.php index eff1f1c23..002c94601 100644 --- a/app/adminapi/lists/ProjectCommissionDetailLists.php +++ b/app/adminapi/lists/ProjectCommissionDetailLists.php @@ -1,77 +1,77 @@ - ['engineer', 'task_name'], - ]; - } - - - /** - * @notes 获取列表 - * @return array - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException - * @author likeadmin - * @date 2024/02/23 09:48 - */ - public function lists(): array - { - return ProjectCommissionDetail::where($this->searchWhere) - ->field(['id', 'engineer', 'engineer_id', 'task_name', 'task_type', 'professional_type', 'zj_amount', 'sk_amount', 'tc_rate', 'tc_amount', 'pay_amount']) - ->limit($this->limitOffset, $this->limitLength) - ->order(['id' => 'desc']) - ->select() - ->toArray(); - } - - - /** - * @notes 获取数量 - * @return int - * @author likeadmin - * @date 2024/02/23 09:48 - */ - public function count(): int - { - return ProjectCommissionDetail::where($this->searchWhere)->count(); - } - + ['engineer', 'task_name'], + ]; + } + + + /** + * @notes 获取列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2024/02/23 09:48 + */ + public function lists(): array + { + return ProjectCommissionDetail::where($this->searchWhere) + ->field(['id', 'engineer', 'engineer_id', 'task_name', 'task_type', 'professional_type', 'zj_amount', 'sk_amount', 'tc_rate', 'tc_amount', 'pay_amount']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select() + ->toArray(); + } + + + /** + * @notes 获取数量 + * @return int + * @author likeadmin + * @date 2024/02/23 09:48 + */ + public function count(): int + { + return ProjectCommissionDetail::where($this->searchWhere)->count(); + } + } \ No newline at end of file diff --git a/app/adminapi/lists/ProjectCommissionLists.php b/app/adminapi/lists/ProjectCommissionLists.php index 11fab85fd..c2fc33b41 100644 --- a/app/adminapi/lists/ProjectCommissionLists.php +++ b/app/adminapi/lists/ProjectCommissionLists.php @@ -40,8 +40,8 @@ class ProjectCommissionLists extends BaseAdminDataLists implements ListsSearchIn public function setSearch(): array { return [ - '=' => ['num', 'project', 'project_num'], - + '=' => ['project_id'], + '%like%' => ['num'] ]; } diff --git a/app/adminapi/lists/TaskHandlingThreeLevelReviewLists.php b/app/adminapi/lists/TaskHandlingThreeLevelReviewLists.php index f7e8fa731..7203807d1 100644 --- a/app/adminapi/lists/TaskHandlingThreeLevelReviewLists.php +++ b/app/adminapi/lists/TaskHandlingThreeLevelReviewLists.php @@ -55,7 +55,16 @@ class TaskHandlingThreeLevelReviewLists extends BaseAdminDataLists implements Li */ public function lists(): array { + $params = $this->request->get(); 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']) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) diff --git a/app/adminapi/lists/task/TaskAllocationLists.php b/app/adminapi/lists/task/TaskAllocationLists.php index 069ae8067..fe0a75a22 100644 --- a/app/adminapi/lists/task/TaskAllocationLists.php +++ b/app/adminapi/lists/task/TaskAllocationLists.php @@ -39,7 +39,7 @@ class TaskAllocationLists extends BaseAdminDataLists implements ListsSearchInter public function setSearch(): array { return [ - '=' => ['project'], + '=' => ['cost_project_id'], ]; } diff --git a/app/adminapi/logic/TaskHandlingThreeLevelReviewLogic.php b/app/adminapi/logic/TaskHandlingThreeLevelReviewLogic.php index f9ec24436..392883b68 100644 --- a/app/adminapi/logic/TaskHandlingThreeLevelReviewLogic.php +++ b/app/adminapi/logic/TaskHandlingThreeLevelReviewLogic.php @@ -71,8 +71,8 @@ class TaskHandlingThreeLevelReviewLogic extends BaseLogic 'xmhd' => $params['xmhd'], 'bmhd' => $params['bmhd'], 'shbhd' => $params['shbhd'], - 'kaigong' => $params['kaigong'], - 'jungong' => $params['jungong'], + 'kaigong' => !empty($params['kaigong']) ? strtotime($params['kaigong']) : 0, + 'jungong' => !empty($params['jungong']) ? strtotime($params['jungong']) : 0, 'bz' => $params['bz'], 'result_file' => $params['result_file'] ? json_encode($params['result_file']) : null, 'master_annex' => $params['master_annex'] ? json_encode($params['master_annex']) : null, @@ -129,8 +129,8 @@ class TaskHandlingThreeLevelReviewLogic extends BaseLogic 'xmhd' => $params['xmhd'], 'bmhd' => $params['bmhd'], 'shbhd' => $params['shbhd'], - 'kaigong' => $params['kaigong'], - 'jungong' => $params['jungong'], + 'kaigong' => !empty($params['kaigong']) ? strtotime($params['kaigong']) : 0, + 'jungong' => !empty($params['jungong']) ? strtotime($params['jungong']) : 0, 'bz' => $params['bz'], 'result_file' => $params['result_file'] ? json_encode($params['result_file']) : null, 'master_annex' => $params['master_annex'] ? json_encode($params['master_annex']) : null, diff --git a/app/common/model/TaskHandlingThreeLevelReview.php b/app/common/model/TaskHandlingThreeLevelReview.php index 814253b24..a33cc131d 100644 --- a/app/common/model/TaskHandlingThreeLevelReview.php +++ b/app/common/model/TaskHandlingThreeLevelReview.php @@ -35,4 +35,14 @@ class TaskHandlingThreeLevelReview extends BaseModel { 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) : ''; + } } \ No newline at end of file