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

updat

Browse Source
This commit is contained in:
weiz 2024-04-30 15:12:40 +08:00
parent 44489eea9d
commit 5d3258850f
23 changed files with 2779 additions and 2701 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/adminapi/lists/supervision_prepare/SupervisionPlanningLists.php
View File

@ -12,22 +12,23 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\lists\supervision_prepare;
namespace app\adminapi\lists\supervision_prepare;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\supervision_prepare\SupervisionPlanning;
use app\common\lists\ListsSearchInterface;
use app\common\model\supervision_project\SupervisionProject;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\lists\ListsSearchInterface;
use app\common\model\auth\Admin;
use app\common\model\supervision_prepare\SupervisionPlanning;
use app\common\model\supervision_project\SupervisionProject;
/**
/**
* 工程监理--监理规划列表
* Class SupervisionPlanningLists
* @package app\adminapi\listssupervision_prepare
*/
class SupervisionPlanningLists extends BaseAdminDataLists implements ListsSearchInterface
{
class SupervisionPlanningLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
@ -59,11 +60,13 @@ class SupervisionPlanningLists extends BaseAdminDataLists implements ListsSearch
return SupervisionPlanning::withoutField('update_time,delete_time')->where($this->searchWhere)
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()->each(function($data){
$project = SupervisionProject::field('project_name,project_manager')->where('id',$data['project_id'])->findOrEmpty();
->select()->each(function ($data) {
$project = SupervisionProject::field('project_name,project_manager')->where('id', $data['project_id'])->findOrEmpty();
$admin = Admin::field('name')->where('id', $data['approval_user'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['project_manager'] = $project['project_manager'];
$data['approval_type_text'] = $data->approval_type_text;
$data['approval_user_name'] = $admin?->name;
})
->toArray();
}
@ -80,4 +83,4 @@ class SupervisionPlanningLists extends BaseAdminDataLists implements ListsSearch
return SupervisionPlanning::where($this->searchWhere)->count();
}
}
}

35
app/adminapi/lists/supervision_work/SupervisionDeviceEntryLists.php
View File

@ -12,24 +12,25 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\lists\supervision_work;
namespace app\adminapi\lists\supervision_work;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\supervision_project\SupervisionParticipatingUnits;
use app\common\model\supervision_project\SupervisionProject;
use app\common\model\supervision_work\SupervisionDeviceEntry;
use app\common\lists\ListsSearchInterface;
use app\common\model\supervision_work\SupervisionProblem;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\lists\ListsSearchInterface;
use app\common\model\auth\Admin;
use app\common\model\supervision_project\SupervisionParticipatingUnits;
use app\common\model\supervision_project\SupervisionProject;
use app\common\model\supervision_work\SupervisionDeviceEntry;
use app\common\model\supervision_work\SupervisionProblem;
/**
/**
* 工程监理--设备进场列表
* Class SupervisionDeviceEntryLists
* @package app\adminapi\listssupervision_work
*/
class SupervisionDeviceEntryLists extends BaseAdminDataLists implements ListsSearchInterface
{
class SupervisionDeviceEntryLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
@ -61,14 +62,16 @@ class SupervisionDeviceEntryLists extends BaseAdminDataLists implements ListsSea
return SupervisionDeviceEntry::withoutField('update_time,delete_time')->where($this->searchWhere)
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()->each(function($data){
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
$company = SupervisionParticipatingUnits::field('unit_name')->where('id',$data['company_id'])->findOrEmpty();
->select()->each(function ($data) {
$project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
$company = SupervisionParticipatingUnits::field('unit_name')->where('id', $data['company_id'])->findOrEmpty();
$admin = Admin::field('name')->where('id', $data['co_participant'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['company_name'] = $company['unit_name'];
$data['enter_result_text'] = $data->enter_result_text;
$data['problem_num'] = SupervisionProblem::field('id')->where('data_id',$data['id'])->where('data_type',4)->count();
$data['reply_num'] = SupervisionProblem::field('id')->where('data_id',$data['id'])->where('data_type',4)->where('is_rectification',1)->count();
$data['co_participant_name'] = $admin?->name;
$data['problem_num'] = SupervisionProblem::field('id')->where('data_id', $data['id'])->where('data_type', 4)->count();
$data['reply_num'] = SupervisionProblem::field('id')->where('data_id', $data['id'])->where('data_type', 4)->where('is_rectification', 1)->count();
})
->toArray();
}
@ -85,4 +88,4 @@ class SupervisionDeviceEntryLists extends BaseAdminDataLists implements ListsSea
return SupervisionDeviceEntry::where($this->searchWhere)->count();
}
}
}

26
app/adminapi/lists/supervision_work/SupervisionDiaryLists.php
View File

@ -12,22 +12,23 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\lists\supervision_work;
namespace app\adminapi\lists\supervision_work;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\supervision_project\SupervisionProject;
use app\common\model\supervision_work\SupervisionDiary;
use app\common\lists\ListsSearchInterface;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\lists\ListsSearchInterface;
use app\common\model\auth\Admin;
use app\common\model\supervision_project\SupervisionProject;
use app\common\model\supervision_work\SupervisionDiary;
/**
/**
* 工程监理--监理日记列表
* Class SupervisionDiaryLists
* @package app\adminapi\listssupervision_work
*/
class SupervisionDiaryLists extends BaseAdminDataLists implements ListsSearchInterface
{
class SupervisionDiaryLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
@ -59,9 +60,12 @@ class SupervisionDiaryLists extends BaseAdminDataLists implements ListsSearchInt
return SupervisionDiary::withoutField('create_time,update_time,delete_time')->where($this->searchWhere)
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()->each(function($data){
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
->select()->each(function ($data) {
$project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
$admin = Admin::where('id', 'in', [$data['user'], $data['director']])->column('name', 'id');
$data['project_name'] = $project['project_name'];
$data['user_name'] = $admin[$data['user']] ?? '';
$data['director_name'] = $admin[$data['director']] ?? '';
})
->toArray();
}
@ -78,4 +82,4 @@ class SupervisionDiaryLists extends BaseAdminDataLists implements ListsSearchInt
return SupervisionDiary::where($this->searchWhere)->count();
}
}
}

43
app/adminapi/lists/supervision_work/SupervisionInspectionLists.php
View File

@ -12,25 +12,26 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\lists\supervision_work;
namespace app\adminapi\lists\supervision_work;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\supervision_project\SupervisionParticipatingUnits;
use app\common\model\supervision_project\SupervisionProject;
use app\common\model\supervision_work\SupervisionCheckItem;
use app\common\model\supervision_work\SupervisionInspection;
use app\common\lists\ListsSearchInterface;
use app\common\model\supervision_work\SupervisionProblem;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\lists\ListsSearchInterface;
use app\common\model\auth\Admin;
use app\common\model\supervision_project\SupervisionParticipatingUnits;
use app\common\model\supervision_project\SupervisionProject;
use app\common\model\supervision_work\SupervisionCheckItem;
use app\common\model\supervision_work\SupervisionInspection;
use app\common\model\supervision_work\SupervisionProblem;
/**
/**
* 工程监理--巡视登记列表
* Class SupervisionInspectionLists
* @package app\adminapi\listssupervision_work
*/
class SupervisionInspectionLists extends BaseAdminDataLists implements ListsSearchInterface
{
class SupervisionInspectionLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
@ -62,19 +63,21 @@ class SupervisionInspectionLists extends BaseAdminDataLists implements ListsSear
return SupervisionInspection::withoutField('update_time,delete_time')->where($this->searchWhere)
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()->each(function($data){
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
$check_item = SupervisionCheckItem::field('node_name')->where('id',$data['check_item_id'])->findOrEmpty();
$company = SupervisionParticipatingUnits::field('unit_name')->where('id',$data['company_id'])->findOrEmpty();
$check_item_detail = SupervisionCheckItem::where('id','in',$data['check_item_detail_ids'])->column('node_name');
->select()->each(function ($data) {
$project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
$check_item = SupervisionCheckItem::field('node_name')->where('id', $data['check_item_id'])->findOrEmpty();
$company = SupervisionParticipatingUnits::field('unit_name')->where('id', $data['company_id'])->findOrEmpty();
$check_item_detail = SupervisionCheckItem::where('id', 'in', $data['check_item_detail_ids'])->column('node_name');
$admin = Admin::where('id', 'in', [$data['inspection_user'], $data['follow_user']])->column('name', 'id');
$data['project_name'] = $project['project_name'];
$data['check_item_name'] = $check_item['node_name'];
$data['company_name'] = $company['unit_name'];
$data['check_item_detail_name'] = implode(',',$check_item_detail);
$data['check_item_detail_name'] = implode(',', $check_item_detail);
$data['inspection_type_text'] = $data->inspection_type_text;
$data['is_important_text'] = $data->is_important_text;
$data['problem_num'] = SupervisionProblem::field('id')->where('data_id',$data['id'])->where('data_type',1)->count();
$data['reply_num'] = SupervisionProblem::field('id')->where('data_id',$data['id'])->where('data_type',1)->where('is_rectification',1)->count();
$data['follow_user_name'] = $admin[$data['follow_user']] ?? '';
$data['problem_num'] = SupervisionProblem::field('id')->where('data_id', $data['id'])->where('data_type', 1)->count();
$data['reply_num'] = SupervisionProblem::field('id')->where('data_id', $data['id'])->where('data_type', 1)->where('is_rectification', 1)->count();
})
->toArray();
}
@ -91,4 +94,4 @@ class SupervisionInspectionLists extends BaseAdminDataLists implements ListsSear
return SupervisionInspection::where($this->searchWhere)->count();
}
}
}

