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-04-22 15:27:00 +08:00
parent 07dfbb4a66
commit a30b68adc1
4 changed files with 514 additions and 501 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,22 +12,22 @@
// | author: likeadminTeam // | author: likeadminTeam
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace app\adminapi\lists; namespace app\adminapi\lists;
use app\adminapi\lists\BaseAdminDataLists; use app\common\lists\ListsExcelInterface;
use app\common\lists\ListsExcelInterface; use app\common\lists\ListsSearchInterface;
use app\common\model\ApprovalIssuanceAchievementDocuments; use app\common\model\ApprovalIssuanceAchievementDocuments;
use app\common\lists\ListsSearchInterface; use app\common\model\auth\Admin;
/** /**
* ApprovalIssuanceAchievementDocuments列表 * ApprovalIssuanceAchievementDocuments列表
* Class ApprovalIssuanceAchievementDocumentsLists * Class ApprovalIssuanceAchievementDocumentsLists
* @package app\adminapi\lists * @package app\adminapi\lists
*/ */
class ApprovalIssuanceAchievementDocumentsLists extends BaseAdminDataLists implements ListsSearchInterface,ListsExcelInterface class ApprovalIssuanceAchievementDocumentsLists extends BaseAdminDataLists implements ListsSearchInterface, ListsExcelInterface
{ {
/** /**
@ -40,7 +40,7 @@ class ApprovalIssuanceAchievementDocumentsLists extends BaseAdminDataLists imple
{ {
return [ return [
'=' => ['project_id'], '=' => ['project_id'],
'%like%' => ['task','num'] '%like%' => ['task', 'num']
]; ];
} }
@ -60,7 +60,10 @@ class ApprovalIssuanceAchievementDocumentsLists extends BaseAdminDataLists imple
->with(['projectInfo']) ->with(['projectInfo'])
->limit($this->limitOffset, $this->limitLength) ->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc']) ->order(['id' => 'desc'])
->select() ->select()->each(function ($data) {
$head = Admin::field('name')->where('id', $data['person'])->findOrEmpty();
$data['person_name'] = $head?->name;
})
->toArray(); ->toArray();
} }
@ -101,4 +104,4 @@ class ApprovalIssuanceAchievementDocumentsLists extends BaseAdminDataLists imple
'tips' => '备注', 'tips' => '备注',
]; ];
} }
} }

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

@ -12,22 +12,22 @@
// | author: likeadminTeam // | author: likeadminTeam
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace app\adminapi\lists; namespace app\adminapi\lists;
use app\adminapi\lists\BaseAdminDataLists; use app\common\lists\ListsExcelInterface;
use app\common\lists\ListsExcelInterface; use app\common\lists\ListsSearchInterface;
use app\common\model\TaskHandlingThreeLevelReview; use app\common\model\auth\Admin;
use app\common\lists\ListsSearchInterface; use app\common\model\TaskHandlingThreeLevelReview;
/** /**
* TaskHandlingThreeLevelReview列表 * TaskHandlingThreeLevelReview列表
* Class TaskHandlingThreeLevelReviewLists * Class TaskHandlingThreeLevelReviewLists
* @package app\adminapi\lists * @package app\adminapi\lists
*/ */
class TaskHandlingThreeLevelReviewLists extends BaseAdminDataLists implements ListsSearchInterface,ListsExcelInterface class TaskHandlingThreeLevelReviewLists extends BaseAdminDataLists implements ListsSearchInterface, ListsExcelInterface
{ {
/** /**
@ -57,7 +57,7 @@ class TaskHandlingThreeLevelReviewLists extends BaseAdminDataLists implements Li
{ {
$params = $this->request->get(); $params = $this->request->get();
return TaskHandlingThreeLevelReview::where($this->searchWhere) return TaskHandlingThreeLevelReview::where($this->searchWhere)
->where(function ($query) use($params) { ->where(function ($query) use ($params) {
if (!empty($params['kg_start_time']) && !empty($params['kg_end_time'])) { if (!empty($params['kg_start_time']) && !empty($params['kg_end_time'])) {
$query->whereBetweenTime('kaigong', $params['kg_start_time'], $params['kg_end_time']); $query->whereBetweenTime('kaigong', $params['kg_start_time'], $params['kg_end_time']);
} }
@ -68,7 +68,10 @@ class TaskHandlingThreeLevelReviewLists extends BaseAdminDataLists implements Li
->with(['projectInfo']) ->with(['projectInfo'])
->limit($this->limitOffset, $this->limitLength) ->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc']) ->order(['id' => 'desc'])
->select() ->select()->each(function ($data) {
$head = Admin::field('name')->where('id', $data['head'])->findOrEmpty();
$data['head_name'] = $head?->name;
})
->toArray(); ->toArray();
} }
@ -133,4 +136,4 @@ class TaskHandlingThreeLevelReviewLists extends BaseAdminDataLists implements Li
]; ];
} }
} }

22
app/adminapi/logic/ApprovalIssuanceAchievementDocumentsLogic.php
View File

@ -12,21 +12,22 @@
// | author: likeadminTeam // | author: likeadminTeam
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace app\adminapi\logic; namespace app\adminapi\logic;
use app\common\model\ApprovalIssuanceAchievementDocuments; use app\common\logic\BaseLogic;
use app\common\logic\BaseLogic; use app\common\model\ApprovalIssuanceAchievementDocuments;
use think\facade\Db; use app\common\model\auth\Admin;
use think\facade\Db;
/** /**
* ApprovalIssuanceAchievementDocuments逻辑 * ApprovalIssuanceAchievementDocuments逻辑
* Class ApprovalIssuanceAchievementDocumentsLogic * Class ApprovalIssuanceAchievementDocumentsLogic
* @package app\adminapi\logic * @package app\adminapi\logic
*/ */
class ApprovalIssuanceAchievementDocumentsLogic extends BaseLogic class ApprovalIssuanceAchievementDocumentsLogic extends BaseLogic
{ {
/** /**
@ -121,6 +122,9 @@ class ApprovalIssuanceAchievementDocumentsLogic extends BaseLogic
*/ */
public static function detail($params): array public static function detail($params): array
{ {
return ApprovalIssuanceAchievementDocuments::findOrEmpty($params['id'])->toArray(); $data = ApprovalIssuanceAchievementDocuments::findOrEmpty($params['id']);
$head = Admin::field('name')->where('id', $data['person'])->findOrEmpty();
$data['person_name'] = $head?->name;
return $data->toArray();
}
} }
}

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

@ -12,21 +12,22 @@
// | author: likeadminTeam // | author: likeadminTeam
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace app\adminapi\logic; namespace app\adminapi\logic;
use app\common\model\TaskHandlingThreeLevelReview; use app\common\logic\BaseLogic;
use app\common\logic\BaseLogic; use app\common\model\auth\Admin;
use think\facade\Db; use app\common\model\TaskHandlingThreeLevelReview;
use think\facade\Db;
/** /**
* TaskHandlingThreeLevelReview逻辑 * TaskHandlingThreeLevelReview逻辑
* Class TaskHandlingThreeLevelReviewLogic * Class TaskHandlingThreeLevelReviewLogic
* @package app\adminapi\logic * @package app\adminapi\logic
*/ */
class TaskHandlingThreeLevelReviewLogic extends BaseLogic class TaskHandlingThreeLevelReviewLogic extends BaseLogic
{ {
/** /**
@ -171,6 +172,8 @@ class TaskHandlingThreeLevelReviewLogic extends BaseLogic
public static function detail($params): array public static function detail($params): array
{ {
$data = TaskHandlingThreeLevelReview::with(['projectInfo'])->findOrEmpty($params['id']); $data = TaskHandlingThreeLevelReview::with(['projectInfo'])->findOrEmpty($params['id']);
$head = Admin::field('name')->where('id', $data['head'])->findOrEmpty();
$data['head_name'] = $head?->name;
$data['result_file'] = !empty($data['result_file']) ? json_decode($data['result_file'], true) : ''; $data['result_file'] = !empty($data['result_file']) ? json_decode($data['result_file'], true) : '';
$data['master_annex'] = !empty($data['master_annex']) ? json_decode($data['master_annex'], true) : ''; $data['master_annex'] = !empty($data['master_annex']) ? json_decode($data['master_annex'], true) : '';
$data['bm_annex'] = !empty($data['bm_annex']) ? json_decode($data['bm_annex'], true) : ''; $data['bm_annex'] = !empty($data['bm_annex']) ? json_decode($data['bm_annex'], true) : '';
@ -184,4 +187,4 @@ class TaskHandlingThreeLevelReviewLogic extends BaseLogic
$data['clbc_text'] = $data->clbc_text; $data['clbc_text'] = $data->clbc_text;
return $data->toArray(); return $data->toArray();
} }
} }