32
app/adminapi/lists/supervision_work/SupervisionMaterialEntryLists.php
View File

@ -12,24 +12,24 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\lists\supervision_work;
namespace app\adminapi\lists\supervision_work;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\supervision_project\SupervisionParticipatingUnits;
use app\common\model\supervision_project\SupervisionProject;
use app\common\model\supervision_work\SupervisionMaterialEntry;
use app\common\lists\ListsSearchInterface;
use app\common\model\supervision_work\SupervisionMaterialEntryDetail;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\lists\ListsSearchInterface;
use app\common\model\auth\Admin;
use app\common\model\supervision_project\SupervisionParticipatingUnits;
use app\common\model\supervision_project\SupervisionProject;
use app\common\model\supervision_work\SupervisionMaterialEntry;
/**
/**
* 材料进场列表
* Class SupervisionMaterialEntryLists
* @package app\adminapi\listssupervision_work
*/
class SupervisionMaterialEntryLists extends BaseAdminDataLists implements ListsSearchInterface
{
class SupervisionMaterialEntryLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
@ -41,7 +41,7 @@ class SupervisionMaterialEntryLists extends BaseAdminDataLists implements ListsS
public function setSearch(): array
{
return [
'=' => ['project_id','enter_result','parallel_test'],
'=' => ['project_id', 'enter_result', 'parallel_test'],
'%like%' => ['theme', 'code'],
];
}
@ -61,13 +61,15 @@ class SupervisionMaterialEntryLists extends BaseAdminDataLists implements ListsS
return SupervisionMaterialEntry::withoutField('create_user,create_time,update_time,delete_time')->where($this->searchWhere)
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()->each(function($data){
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
$company = SupervisionParticipatingUnits::field('unit_name')->where('id',$data['company_id'])->findOrEmpty();
->select()->each(function ($data) {
$project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
$company = SupervisionParticipatingUnits::field('unit_name')->where('id', $data['company_id'])->findOrEmpty();
$admin = Admin::field('name')->where('id', $data['co_participant'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['company_name'] = $company['unit_name'];
$data['enter_result_text'] = $data->enter_result_text;
$data['parallel_test_text'] = $data->parallel_test_text;
$data['co_participant_name'] = $admin?->name;
})
->toArray();
}
@ -84,4 +86,4 @@ class SupervisionMaterialEntryLists extends BaseAdminDataLists implements ListsS
return SupervisionMaterialEntry::where($this->searchWhere)->count();
}
}
}

33
app/adminapi/lists/supervision_work/SupervisionMaterialParallelTestingLists.php
View File

@ -12,24 +12,25 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\lists\supervision_work;
namespace app\adminapi\lists\supervision_work;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\supervision_project\SupervisionParticipatingUnits;
use app\common\model\supervision_project\SupervisionProject;
use app\common\model\supervision_work\SupervisionMaterialEntry;
use app\common\model\supervision_work\SupervisionMaterialParallelTesting;
use app\common\lists\ListsSearchInterface;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\lists\ListsSearchInterface;
use app\common\model\auth\Admin;
use app\common\model\supervision_project\SupervisionParticipatingUnits;
use app\common\model\supervision_project\SupervisionProject;
use app\common\model\supervision_work\SupervisionMaterialEntry;
use app\common\model\supervision_work\SupervisionMaterialParallelTesting;
/**
/**
* 工程监理--材料平行检验列表
* Class SupervisionMaterialParallelTestingLists
* @package app\adminapi\listssupervision_work
*/
class SupervisionMaterialParallelTestingLists extends BaseAdminDataLists implements ListsSearchInterface
{
class SupervisionMaterialParallelTestingLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
@ -61,15 +62,17 @@ class SupervisionMaterialParallelTestingLists extends BaseAdminDataLists impleme
return SupervisionMaterialParallelTesting::withoutField('create_user,create_time,update_time,delete_time')->where($this->searchWhere)
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()->each(function($data){
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
$material_entry = SupervisionMaterialEntry::field('code,theme,company_id,enter_time')->where('id',$data['material_entry_id'])->findOrEmpty();
$company = SupervisionParticipatingUnits::field('unit_name')->where('id',$material_entry['company_id'])->findOrEmpty();
->select()->each(function ($data) {
$project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
$material_entry = SupervisionMaterialEntry::field('code,theme,company_id,enter_time')->where('id', $data['material_entry_id'])->findOrEmpty();
$company = SupervisionParticipatingUnits::field('unit_name')->where('id', $material_entry['company_id'])->findOrEmpty();
$admin = Admin::field('name')->where('id', $data['inspector'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['company_name'] = $company['unit_name'];
$data['material_entry_code'] = $material_entry['code'];
$data['theme'] = $material_entry['theme'];
$data['enter_time'] = $material_entry['enter_time'];
$data['inspector_name'] = $admin?->name;
})
->toArray();
}
@ -86,4 +89,4 @@ class SupervisionMaterialParallelTestingLists extends BaseAdminDataLists impleme
return SupervisionMaterialParallelTesting::where($this->searchWhere)->count();
}
}
}

30
app/adminapi/lists/supervision_work/SupervisionNoticeLists.php
View File

@ -12,23 +12,24 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\lists\supervision_work;
namespace app\adminapi\lists\supervision_work;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\supervision_project\SupervisionParticipatingUnits;
use app\common\model\supervision_project\SupervisionProject;
use app\common\model\supervision_work\SupervisionNotice;
use app\common\lists\ListsSearchInterface;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\lists\ListsSearchInterface;
use app\common\model\auth\Admin;
use app\common\model\supervision_project\SupervisionParticipatingUnits;
use app\common\model\supervision_project\SupervisionProject;
use app\common\model\supervision_work\SupervisionNotice;
/**
/**
* 工程监理--监理通知单列表
* Class SupervisionNoticeLists
* @package app\adminapi\listssupervision_work
*/
class SupervisionNoticeLists extends BaseAdminDataLists implements ListsSearchInterface
{
class SupervisionNoticeLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
@ -60,11 +61,14 @@ class SupervisionNoticeLists extends BaseAdminDataLists implements ListsSearchIn
return SupervisionNotice::withoutField('create_user,create_time,update_time,delete_time')->where($this->searchWhere)
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()->each(function($data){
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
$company = SupervisionParticipatingUnits::field('unit_name')->where('id',$data['company_id'])->findOrEmpty();
->select()->each(function ($data) {
$project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
$company = SupervisionParticipatingUnits::field('unit_name')->where('id', $data['company_id'])->findOrEmpty();
$admin = Admin::where('id', 'in', [$data['notify_user'], $data['rectification_reply_user']])->column('name', 'id');
$data['project_name'] = $project['project_name'];
$data['company_name'] = $company['unit_name'];
$data['notify_user_name'] = $admin[$data['notify_user']] ?? '';
$data['rectification_reply_user_name'] = $admin[$data['rectification_reply_user']] ?? '';
})
->toArray();
}
@ -81,4 +85,4 @@ class SupervisionNoticeLists extends BaseAdminDataLists implements ListsSearchIn
return SupervisionNotice::where($this->searchWhere)->count();
}
}
}

43
app/adminapi/lists/supervision_work/SupervisionSideStationLists.php
View File

@ -12,25 +12,26 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\lists\supervision_work;
namespace app\adminapi\lists\supervision_work;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\supervision_project\SupervisionParticipatingUnits;
use app\common\model\supervision_project\SupervisionProject;
use app\common\model\supervision_work\SupervisionCheckItem;
use app\common\model\supervision_work\SupervisionProblem;
use app\common\model\supervision_work\SupervisionSideStation;
use app\common\lists\ListsSearchInterface;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\lists\ListsSearchInterface;
use app\common\model\auth\Admin;
use app\common\model\supervision_project\SupervisionParticipatingUnits;
use app\common\model\supervision_project\SupervisionProject;
use app\common\model\supervision_work\SupervisionCheckItem;
use app\common\model\supervision_work\SupervisionProblem;
use app\common\model\supervision_work\SupervisionSideStation;
/**
/**
* 工程监理--旁站登记列表
* Class SupervisionSideStationLists
* @package app\adminapi\listssupervision_work
*/
class SupervisionSideStationLists extends BaseAdminDataLists implements ListsSearchInterface
{
class SupervisionSideStationLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
@ -62,19 +63,21 @@ class SupervisionSideStationLists extends BaseAdminDataLists implements ListsSea
return SupervisionSideStation::withoutField('update_time,delete_time')->where($this->searchWhere)
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()->each(function($data){
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
$check_item = SupervisionCheckItem::field('node_name')->where('id',$data['check_item_id'])->findOrEmpty();
$company = SupervisionParticipatingUnits::field('unit_name')->where('id',$data['company_id'])->findOrEmpty();
$check_item_detail = SupervisionCheckItem::where('id','in',$data['check_item_detail_ids'])->column('node_name');
->select()->each(function ($data) {
$project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
$check_item = SupervisionCheckItem::field('node_name')->where('id', $data['check_item_id'])->findOrEmpty();
$company = SupervisionParticipatingUnits::field('unit_name')->where('id', $data['company_id'])->findOrEmpty();
$check_item_detail = SupervisionCheckItem::where('id', 'in', $data['check_item_detail_ids'])->column('node_name');
$admin = Admin::field('name')->where('id', $data['side_station_user'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['check_item_name'] = $check_item['node_name'];
$data['company_name'] = $company['unit_name'];
$data['check_item_detail_name'] = implode(',',$check_item_detail);
$data['check_item_detail_name'] = implode(',', $check_item_detail);
$data['side_station_type_text'] = $data->side_station_type_text;
$data['side_station_result_text'] = $data->side_station_result_text;
$data['problem_num'] = SupervisionProblem::field('id')->where('data_id',$data['id'])->where('data_type',2)->count();
$data['reply_num'] = SupervisionProblem::field('id')->where('data_id',$data['id'])->where('data_type',2)->where('is_rectification',1)->count();
$data['side_station_user_name'] = $admin?->name;
$data['problem_num'] = SupervisionProblem::field('id')->where('data_id', $data['id'])->where('data_type', 2)->count();
$data['reply_num'] = SupervisionProblem::field('id')->where('data_id', $data['id'])->where('data_type', 2)->where('is_rectification', 1)->count();
})
->toArray();
}
@ -91,4 +94,4 @@ class SupervisionSideStationLists extends BaseAdminDataLists implements ListsSea
return SupervisionSideStation::where($this->searchWhere)->count();
}
}
}

35
app/adminapi/lists/supervision_work/SupervisionTestBlocksSpecimensLists.php
View File

@ -12,24 +12,25 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\lists\supervision_work;
namespace app\adminapi\lists\supervision_work;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\supervision_project\SupervisionParticipatingUnits;
use app\common\model\supervision_project\SupervisionProject;
use app\common\model\supervision_work\SupervisionProblem;
use app\common\model\supervision_work\SupervisionTestBlocksSpecimens;
use app\common\lists\ListsSearchInterface;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\lists\ListsSearchInterface;
use app\common\model\auth\Admin;
use app\common\model\supervision_project\SupervisionParticipatingUnits;
use app\common\model\supervision_project\SupervisionProject;
use app\common\model\supervision_work\SupervisionProblem;
use app\common\model\supervision_work\SupervisionTestBlocksSpecimens;
/**
/**
* 工程监理--试块试件见证列表
* Class SupervisionTestBlocksSpecimensLists
* @package app\adminapi\listssupervision_work
*/
class SupervisionTestBlocksSpecimensLists extends BaseAdminDataLists implements ListsSearchInterface
{
class SupervisionTestBlocksSpecimensLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
@ -61,14 +62,16 @@ class SupervisionTestBlocksSpecimensLists extends BaseAdminDataLists implements
return SupervisionTestBlocksSpecimens::withoutField('update_time,delete_time')->where($this->searchWhere)
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()->each(function($data){
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
$company = SupervisionParticipatingUnits::field('unit_name')->where('id',$data['company_id'])->findOrEmpty();
->select()->each(function ($data) {
$project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
$company = SupervisionParticipatingUnits::field('unit_name')->where('id', $data['company_id'])->findOrEmpty();
$admin = Admin::field('name')->where('id', $data['witness'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['company_name'] = $company['unit_name'];
$data['test_result_text'] = $data->test_result_text;
$data['problem_num'] = SupervisionProblem::field('id')->where('data_id',$data['id'])->where('data_type',6)->count();
$data['reply_num'] = SupervisionProblem::field('id')->where('data_id',$data['id'])->where('data_type',6)->where('is_rectification',1)->count();
$data['witness_name'] = $admin?->name;
$data['problem_num'] = SupervisionProblem::field('id')->where('data_id', $data['id'])->where('data_type', 6)->count();
$data['reply_num'] = SupervisionProblem::field('id')->where('data_id', $data['id'])->where('data_type', 6)->where('is_rectification', 1)->count();
})
->toArray();
}
@ -85,4 +88,4 @@ class SupervisionTestBlocksSpecimensLists extends BaseAdminDataLists implements
return SupervisionTestBlocksSpecimens::where($this->searchWhere)->count();
}
}
}

35
app/adminapi/lists/supervision_work/SupervisionWitnessSamplingLists.php
View File

@ -12,25 +12,25 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\lists\supervision_work;
namespace app\adminapi\lists\supervision_work;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\supervision_project\SupervisionParticipatingUnits;
use app\common\model\supervision_project\SupervisionProject;
use app\common\model\supervision_work\SupervisionMaterialEntry;
use app\common\model\supervision_work\SupervisionWitnessSampling;
use app\common\lists\ListsSearchInterface;
use app\common\model\supervision_work\SupervisionWitnessSamplingDetail;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\lists\ListsSearchInterface;
use app\common\model\auth\Admin;
use app\common\model\supervision_project\SupervisionParticipatingUnits;
use app\common\model\supervision_project\SupervisionProject;
use app\common\model\supervision_work\SupervisionMaterialEntry;
use app\common\model\supervision_work\SupervisionWitnessSampling;
/**
/**
* 工程监理--见证取样列表
* Class SupervisionWitnessSamplingLists
* @package app\adminapi\listssupervision_work
*/
class SupervisionWitnessSamplingLists extends BaseAdminDataLists implements ListsSearchInterface
{
class SupervisionWitnessSamplingLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
@ -62,15 +62,18 @@ class SupervisionWitnessSamplingLists extends BaseAdminDataLists implements List
return SupervisionWitnessSampling::withoutField('create_user,create_time,update_time,delete_time')->where($this->searchWhere)
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()->each(function($data){
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
$material_entry = SupervisionMaterialEntry::field('code,theme,company_id,enter_time')->where('id',$data['material_entry_id'])->findOrEmpty();
$company = SupervisionParticipatingUnits::field('unit_name')->where('id',$material_entry['company_id'])->findOrEmpty();
->select()->each(function ($data) {
$project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
$material_entry = SupervisionMaterialEntry::field('code,theme,company_id,enter_time')->where('id', $data['material_entry_id'])->findOrEmpty();
$company = SupervisionParticipatingUnits::field('unit_name')->where('id', $material_entry['company_id'])->findOrEmpty();
$admin = Admin::where('id', 'in', [$data['witness'], $data['sampler']])->column('name', 'id');
$data['project_name'] = $project['project_name'];
$data['company_name'] = $company['unit_name'];
$data['material_entry_code'] = $material_entry['code'];
$data['theme'] = $material_entry['theme'];
$data['enter_time'] = $material_entry['enter_time'];
$data['witness_name'] = $admin[$data['witness']] ?? '';
$data['sampler_name'] = $admin[$data['sampler']] ?? '';
})
->toArray();
}
@ -87,4 +90,4 @@ class SupervisionWitnessSamplingLists extends BaseAdminDataLists implements List
return SupervisionWitnessSampling::where($this->searchWhere)->count();
}
}
}

26
app/adminapi/lists/supervision_work/SupervisionWorkContactLists.php
View File

@ -12,22 +12,23 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\lists\supervision_work;
namespace app\adminapi\lists\supervision_work;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\supervision_project\SupervisionProject;
use app\common\model\supervision_work\SupervisionWorkContact;
use app\common\lists\ListsSearchInterface;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\lists\ListsSearchInterface;
use app\common\model\auth\Admin;
use app\common\model\supervision_project\SupervisionProject;
use app\common\model\supervision_work\SupervisionWorkContact;
/**
/**
* 工程监理--监理工作联系单列表
* Class SupervisionWorkContactLists
* @package app\adminapi\listssupervision_work
*/
class SupervisionWorkContactLists extends BaseAdminDataLists implements ListsSearchInterface
{
class SupervisionWorkContactLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
@ -60,9 +61,12 @@ class SupervisionWorkContactLists extends BaseAdminDataLists implements ListsSea
->field(['id', 'project_id', 'code', 'initiator', 'initiation_date', 'theme', 'copy_user'])
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()->each(function($data){
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
->select()->each(function ($data) {
$project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
$admin = Admin::where('id', 'in', [$data['initiator'], $data['copy_user']])->column('name', 'id');
$data['project_name'] = $project['project_name'];
$data['initiator_name'] = $admin[$data['initiator']] ?? '';
$data['copy_user_name'] = $admin[$data['copy_user']] ?? '';
})
->toArray();
}
@ -79,4 +83,4 @@ class SupervisionWorkContactLists extends BaseAdminDataLists implements ListsSea
return SupervisionWorkContact::where($this->searchWhere)->count();
}
}
}

23
app/adminapi/logic/supervision_prepare/SupervisionPlanningLogic.php
View File

@ -12,22 +12,23 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\logic\supervision_prepare;
namespace app\adminapi\logic\supervision_prepare;
use app\common\model\supervision_prepare\SupervisionPlanning;
use app\common\logic\BaseLogic;
use app\common\model\supervision_project\SupervisionProject;
use think\facade\Db;
use app\common\logic\BaseLogic;
use app\common\model\auth\Admin;
use app\common\model\supervision_prepare\SupervisionPlanning;
use app\common\model\supervision_project\SupervisionProject;
use think\facade\Db;
/**
/**
* 工程监理--监理规划逻辑
* Class SupervisionPlanningLogic
* @package app\adminapi\logic\supervision_prepare
*/
class SupervisionPlanningLogic extends BaseLogic
{
class SupervisionPlanningLogic extends BaseLogic
{
/**
@ -118,10 +119,12 @@ class SupervisionPlanningLogic extends BaseLogic
public static function detail($params): array
{
$data = SupervisionPlanning::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$project = SupervisionProject::field('project_name,project_manager')->where('id',$data['project_id'])->findOrEmpty();
$project = SupervisionProject::field('project_name,project_manager')->where('id', $data['project_id'])->findOrEmpty();
$admin = Admin::field('name')->where('id', $data['approval_user'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['project_manager'] = $project['project_manager'];
$data['approval_type_text'] = $data->approval_type_text;
$data['approval_user_name'] = $admin?->name;
return $data->toArray();
}
}
}

67
app/adminapi/logic/supervision_work/SupervisionDeviceEntryLogic.php
View File

@ -12,25 +12,26 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\logic\supervision_work;
namespace app\adminapi\logic\supervision_work;
use app\common\model\supervision_project\SupervisionParticipatingUnits;
use app\common\model\supervision_project\SupervisionProject;
use app\common\model\supervision_work\SupervisionDeviceEntry;
use app\common\logic\BaseLogic;
use app\common\model\supervision_work\SupervisionDeviceEntryDetail;
use app\common\model\supervision_work\SupervisionProblem;
use think\facade\Db;
use app\common\logic\BaseLogic;
use app\common\model\auth\Admin;
use app\common\model\supervision_project\SupervisionParticipatingUnits;
use app\common\model\supervision_project\SupervisionProject;
use app\common\model\supervision_work\SupervisionDeviceEntry;
use app\common\model\supervision_work\SupervisionDeviceEntryDetail;
use app\common\model\supervision_work\SupervisionProblem;
use think\facade\Db;
/**
/**
* 工程监理--设备进场逻辑
* Class SupervisionDeviceEntryLogic
* @package app\adminapi\logic\supervision_work
*/
class SupervisionDeviceEntryLogic extends BaseLogic
{
class SupervisionDeviceEntryLogic extends BaseLogic
{
/**
@ -55,8 +56,8 @@ class SupervisionDeviceEntryLogic extends BaseLogic
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
]);
if(!empty($params['entry_detail'])){
foreach($params['entry_detail'] as $v){
if (!empty($params['entry_detail'])) {
foreach ($params['entry_detail'] as $v) {
SupervisionDeviceEntryDetail::create([
'device_entry_id' => $res->id,
'name' => $v['name'],
@ -70,8 +71,8 @@ class SupervisionDeviceEntryLogic extends BaseLogic
]);
}
}
if(!empty($params['entry_problem'])){
foreach($params['entry_problem'] as $v){
if (!empty($params['entry_problem'])) {
foreach ($params['entry_problem'] as $v) {
SupervisionProblem::create([
'data_id' => $res->id,
'data_type' => 4,
@ -114,10 +115,10 @@ class SupervisionDeviceEntryLogic extends BaseLogic
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
'update_time' => time()
]);
if(!empty($params['entry_detail'])){
foreach($params['entry_detail'] as $v){
if(!empty($v['id'])){
SupervisionDeviceEntryDetail::where('id',$v['id'])->update([
if (!empty($params['entry_detail'])) {
foreach ($params['entry_detail'] as $v) {
if (!empty($v['id'])) {
SupervisionDeviceEntryDetail::where('id', $v['id'])->update([
'device_entry_id' => $params['id'],
'name' => $v['name'],
'brand' => $v['brand'],
@ -129,7 +130,7 @@ class SupervisionDeviceEntryLogic extends BaseLogic
'verify' => $v['verify'],
'update_time' => time()
]);
}else{
} else {
SupervisionDeviceEntryDetail::create([
'device_entry_id' => $params['id'],
'name' => $v['name'],
@ -144,10 +145,10 @@ class SupervisionDeviceEntryLogic extends BaseLogic
}
}
}
if(!empty($params['entry_problem'])){
foreach($params['entry_problem'] as $v){
if(!empty($v['id'])){
SupervisionProblem::where('id',$v['id'])->update([
if (!empty($params['entry_problem'])) {
foreach ($params['entry_problem'] as $v) {
if (!empty($v['id'])) {
SupervisionProblem::where('id', $v['id'])->update([
'data_id' => $params['id'],
'data_type' => 4,
'problem_cate' => $v['problem_cate'],
@ -155,7 +156,7 @@ class SupervisionDeviceEntryLogic extends BaseLogic
'problem_name' => $v['problem_name'],
'update_time' => time()
]);
}else{
} else {
SupervisionProblem::create([
'data_id' => $params['id'],
'data_type' => 4,
@ -186,13 +187,13 @@ class SupervisionDeviceEntryLogic extends BaseLogic
*/
public static function delete(array $params): bool
{
$entry_detail = SupervisionDeviceEntryDetail::where('device_entry_id','in',$params['id'])->findOrEmpty();
if(!$entry_detail->isEmpty()){
$entry_detail = SupervisionDeviceEntryDetail::where('device_entry_id', 'in', $params['id'])->findOrEmpty();
if (!$entry_detail->isEmpty()) {
self::setError('该内容下存在设备信息数据，请先删除设备信息数据');
return false;
}
$entry_problem = SupervisionProblem::where('data_id','in',$params['id'])->where('data_type',4)->findOrEmpty();
if(!$entry_problem->isEmpty()){
$entry_problem = SupervisionProblem::where('data_id', 'in', $params['id'])->where('data_type', 4)->findOrEmpty();
if (!$entry_problem->isEmpty()) {
self::setError('该内容下存在设备问题数据，请先删除设备问题数据');
return false;
}
@ -210,11 +211,13 @@ class SupervisionDeviceEntryLogic extends BaseLogic
public static function detail($params): array
{
$data = SupervisionDeviceEntry::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
$company = SupervisionParticipatingUnits::field('unit_name')->where('id',$data['company_id'])->findOrEmpty();
$project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
$company = SupervisionParticipatingUnits::field('unit_name')->where('id', $data['company_id'])->findOrEmpty();
$admin = Admin::field('name')->where('id', $data['co_participant'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['company_name'] = $company['unit_name'];
$data['enter_result_text'] = $data->enter_result_text;
$data['co_participant_name'] = $admin?->name;
return $data->toArray();
}
}
}

24
app/adminapi/logic/supervision_work/SupervisionDiaryLogic.php
View File

@ -12,22 +12,23 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\logic\supervision_work;
namespace app\adminapi\logic\supervision_work;
use app\common\model\supervision_project\SupervisionProject;
use app\common\model\supervision_work\SupervisionDiary;
use app\common\logic\BaseLogic;
use think\facade\Db;
use app\common\logic\BaseLogic;
use app\common\model\auth\Admin;
use app\common\model\supervision_project\SupervisionProject;
use app\common\model\supervision_work\SupervisionDiary;
use think\facade\Db;
/**
/**
* 工程监理--监理日记逻辑
* Class SupervisionDiaryLogic
* @package app\adminapi\logic\supervision_work
*/
class SupervisionDiaryLogic extends BaseLogic
{
class SupervisionDiaryLogic extends BaseLogic
{
/**
@ -124,8 +125,11 @@ class SupervisionDiaryLogic extends BaseLogic
public static function detail($params): array
{
$data = SupervisionDiary::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id']);
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
$project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
$admin = Admin::where('id', 'in', [$data['user'], $data['director']])->column('name', 'id');
$data['project_name'] = $project['project_name'];
$data['user_name'] = $admin[$data['user']] ?? '';
$data['director_name'] = $admin[$data['director']] ?? '';
return $data->toArray();
}
}
}

82
app/adminapi/logic/supervision_work/SupervisionInspectionLogic.php
View File

@ -12,26 +12,27 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\logic\supervision_work;
namespace app\adminapi\logic\supervision_work;
use app\common\model\supervision_project\SupervisionParticipatingUnits;
use app\common\model\supervision_project\SupervisionProject;
use app\common\model\supervision_work\SupervisionCheckItem;
use app\common\model\supervision_work\SupervisionInspection;
use app\common\logic\BaseLogic;
use app\common\model\supervision_work\SupervisionInspectionResult;
use app\common\model\supervision_work\SupervisionProblem;
use think\facade\Db;
use app\common\logic\BaseLogic;
use app\common\model\auth\Admin;
use app\common\model\supervision_project\SupervisionParticipatingUnits;
use app\common\model\supervision_project\SupervisionProject;
use app\common\model\supervision_work\SupervisionCheckItem;
use app\common\model\supervision_work\SupervisionInspection;
use app\common\model\supervision_work\SupervisionInspectionResult;
use app\common\model\supervision_work\SupervisionProblem;
use think\facade\Db;
/**
/**
* 工程监理--巡视登记逻辑
* Class SupervisionInspectionLogic
* @package app\adminapi\logic\supervision_work
*/
class SupervisionInspectionLogic extends BaseLogic
{
class SupervisionInspectionLogic extends BaseLogic
{
/**
@ -65,8 +66,8 @@ class SupervisionInspectionLogic extends BaseLogic
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
]);
if(!empty($params['inspection_result'])){
foreach($params['inspection_result'] as $v){
if (!empty($params['inspection_result'])) {
foreach ($params['inspection_result'] as $v) {
SupervisionInspectionResult::create([
'inspection_id' => $res->id,
'check_type' => $v['check_type'],
@ -76,8 +77,8 @@ class SupervisionInspectionLogic extends BaseLogic
]);
}
}
if(!empty($params['inspection_problem'])){
foreach($params['inspection_problem'] as $v){
if (!empty($params['inspection_problem'])) {
foreach ($params['inspection_problem'] as $v) {
SupervisionProblem::create([
'data_id' => $res->id,
'data_type' => 1,
@ -107,7 +108,7 @@ class SupervisionInspectionLogic extends BaseLogic
*/
public static function edit(array $params): bool
{
$data = SupervisionInspection::field('check_item_detail_ids')->where('id',$params['id'])->findOrEmpty();
$data = SupervisionInspection::field('check_item_detail_ids')->where('id', $params['id'])->findOrEmpty();
Db::startTrans();
try {
SupervisionInspection::where('id', $params['id'])->update([
@ -130,14 +131,14 @@ class SupervisionInspectionLogic extends BaseLogic
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
'update_time' => time(),
]);
if(json_encode($data['check_item_detail_ids']) != json_encode($params['check_item_detail_ids'])){
$supervision_inspection_result_ids = SupervisionInspectionResult::where('inspection_id',$params['id'])->column('id');
if (json_encode($data['check_item_detail_ids']) != json_encode($params['check_item_detail_ids'])) {
$supervision_inspection_result_ids = SupervisionInspectionResult::where('inspection_id', $params['id'])->column('id');
SupervisionInspectionResult::destroy($supervision_inspection_result_ids);
}
if(!empty($params['inspection_result'])){
foreach($params['inspection_result'] as $v){
if(!empty($v['id'])){
SupervisionInspectionResult::where('id',$v['id'])->update([
if (!empty($params['inspection_result'])) {
foreach ($params['inspection_result'] as $v) {
if (!empty($v['id'])) {
SupervisionInspectionResult::where('id', $v['id'])->update([
'inspection_id' => $params['id'],
'check_type' => $v['check_type'],
'check_content' => $v['check_content'],
@ -145,7 +146,7 @@ class SupervisionInspectionLogic extends BaseLogic
'check_result' => $v['check_result'],
'update_time' => time(),
]);
}else{
} else {
SupervisionInspectionResult::create([
'inspection_id' => $params['id'],
'check_type' => $v['check_type'],
@ -156,17 +157,17 @@ class SupervisionInspectionLogic extends BaseLogic
}
}
}
if(!empty($params['inspection_problem'])){
foreach($params['inspection_problem'] as $v){
if(!empty($v['id'])){
SupervisionProblem::where('id',$v['id'])->update([
if (!empty($params['inspection_problem'])) {
foreach ($params['inspection_problem'] as $v) {
if (!empty($v['id'])) {
SupervisionProblem::where('id', $v['id'])->update([
'data_id' => $params['id'],
'data_type' => 1,
'problem_cate' => $v['problem_cate'],
'problem_description' => $v['problem_description'],
'problem_name' => $v['problem_name'],
]);
}else{
} else {
SupervisionProblem::create([
'data_id' => $params['id'],
'data_type' => 1,
@ -197,13 +198,13 @@ class SupervisionInspectionLogic extends BaseLogic
*/
public static function delete(array $params): bool
{
$inspection_result = SupervisionInspectionResult::where('inspection_id','in',$params['id'])->findOrEmpty();
if(!$inspection_result->isEmpty()){
$inspection_result = SupervisionInspectionResult::where('inspection_id', 'in', $params['id'])->findOrEmpty();
if (!$inspection_result->isEmpty()) {
self::setError('该巡视内容下存在巡视结果数据，请先删除巡视结果数据');
return false;
}
$inspection_problem = SupervisionProblem::where('data_id','in',$params['id'])->where('data_type',1)->findOrEmpty();
if(!$inspection_problem->isEmpty()){
$inspection_problem = SupervisionProblem::where('data_id', 'in', $params['id'])->where('data_type', 1)->findOrEmpty();
if (!$inspection_problem->isEmpty()) {
self::setError('该巡视内容下存在巡视问题数据，请先删除巡视问题数据');
return false;
}
@ -221,16 +222,19 @@ class SupervisionInspectionLogic extends BaseLogic
public static function detail($params): array
{
$data = SupervisionInspection::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
$check_item = SupervisionCheckItem::field('node_name')->where('id',$data['check_item_id'])->findOrEmpty();
$company = SupervisionParticipatingUnits::field('unit_name')->where('id',$data['company_id'])->findOrEmpty();
$check_item_detail = SupervisionCheckItem::where('id','in',$data['check_item_detail_ids'])->column('node_name');
$project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
$check_item = SupervisionCheckItem::field('node_name')->where('id', $data['check_item_id'])->findOrEmpty();
$company = SupervisionParticipatingUnits::field('unit_name')->where('id', $data['company_id'])->findOrEmpty();
$check_item_detail = SupervisionCheckItem::where('id', 'in', $data['check_item_detail_ids'])->column('node_name');
$admin = Admin::where('id', 'in', [$data['inspection_user'], $data['follow_user']])->column('name', 'id');
$data['project_name'] = $project['project_name'];
$data['check_item_name'] = $check_item['node_name'];
$data['company_name'] = $company['unit_name'];
$data['check_item_detail_name'] = implode(',',$check_item_detail);
$data['check_item_detail_name'] = implode(',', $check_item_detail);
$data['inspection_type_text'] = $data->inspection_type_text;
$data['is_important_text'] = $data->is_important_text;
$data['inspection_user_name'] = $admin[$data['inspection_user']] ?? '';
$data['follow_user_name'] = $admin[$data['follow_user']] ?? '';
return $data->toArray();
}
}
}

49
app/adminapi/logic/supervision_work/SupervisionMaterialEntryLogic.php
View File

@ -12,24 +12,25 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\logic\supervision_work;
namespace app\adminapi\logic\supervision_work;
use app\common\model\supervision_project\SupervisionParticipatingUnits;
use app\common\model\supervision_project\SupervisionProject;
use app\common\model\supervision_work\SupervisionMaterialEntry;
use app\common\logic\BaseLogic;
use app\common\model\supervision_work\SupervisionMaterialEntryDetail;
use think\facade\Db;
use app\common\logic\BaseLogic;
use app\common\model\auth\Admin;
use app\common\model\supervision_project\SupervisionParticipatingUnits;
use app\common\model\supervision_project\SupervisionProject;
use app\common\model\supervision_work\SupervisionMaterialEntry;
use app\common\model\supervision_work\SupervisionMaterialEntryDetail;
use think\facade\Db;
/**
/**
* 材料进场逻辑
* Class SupervisionMaterialEntryLogic
* @package app\adminapi\logic\supervision_work
*/
class SupervisionMaterialEntryLogic extends BaseLogic
{
class SupervisionMaterialEntryLogic extends BaseLogic
{
/**
@ -56,8 +57,8 @@ class SupervisionMaterialEntryLogic extends BaseLogic
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
]);
if(!empty($params['entry_detail'])){
foreach($params['entry_detail'] as $v) {
if (!empty($params['entry_detail'])) {
foreach ($params['entry_detail'] as $v) {
SupervisionMaterialEntryDetail::create([
'material_entry_id' => $res->id,
'name' => $v['name'],
@ -103,10 +104,10 @@ class SupervisionMaterialEntryLogic extends BaseLogic
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
'update_time' => time(),
]);
if(!empty($params['entry_detail'])){
foreach($params['entry_detail'] as $v) {
if(!empty($v['id'])){
SupervisionMaterialEntryDetail::where('id',$v['id'])->update([
if (!empty($params['entry_detail'])) {
foreach ($params['entry_detail'] as $v) {
if (!empty($v['id'])) {
SupervisionMaterialEntryDetail::where('id', $v['id'])->update([
'material_entry_id' => $params['id'],
'name' => $v['name'],
'brand' => $v['brand'],
@ -116,7 +117,7 @@ class SupervisionMaterialEntryLogic extends BaseLogic
'entry_number' => $v['entry_number'],
'update_time' => time()
]);
}else{
} else {
SupervisionMaterialEntryDetail::create([
'material_entry_id' => $params['id'],
'name' => $v['name'],
@ -148,8 +149,8 @@ class SupervisionMaterialEntryLogic extends BaseLogic
*/
public static function delete(array $params): bool
{
$entry_detail = SupervisionMaterialEntryDetail::where('material_entry_id','in',$params['id'])->findOrEmpty();
if(!$entry_detail->isEmpty()){
$entry_detail = SupervisionMaterialEntryDetail::where('material_entry_id', 'in', $params['id'])->findOrEmpty();
if (!$entry_detail->isEmpty()) {
self::setError('当前数据下存在材料信息记录,请先删除材料信息记录');
return false;
}
@ -167,12 +168,14 @@ class SupervisionMaterialEntryLogic extends BaseLogic
public static function detail($params): array
{
$data = SupervisionMaterialEntry::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
$company = SupervisionParticipatingUnits::field('unit_name')->where('id',$data['company_id'])->findOrEmpty();
$project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
$company = SupervisionParticipatingUnits::field('unit_name')->where('id', $data['company_id'])->findOrEmpty();
$admin = Admin::field('name')->where('id', $data['co_participant'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['company_name'] = $company['unit_name'];
$data['enter_result_text'] = $data->enter_result_text;
$data['parallel_test_text'] = $data->parallel_test_text;
$data['co_participant_name'] = $admin?->name;
return $data->toArray();
}
@ -180,10 +183,10 @@ class SupervisionMaterialEntryLogic extends BaseLogic
{
$datas = SupervisionMaterialEntry::field(['id', 'code'])
->order(['id' => 'desc'])
->select()->each(function($data){
->select()->each(function ($data) {
$data['projectinfo'] = 'ID：' . $data['id'] . ' / 编码：' . $data['code'];
})
->toArray();
return $datas;
}
}
}

51
app/adminapi/logic/supervision_work/SupervisionMaterialParallelTestingLogic.php
View File

@ -12,25 +12,26 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\logic\supervision_work;
namespace app\adminapi\logic\supervision_work;
use app\common\model\supervision_project\SupervisionParticipatingUnits;
use app\common\model\supervision_project\SupervisionProject;
use app\common\model\supervision_work\SupervisionMaterialEntry;
use app\common\model\supervision_work\SupervisionMaterialParallelTesting;
use app\common\logic\BaseLogic;
use app\common\model\supervision_work\SupervisionMaterialParallelTestingDetail;
use think\facade\Db;
use app\common\logic\BaseLogic;
use app\common\model\auth\Admin;
use app\common\model\supervision_project\SupervisionParticipatingUnits;
use app\common\model\supervision_project\SupervisionProject;
use app\common\model\supervision_work\SupervisionMaterialEntry;
use app\common\model\supervision_work\SupervisionMaterialParallelTesting;
use app\common\model\supervision_work\SupervisionMaterialParallelTestingDetail;
use think\facade\Db;
/**
/**
* 工程监理--材料平行检验逻辑
* Class SupervisionMaterialParallelTestingLogic
* @package app\adminapi\logic\supervision_work
*/
class SupervisionMaterialParallelTestingLogic extends BaseLogic
{
class SupervisionMaterialParallelTestingLogic extends BaseLogic
{
/**
@ -55,8 +56,8 @@ class SupervisionMaterialParallelTestingLogic extends BaseLogic
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
]);
if(!empty($params['detail'])){
foreach($params['detail'] as $v){
if (!empty($params['detail'])) {
foreach ($params['detail'] as $v) {
SupervisionMaterialParallelTestingDetail::create([
'material_parallel_testing_id' => $res->id,
'material_entry_detail_id' => $v['material_entry_detail_id'],
@ -96,16 +97,16 @@ class SupervisionMaterialParallelTestingLogic extends BaseLogic
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
'update_time' => time()
]);
if(!empty($params['detail'])){
foreach($params['detail'] as $v){
if(!empty($v['id'])){
SupervisionMaterialParallelTestingDetail::where('id',$v['id'])->update([
if (!empty($params['detail'])) {
foreach ($params['detail'] as $v) {
if (!empty($v['id'])) {
SupervisionMaterialParallelTestingDetail::where('id', $v['id'])->update([
'material_parallel_testing_id' => $params['id'],
'material_entry_detail_id' => $v['material_entry_detail_id'],
'num' => $v['num'],
'update_time' => time()
]);
}else{
} else {
SupervisionMaterialParallelTestingDetail::create([
'material_parallel_testing_id' => $params['id'],
'material_entry_detail_id' => $v['material_entry_detail_id'],
@ -133,8 +134,8 @@ class SupervisionMaterialParallelTestingLogic extends BaseLogic
*/
public static function delete(array $params): bool
{
$detail = SupervisionMaterialParallelTestingDetail::where('material_parallel_testing_id',$params['id'])->findOrEmpty();
if(!$detail->isEmpty()){
$detail = SupervisionMaterialParallelTestingDetail::where('material_parallel_testing_id', $params['id'])->findOrEmpty();
if (!$detail->isEmpty()) {
self::setError('当前数据下存在材料信息内容,请先删除材料信息内容');
return false;
}
@ -152,13 +153,15 @@ class SupervisionMaterialParallelTestingLogic extends BaseLogic
public static function detail($params): array
{
$data = SupervisionMaterialParallelTesting::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
$material_entry = SupervisionMaterialEntry::field('theme,company_id,enter_time')->where('id',$data['material_entry_id'])->findOrEmpty();
$company = SupervisionParticipatingUnits::field('unit_name')->where('id',$material_entry['company_id'])->findOrEmpty();
$project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
$material_entry = SupervisionMaterialEntry::field('theme,company_id,enter_time')->where('id', $data['material_entry_id'])->findOrEmpty();
$company = SupervisionParticipatingUnits::field('unit_name')->where('id', $material_entry['company_id'])->findOrEmpty();
$admin = Admin::field('name')->where('id', $data['inspector'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['company_name'] = $company['unit_name'];
$data['material_entry_name'] = $material_entry['theme'];
$data['enter_time'] = $material_entry['enter_time'];
$data['inspector_name'] = $admin?->name;
return $data->toArray();
}
}
}

25
app/adminapi/logic/supervision_work/SupervisionMeetingMinutesLogic.php
View File

@ -12,22 +12,23 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\logic\supervision_work;
namespace app\adminapi\logic\supervision_work;
use app\common\model\supervision_project\SupervisionProject;
use app\common\model\supervision_work\SupervisionMeetingMinutes;
use app\common\logic\BaseLogic;
use think\facade\Db;
use app\common\logic\BaseLogic;
use app\common\model\auth\Admin;
use app\common\model\supervision_project\SupervisionProject;
use app\common\model\supervision_work\SupervisionMeetingMinutes;
use think\facade\Db;
/**
/**
* 工程监理--会议纪要逻辑
* Class SupervisionMeetingMinutesLogic
* @package app\adminapi\logic\supervision_work
*/
class SupervisionMeetingMinutesLogic extends BaseLogic
{
class SupervisionMeetingMinutesLogic extends BaseLogic
{
/**
@ -124,8 +125,12 @@ class SupervisionMeetingMinutesLogic extends BaseLogic
public static function detail($params): array
{
$data = SupervisionMeetingMinutes::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
$project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
$admin = Admin::where('id', 'in', [$data['emcee'], $data['recorder']])->column('name', 'id');
$attendees = Admin::where('id', 'in', $data['attendees'])->column('name');
$data['project_name'] = $project['project_name'];
$data['emcee_name'] = $admin[$data['emcee']] ?? '';
$data['recorder_name'] = $admin[$data['recorder']] ?? '';
return $data->toArray();
}
}
}

48
app/adminapi/logic/supervision_work/SupervisionNoticeLogic.php
View File

@ -12,24 +12,25 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\logic\supervision_work;
namespace app\adminapi\logic\supervision_work;
use app\common\model\supervision_project\SupervisionParticipatingUnits;
use app\common\model\supervision_project\SupervisionProject;
use app\common\model\supervision_work\SupervisionNotice;
use app\common\logic\BaseLogic;
use app\common\model\supervision_work\SupervisionNoticeProblem;
use think\facade\Db;
use app\common\logic\BaseLogic;
use app\common\model\auth\Admin;
use app\common\model\supervision_project\SupervisionParticipatingUnits;
use app\common\model\supervision_project\SupervisionProject;
use app\common\model\supervision_work\SupervisionNotice;
use app\common\model\supervision_work\SupervisionNoticeProblem;
use think\facade\Db;
/**
/**
* 工程监理--监理通知单逻辑
* Class SupervisionNoticeLogic
* @package app\adminapi\logic\supervision_work
*/
class SupervisionNoticeLogic extends BaseLogic
{
class SupervisionNoticeLogic extends BaseLogic
{
/**
@ -54,8 +55,8 @@ class SupervisionNoticeLogic extends BaseLogic
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
]);
if(!empty($params['problem'])){
foreach($params['problem'] as $v){
if (!empty($params['problem'])) {
foreach ($params['problem'] as $v) {
SupervisionNoticeProblem::create([
'notice_id' => $res->id,
'problem_description' => $v['problem_description'],
@ -96,16 +97,16 @@ class SupervisionNoticeLogic extends BaseLogic
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
'update_time' => time(),
]);
if(!empty($params['problem'])){
foreach($params['problem'] as $v){
if(!empty($v['id'])){
SupervisionNoticeProblem::where('id',$v['id'])->update([
if (!empty($params['problem'])) {
foreach ($params['problem'] as $v) {
if (!empty($v['id'])) {
SupervisionNoticeProblem::where('id', $v['id'])->update([
'notice_id' => $params['id'],
'problem_description' => $v['problem_description'],
'content_description' => $v['content_description'],
'demand_description' => $v['demand_description'],
]);
}else{
} else {
SupervisionNoticeProblem::create([
'notice_id' => $params['id'],
'problem_description' => $v['problem_description'],
@ -160,8 +161,8 @@ class SupervisionNoticeLogic extends BaseLogic
*/
public static function delete(array $params): bool
{
$problem = SupervisionNoticeProblem::where('notice_id','in',$params['id'])->findOrEmpty();
if(!$problem->isEmpty()){
$problem = SupervisionNoticeProblem::where('notice_id', 'in', $params['id'])->findOrEmpty();
if (!$problem->isEmpty()) {
self::setError('该数据下存在通知问题数据，请先删除通知问题数据');
return false;
}
@ -179,10 +180,13 @@ class SupervisionNoticeLogic extends BaseLogic
public static function detail($params): array
{
$data = SupervisionNotice::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
$company = SupervisionParticipatingUnits::field('unit_name')->where('id',$data['company_id'])->findOrEmpty();
$project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
$company = SupervisionParticipatingUnits::field('unit_name')->where('id', $data['company_id'])->findOrEmpty();
$admin = Admin::where('id', 'in', [$data['notify_user'], $data['rectification_reply_user']])->column('name', 'id');
$data['project_name'] = $project['project_name'];
$data['company_name'] = $company['unit_name'];
$data['notify_user_name'] = $admin[$data['notify_user']] ?? '';
$data['rectification_reply_user_name'] = $admin[$data['rectification_reply_user']] ?? '';
return $data->toArray();
}
}
}

81
app/adminapi/logic/supervision_work/SupervisionSideStationLogic.php
View File

@ -12,26 +12,27 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\logic\supervision_work;
namespace app\adminapi\logic\supervision_work;
use app\common\model\supervision_project\SupervisionParticipatingUnits;
use app\common\model\supervision_project\SupervisionProject;
use app\common\model\supervision_work\SupervisionCheckItem;
use app\common\model\supervision_work\SupervisionProblem;
use app\common\model\supervision_work\SupervisionSideStation;
use app\common\logic\BaseLogic;
use app\common\model\supervision_work\SupervisionSideStationResult;
use think\facade\Db;
use app\common\logic\BaseLogic;
use app\common\model\auth\Admin;
use app\common\model\supervision_project\SupervisionParticipatingUnits;
use app\common\model\supervision_project\SupervisionProject;
use app\common\model\supervision_work\SupervisionCheckItem;
use app\common\model\supervision_work\SupervisionProblem;
use app\common\model\supervision_work\SupervisionSideStation;
use app\common\model\supervision_work\SupervisionSideStationResult;
use think\facade\Db;
/**
/**
* 工程监理--旁站登记逻辑
* Class SupervisionSideStationLogic
* @package app\adminapi\logic\supervision_work
*/
class SupervisionSideStationLogic extends BaseLogic
{
class SupervisionSideStationLogic extends BaseLogic
{
/**
@ -64,8 +65,8 @@ class SupervisionSideStationLogic extends BaseLogic
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
]);
if(!empty($params['side_result'])){
foreach($params['side_result'] as $v){
if (!empty($params['side_result'])) {
foreach ($params['side_result'] as $v) {
SupervisionSideStationResult::create([
'side_station_id' => $res->id,
'check_type' => $v['check_type'],
@ -75,8 +76,8 @@ class SupervisionSideStationLogic extends BaseLogic
]);
}
}
if(!empty($params['side_problem'])){
foreach($params['side_problem'] as $v){
if (!empty($params['side_problem'])) {
foreach ($params['side_problem'] as $v) {
SupervisionProblem::create([
'data_id' => $res->id,
'data_type' => 2,
@ -106,7 +107,7 @@ class SupervisionSideStationLogic extends BaseLogic
*/
public static function edit(array $params): bool
{
$data = SupervisionSideStation::field('check_item_detail_ids')->where('id',$params['id'])->findOrEmpty();
$data = SupervisionSideStation::field('check_item_detail_ids')->where('id', $params['id'])->findOrEmpty();
Db::startTrans();
try {
SupervisionSideStation::where('id', $params['id'])->update([
@ -128,14 +129,14 @@ class SupervisionSideStationLogic extends BaseLogic
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
'update_time' => time(),
]);
if(json_encode($data['check_item_detail_ids']) != json_encode($params['check_item_detail_ids'])){
$side_result_ids = SupervisionSideStationResult::where('side_station_id',$params['id'])->column('id');
if (json_encode($data['check_item_detail_ids']) != json_encode($params['check_item_detail_ids'])) {
$side_result_ids = SupervisionSideStationResult::where('side_station_id', $params['id'])->column('id');
SupervisionSideStationResult::destroy($side_result_ids);
}
if(!empty($params['side_result'])){
foreach($params['side_result'] as $v){
if(!empty($v['id'])){
SupervisionSideStationResult::where('id',$v['id'])->update([
if (!empty($params['side_result'])) {
foreach ($params['side_result'] as $v) {
if (!empty($v['id'])) {
SupervisionSideStationResult::where('id', $v['id'])->update([
'side_station_id' => $params['id'],
'check_type' => $v['check_type'],
'check_content' => $v['check_content'],
@ -143,7 +144,7 @@ class SupervisionSideStationLogic extends BaseLogic
'check_result' => $v['check_result'],
'update_time' => time(),
]);
}else{
} else {
SupervisionSideStationResult::create([
'side_station_id' => $params['id'],
'check_type' => $v['check_type'],
@ -154,10 +155,10 @@ class SupervisionSideStationLogic extends BaseLogic
}
}
}
if(!empty($params['side_problem'])){
foreach($params['side_problem'] as $v){
if(!empty($v['id'])){
SupervisionProblem::where('id',$v['id'])->update([
if (!empty($params['side_problem'])) {
foreach ($params['side_problem'] as $v) {
if (!empty($v['id'])) {
SupervisionProblem::where('id', $v['id'])->update([
'data_id' => $params['id'],
'data_type' => 2,
'problem_cate' => $v['problem_cate'],
@ -165,7 +166,7 @@ class SupervisionSideStationLogic extends BaseLogic
'problem_name' => $v['problem_name'],
'update_time' => time(),
]);
}else{
} else {
SupervisionProblem::create([
'data_id' => $params['id'],
'data_type' => 2,
@ -196,13 +197,13 @@ class SupervisionSideStationLogic extends BaseLogic
*/
public static function delete(array $params): bool
{
$side_station_result = SupervisionSideStationResult::where('side_station_id','in',$params['id'])->findOrEmpty();
if(!$side_station_result->isEmpty()){
$side_station_result = SupervisionSideStationResult::where('side_station_id', 'in', $params['id'])->findOrEmpty();
if (!$side_station_result->isEmpty()) {
self::setError('该旁站内容下存在旁站结果数据，请先删除旁站结果数据');
return false;
}
$side_station_problem = SupervisionProblem::where('data_id','in',$params['id'])->where('data_type',2)->findOrEmpty();
if(!$side_station_problem->isEmpty()){
$side_station_problem = SupervisionProblem::where('data_id', 'in', $params['id'])->where('data_type', 2)->findOrEmpty();
if (!$side_station_problem->isEmpty()) {
self::setError('该旁站内容下存在旁站问题数据，请先删除旁站问题数据');
return false;
}
@ -220,16 +221,18 @@ class SupervisionSideStationLogic extends BaseLogic
public static function detail($params): array
{
$data = SupervisionSideStation::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
$check_item = SupervisionCheckItem::field('node_name')->where('id',$data['check_item_id'])->findOrEmpty();
$company = SupervisionParticipatingUnits::field('unit_name')->where('id',$data['company_id'])->findOrEmpty();
$check_item_detail = SupervisionCheckItem::where('id','in',$data['check_item_detail_ids'])->column('node_name');
$project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
$check_item = SupervisionCheckItem::field('node_name')->where('id', $data['check_item_id'])->findOrEmpty();
$company = SupervisionParticipatingUnits::field('unit_name')->where('id', $data['company_id'])->findOrEmpty();
$check_item_detail = SupervisionCheckItem::where('id', 'in', $data['check_item_detail_ids'])->column('node_name');
$admin = Admin::field('name')->where('id', $data['side_station_user'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['check_item_name'] = $check_item['node_name'];
$data['company_name'] = $company['unit_name'];
$data['check_item_detail_name'] = implode(',',$check_item_detail);
$data['check_item_detail_name'] = implode(',', $check_item_detail);
$data['side_station_type_text'] = $data->side_station_type_text;
$data['side_station_result_text'] = $data->side_station_result_text;
$data['side_station_user_name'] = $admin?->name;
return $data->toArray();
}
}
}

47
app/adminapi/logic/supervision_work/SupervisionTestBlocksSpecimensLogic.php
View File

@ -12,24 +12,25 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\logic\supervision_work;
namespace app\adminapi\logic\supervision_work;
use app\common\model\supervision_project\SupervisionParticipatingUnits;
use app\common\model\supervision_project\SupervisionProject;
use app\common\model\supervision_work\SupervisionProblem;
use app\common\model\supervision_work\SupervisionTestBlocksSpecimens;
use app\common\logic\BaseLogic;
use think\facade\Db;
use app\common\logic\BaseLogic;
use app\common\model\auth\Admin;
use app\common\model\supervision_project\SupervisionParticipatingUnits;
use app\common\model\supervision_project\SupervisionProject;
use app\common\model\supervision_work\SupervisionProblem;
use app\common\model\supervision_work\SupervisionTestBlocksSpecimens;
use think\facade\Db;
/**
/**
* 工程监理--试块试件见证逻辑
* Class SupervisionTestBlocksSpecimensLogic
* @package app\adminapi\logic\supervision_work
*/
class SupervisionTestBlocksSpecimensLogic extends BaseLogic
{
class SupervisionTestBlocksSpecimensLogic extends BaseLogic
{
/**
@ -58,8 +59,8 @@ class SupervisionTestBlocksSpecimensLogic extends BaseLogic
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
]);
if(!empty($params['problem'])){
foreach($params['problem'] as $v){
if (!empty($params['problem'])) {
foreach ($params['problem'] as $v) {
SupervisionProblem::create([
'data_id' => $res->id,
'data_type' => 6,
@ -105,10 +106,10 @@ class SupervisionTestBlocksSpecimensLogic extends BaseLogic
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
]);
if(!empty($params['problem'])){
foreach($params['problem'] as $v){
if(!empty($v['id'])){
SupervisionProblem::where('id',$v['id'])->update([
if (!empty($params['problem'])) {
foreach ($params['problem'] as $v) {
if (!empty($v['id'])) {
SupervisionProblem::where('id', $v['id'])->update([
'data_id' => $params['id'],
'data_type' => 6,
'problem_cate' => $v['problem_cate'],
@ -116,7 +117,7 @@ class SupervisionTestBlocksSpecimensLogic extends BaseLogic
'problem_name' => $v['problem_name'],
'update_time' => time(),
]);
}else{
} else {
SupervisionProblem::create([
'data_id' => $params['id'],
'data_type' => 6,
@ -147,8 +148,8 @@ class SupervisionTestBlocksSpecimensLogic extends BaseLogic
*/
public static function delete(array $params): bool
{
$problem = SupervisionProblem::where('data_id','in',$params['id'])->where('data_type',6)->findOrEmpty();
if(!$problem->isEmpty()){
$problem = SupervisionProblem::where('data_id', 'in', $params['id'])->where('data_type', 6)->findOrEmpty();
if (!$problem->isEmpty()) {
self::setError('该内容下存在试块试件见证问题数据，请先删除试块试件见证问题数据');
return false;
}
@ -166,11 +167,13 @@ class SupervisionTestBlocksSpecimensLogic extends BaseLogic
public static function detail($params): array
{
$data = SupervisionTestBlocksSpecimens::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
$company = SupervisionParticipatingUnits::field('unit_name')->where('id',$data['company_id'])->findOrEmpty();
$project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
$company = SupervisionParticipatingUnits::field('unit_name')->where('id', $data['company_id'])->findOrEmpty();
$admin = Admin::field('name')->where('id', $data['witness'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['company_name'] = $company['unit_name'];
$data['test_result_text'] = $data->test_result_text;
$data['witness_name'] = $admin?->name;
return $data->toArray();
}
}
}

52
app/adminapi/logic/supervision_work/SupervisionWitnessSamplingLogic.php
View File

@ -12,25 +12,26 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\logic\supervision_work;
namespace app\adminapi\logic\supervision_work;
use app\common\model\supervision_project\SupervisionParticipatingUnits;
use app\common\model\supervision_project\SupervisionProject;
use app\common\model\supervision_work\SupervisionMaterialEntry;
use app\common\model\supervision_work\SupervisionWitnessSampling;
use app\common\logic\BaseLogic;
use app\common\model\supervision_work\SupervisionWitnessSamplingDetail;
use think\facade\Db;
use app\common\logic\BaseLogic;
use app\common\model\auth\Admin;
use app\common\model\supervision_project\SupervisionParticipatingUnits;
use app\common\model\supervision_project\SupervisionProject;
use app\common\model\supervision_work\SupervisionMaterialEntry;
use app\common\model\supervision_work\SupervisionWitnessSampling;
use app\common\model\supervision_work\SupervisionWitnessSamplingDetail;
use think\facade\Db;
/**
/**
* 工程监理--见证取样逻辑
* Class SupervisionWitnessSamplingLogic
* @package app\adminapi\logic\supervision_work
*/
class SupervisionWitnessSamplingLogic extends BaseLogic
{
class SupervisionWitnessSamplingLogic extends BaseLogic
{
/**
@ -55,8 +56,8 @@ class SupervisionWitnessSamplingLogic extends BaseLogic
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
]);
if(!empty($params['sampling_detail'])){
foreach($params['sampling_detail'] as $v){
if (!empty($params['sampling_detail'])) {
foreach ($params['sampling_detail'] as $v) {
SupervisionWitnessSamplingDetail::create([
'witness_sampling_id' => $res->id,
'material_entry_detail_id' => $v['material_entry_detail_id'],
@ -96,16 +97,16 @@ class SupervisionWitnessSamplingLogic extends BaseLogic
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
'update_time' => time()
]);
if(!empty($params['sampling_detail'])){
foreach($params['sampling_detail'] as $v){
if(!empty($v['id'])){
SupervisionWitnessSamplingDetail::where('id',$v['id'])->update([
if (!empty($params['sampling_detail'])) {
foreach ($params['sampling_detail'] as $v) {
if (!empty($v['id'])) {
SupervisionWitnessSamplingDetail::where('id', $v['id'])->update([
'witness_sampling_id' => $params['id'],
'material_entry_detail_id' => $v['material_entry_detail_id'],
'num' => $v['num'],
'update_time' => time()
]);
}else{
} else {
SupervisionWitnessSamplingDetail::create([
'witness_sampling_id' => $params['id'],
'material_entry_detail_id' => $v['material_entry_detail_id'],
@ -134,8 +135,8 @@ class SupervisionWitnessSamplingLogic extends BaseLogic
*/
public static function delete(array $params): bool
{
$witness_sampling_detail = SupervisionWitnessSamplingDetail::where('witness_sampling_id','in',$params['id'])->findOrEmpty();
if(!$witness_sampling_detail->isEmpty()){
$witness_sampling_detail = SupervisionWitnessSamplingDetail::where('witness_sampling_id', 'in', $params['id'])->findOrEmpty();
if (!$witness_sampling_detail->isEmpty()) {
self::setError('当前数据下存在材料信息内容,请先删除材料信息内容');
return false;
}
@ -153,13 +154,16 @@ class SupervisionWitnessSamplingLogic extends BaseLogic
public static function detail($params): array
{
$data = SupervisionWitnessSampling::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
$material_entry = SupervisionMaterialEntry::field('theme,company_id,enter_time')->where('id',$data['material_entry_id'])->findOrEmpty();
$company = SupervisionParticipatingUnits::field('unit_name')->where('id',$material_entry['company_id'])->findOrEmpty();
$project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
$material_entry = SupervisionMaterialEntry::field('theme,company_id,enter_time')->where('id', $data['material_entry_id'])->findOrEmpty();
$company = SupervisionParticipatingUnits::field('unit_name')->where('id', $material_entry['company_id'])->findOrEmpty();
$admin = Admin::where('id', 'in', [$data['witness'], $data['sampler']])->column('name', 'id');
$data['project_name'] = $project['project_name'];
$data['company_name'] = $company['unit_name'];
$data['material_entry_name'] = $material_entry['theme'];
$data['enter_time'] = $material_entry['enter_time'];
$data['witness_name'] = $admin[$data['witness']] ?? '';
$data['sampler_name'] = $admin[$data['sampler']] ?? '';
return $data->toArray();
}
}
}

44
app/adminapi/logic/supervision_work/SupervisionWorkContactLogic.php
View File

@ -12,23 +12,24 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\logic\supervision_work;
namespace app\adminapi\logic\supervision_work;
use app\common\model\supervision_project\SupervisionProject;
use app\common\model\supervision_work\SupervisionWorkContact;
use app\common\logic\BaseLogic;
use app\common\model\supervision_work\SupervisionWorkContactProblem;
use think\facade\Db;
use app\common\logic\BaseLogic;
use app\common\model\auth\Admin;
use app\common\model\supervision_project\SupervisionProject;
use app\common\model\supervision_work\SupervisionWorkContact;
use app\common\model\supervision_work\SupervisionWorkContactProblem;
use think\facade\Db;
/**
/**
* 工程监理--监理工作联系单逻辑
* Class SupervisionWorkContactLogic
* @package app\adminapi\logic\supervision_work
*/
class SupervisionWorkContactLogic extends BaseLogic
{
class SupervisionWorkContactLogic extends BaseLogic
{
/**
@ -51,8 +52,8 @@ class SupervisionWorkContactLogic extends BaseLogic
'copy_user' => $params['copy_user'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
]);
if(!empty($params['problem'])){
foreach($params['problem'] as $v){
if (!empty($params['problem'])) {
foreach ($params['problem'] as $v) {
SupervisionWorkContactProblem::create([
'work_contact_id' => $res->id,
'problem_name' => $v['problem_name'],
@ -90,15 +91,15 @@ class SupervisionWorkContactLogic extends BaseLogic
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'update_time' => time()
]);
if(!empty($params['problem'])){
foreach($params['problem'] as $v){
if(!empty($v['id'])){
SupervisionWorkContactProblem::where('id',$v['id'])->update([
if (!empty($params['problem'])) {
foreach ($params['problem'] as $v) {
if (!empty($v['id'])) {
SupervisionWorkContactProblem::where('id', $v['id'])->update([
'work_contact_id' => $params['id'],
'problem_name' => $v['problem_name'],
'problem_description' => $v['problem_description'],
]);
}else{
} else {
SupervisionWorkContactProblem::create([
'work_contact_id' => $params['id'],
'problem_name' => $v['problem_name'],
@ -126,8 +127,8 @@ class SupervisionWorkContactLogic extends BaseLogic
*/
public static function delete(array $params): bool
{
$problem = SupervisionWorkContactProblem::where('work_contact_id','in',$params['id'])->findOrEmpty();
if(!$problem->isEmpty()){
$problem = SupervisionWorkContactProblem::where('work_contact_id', 'in', $params['id'])->findOrEmpty();
if (!$problem->isEmpty()) {
self::setError('该数据下存在通知问题数据，请先删除通知问题数据');
return false;
}
@ -145,8 +146,11 @@ class SupervisionWorkContactLogic extends BaseLogic
public static function detail($params): array
{
$data = SupervisionWorkContact::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id']);
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
$project = SupervisionProject::field('project_name')->where('id', $data['project_id'])->findOrEmpty();
$admin = Admin::where('id', 'in', [$data['initiator'], $data['copy_user']])->column('name', 'id');
$data['project_name'] = $project['project_name'];
$data['initiator_name'] = $admin[$data['initiator']] ?? '';
$data['copy_user_name'] = $admin[$data['copy_user']] ?? '';
return $data->toArray();
}
}
}