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

update

Browse Source
This commit is contained in:
weiz 2024-03-12 14:03:57 +08:00
parent 3b7a1eb39c
commit f36b761638
157 changed files with 358 additions and 737 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/adminapi/controller/supervision_connect/SupervisionProjectCaseReviewController.php
View File

@ -52,7 +52,7 @@ class SupervisionProjectCaseReviewController extends BaseAdminController
public function add()
{
$params = (new SupervisionProjectCaseReviewValidate())->post()->goCheck('add');
$result = SupervisionProjectCaseReviewLogic::add($params,$this->adminId);
$result = SupervisionProjectCaseReviewLogic::add($params);
if (true === $result) {
return $this->success('添加成功', [], 1, 1);
}

2
app/adminapi/controller/supervision_connect/SupervisionProjectInfoReportController.php
View File

@ -52,7 +52,7 @@ class SupervisionProjectInfoReportController extends BaseAdminController
public function add()
{
$params = (new SupervisionProjectInfoReportValidate())->post()->goCheck('add');
$result = SupervisionProjectInfoReportLogic::add($params,$this->adminId);
$result = SupervisionProjectInfoReportLogic::add($params);
if (true === $result) {
return $this->success('添加成功', [], 1, 1);
}

2
app/adminapi/controller/supervision_connect/SupervisionProjectMilestonesController.php
View File

@ -52,7 +52,7 @@ class SupervisionProjectMilestonesController extends BaseAdminController
public function add()
{
$params = (new SupervisionProjectMilestonesValidate())->post()->goCheck('add');
$result = SupervisionProjectMilestonesLogic::add($params,$this->adminId);
$result = SupervisionProjectMilestonesLogic::add($params);
if (true === $result) {
return $this->success('添加成功', [], 1, 1);
}

2
app/adminapi/controller/supervision_connect/SupervisionProjectMonthlyReportController.php
View File

@ -52,7 +52,7 @@ class SupervisionProjectMonthlyReportController extends BaseAdminController
public function add()
{
$params = (new SupervisionProjectMonthlyReportValidate())->post()->goCheck('add');
$result = SupervisionProjectMonthlyReportLogic::add($params,$this->adminId);
$result = SupervisionProjectMonthlyReportLogic::add($params);
if (true === $result) {
return $this->success('添加成功', [], 1, 1);
}

2
app/adminapi/controller/supervision_const_prepare/SupervisionCommencementReportController.php
View File

@ -52,7 +52,7 @@ class SupervisionCommencementReportController extends BaseAdminController
public function add()
{
$params = (new SupervisionCommencementReportValidate())->post()->goCheck('add');
$result = SupervisionCommencementReportLogic::add($params,$this->adminId);
$result = SupervisionCommencementReportLogic::add($params);
if (true === $result) {
return $this->success('添加成功', [], 1, 1);
}

2
app/adminapi/controller/supervision_const_prepare/SupervisionDesignDisclosureController.php
View File

@ -52,7 +52,7 @@ class SupervisionDesignDisclosureController extends BaseAdminController
public function add()
{
$params = (new SupervisionDesignDisclosureValidate())->post()->goCheck('add');
$result = SupervisionDesignDisclosureLogic::add($params,$this->adminId);
$result = SupervisionDesignDisclosureLogic::add($params);
if (true === $result) {
return $this->success('添加成功', [], 1, 1);
}

2
app/adminapi/controller/supervision_const_prepare/SupervisionFirstMeetingController.php
View File

@ -52,7 +52,7 @@ class SupervisionFirstMeetingController extends BaseAdminController
public function add()
{
$params = (new SupervisionFirstMeetingValidate())->post()->goCheck('add');
$result = SupervisionFirstMeetingLogic::add($params,$this->adminId);
$result = SupervisionFirstMeetingLogic::add($params);
if (true === $result) {
return $this->success('添加成功', [], 1, 1);
}

2
app/adminapi/controller/supervision_const_prepare/SupervisionRulesController.php
View File

@ -52,7 +52,7 @@ class SupervisionRulesController extends BaseAdminController
public function add()
{
$params = (new SupervisionRulesValidate())->post()->goCheck('add');
$result = SupervisionRulesLogic::add($params,$this->adminId);
$result = SupervisionRulesLogic::add($params);
if (true === $result) {
return $this->success('添加成功', [], 1, 1);
}

2
app/adminapi/controller/supervision_const_prepare/SupervisionRulesDisclosureController.php
View File

@ -52,7 +52,7 @@ class SupervisionRulesDisclosureController extends BaseAdminController
public function add()
{
$params = (new SupervisionRulesDisclosureValidate())->post()->goCheck('add');
$result = SupervisionRulesDisclosureLogic::add($params,$this->adminId);
$result = SupervisionRulesDisclosureLogic::add($params);
if (true === $result) {
return $this->success('添加成功', [], 1, 1);
}

2
app/adminapi/controller/supervision_dangerous/SupervisionDangerousEngineeringCaseController.php
View File

@ -52,7 +52,7 @@ class SupervisionDangerousEngineeringCaseController extends BaseAdminController
public function add()
{
$params = (new SupervisionDangerousEngineeringCaseValidate())->post()->goCheck('add');
$result = SupervisionDangerousEngineeringCaseLogic::add($params,$this->adminId);
$result = SupervisionDangerousEngineeringCaseLogic::add($params);
if (true === $result) {
return $this->success('添加成功', [], 1, 1);
}

2
app/adminapi/controller/supervision_dangerous/SupervisionExcessRiskSecurityMonitoringController.php
View File

@ -52,7 +52,7 @@ class SupervisionExcessRiskSecurityMonitoringController extends BaseAdminControl
public function add()
{
$params = (new SupervisionExcessRiskSecurityMonitoringValidate())->post()->goCheck('add');
$result = SupervisionExcessRiskSecurityMonitoringLogic::add($params,$this->adminId);
$result = SupervisionExcessRiskSecurityMonitoringLogic::add($params);
if (true === $result) {
return $this->success('添加成功', [], 1, 1);
}

2
app/adminapi/controller/supervision_dangerous/SupervisionHighRiskSecurityMonitoringController.php
View File

@ -52,7 +52,7 @@ class SupervisionHighRiskSecurityMonitoringController extends BaseAdminControlle
public function add()
{
$params = (new SupervisionHighRiskSecurityMonitoringValidate())->post()->goCheck('add');
$result = SupervisionHighRiskSecurityMonitoringLogic::add($params,$this->adminId);
$result = SupervisionHighRiskSecurityMonitoringLogic::add($params);
if (true === $result) {
return $this->success('添加成功', [], 1, 1);
}

2
app/adminapi/controller/supervision_ending/SupervisionProjectAcceptanceReportController.php
View File

@ -52,7 +52,7 @@ class SupervisionProjectAcceptanceReportController extends BaseAdminController
public function add()
{
$params = (new SupervisionProjectAcceptanceReportValidate())->post()->goCheck('add');
$result = SupervisionProjectAcceptanceReportLogic::add($params,$this->adminId);
$result = SupervisionProjectAcceptanceReportLogic::add($params);
if (true === $result) {
return $this->success('添加成功', [], 1, 1);
}

2
app/adminapi/controller/supervision_prepare/SupervisionConstructionPlanningController.php
View File

@ -52,7 +52,7 @@ class SupervisionConstructionPlanningController extends BaseAdminController
public function add()
{
$params = (new SupervisionConstructionPlanningValidate())->post()->goCheck('add');
$result = SupervisionConstructionPlanningLogic::add($params,$this->adminId);
$result = SupervisionConstructionPlanningLogic::add($params);
if (true === $result) {
return $this->success('添加成功', [], 1, 1);
}

2
app/adminapi/controller/supervision_prepare/SupervisionContractDisclosureController.php
View File

@ -52,7 +52,7 @@ class SupervisionContractDisclosureController extends BaseAdminController
public function add()
{
$params = (new SupervisionContractDisclosureValidate())->post()->goCheck('add');
$result = SupervisionContractDisclosureLogic::add($params,$this->adminId);
$result = SupervisionContractDisclosureLogic::add($params);
if (true === $result) {
return $this->success('添加成功', [], 1, 1);
}

2
app/adminapi/controller/supervision_prepare/SupervisionPlanningController.php
View File

@ -52,7 +52,7 @@ class SupervisionPlanningController extends BaseAdminController
public function add()
{
$params = (new SupervisionPlanningValidate())->post()->goCheck('add');
$result = SupervisionPlanningLogic::add($params,$this->adminId);
$result = SupervisionPlanningLogic::add($params);
if (true === $result) {
return $this->success('添加成功', [], 1, 1);
}

2
app/adminapi/controller/supervision_project/SupervisionProjectController.php
View File

@ -52,7 +52,7 @@ class SupervisionProjectController extends BaseAdminController
public function add()
{
$params = (new SupervisionProjectValidate())->post()->goCheck('add');
$result = SupervisionProjectLogic::add($params,$this->adminId);
$result = SupervisionProjectLogic::add($params);
if (true === $result) {
return $this->success('添加成功', [], 1, 1);
}

2
app/adminapi/controller/supervision_qualification_review/SupervisionConstructionManagementPersonnelController.php
View File

@ -52,7 +52,7 @@ class SupervisionConstructionManagementPersonnelController extends BaseAdminCont
public function add()
{
$params = (new SupervisionConstructionManagementPersonnelValidate())->post()->goCheck('add');
$result = SupervisionConstructionManagementPersonnelLogic::add($params,$this->adminId);
$result = SupervisionConstructionManagementPersonnelLogic::add($params);
if (true === $result) {
return $this->success('添加成功', [], 1, 1);
}

2
app/adminapi/controller/supervision_qualification_review/SupervisionLargeEquipmentController.php
View File

@ -52,7 +52,7 @@ class SupervisionLargeEquipmentController extends BaseAdminController
public function add()
{
$params = (new SupervisionLargeEquipmentValidate())->post()->goCheck('add');
$result = SupervisionLargeEquipmentLogic::add($params,$this->adminId);
$result = SupervisionLargeEquipmentLogic::add($params);
if (true === $result) {
return $this->success('添加成功', [], 1, 1);
}

4
app/adminapi/controller/supervision_work/SupervisionAcceptController.php
View File

@ -52,7 +52,7 @@ class SupervisionAcceptController extends BaseAdminController
public function add()
{
$params = (new SupervisionAcceptValidate())->post()->goCheck('add');
$result = SupervisionAcceptLogic::add($params,$this->adminId);
$result = SupervisionAcceptLogic::add($params);
if (true === $result) {
return $this->success('添加成功', [], 1, 1);
}
@ -69,7 +69,7 @@ class SupervisionAcceptController extends BaseAdminController
public function edit()
{
$params = (new SupervisionAcceptValidate())->post()->goCheck('edit');
$result = SupervisionAcceptLogic::edit($params,$this->adminId);
$result = SupervisionAcceptLogic::edit($params);
if (true === $result) {
return $this->success('编辑成功', [], 1, 1);
}

4
app/adminapi/controller/supervision_work/SupervisionDeviceEntryController.php
View File

@ -52,7 +52,7 @@ class SupervisionDeviceEntryController extends BaseAdminController
public function add()
{
$params = (new SupervisionDeviceEntryValidate())->post()->goCheck('add');
$result = SupervisionDeviceEntryLogic::add($params,$this->adminId);
$result = SupervisionDeviceEntryLogic::add($params);
if (true === $result) {
return $this->success('添加成功', [], 1, 1);
}
@ -69,7 +69,7 @@ class SupervisionDeviceEntryController extends BaseAdminController
public function edit()
{
$params = (new SupervisionDeviceEntryValidate())->post()->goCheck('edit');
$result = SupervisionDeviceEntryLogic::edit($params,$this->adminId);
$result = SupervisionDeviceEntryLogic::edit($params);
if (true === $result) {
return $this->success('编辑成功', [], 1, 1);
}

4
app/adminapi/controller/supervision_work/SupervisionEntityParallelTestingController.php
View File

@ -52,7 +52,7 @@ class SupervisionEntityParallelTestingController extends BaseAdminController
public function add()
{
$params = (new SupervisionEntityParallelTestingValidate())->post()->goCheck('add');
$result = SupervisionEntityParallelTestingLogic::add($params,$this->adminId);
$result = SupervisionEntityParallelTestingLogic::add($params);
if (true === $result) {
return $this->success('添加成功', [], 1, 1);
}
@ -69,7 +69,7 @@ class SupervisionEntityParallelTestingController extends BaseAdminController
public function edit()
{
$params = (new SupervisionEntityParallelTestingValidate())->post()->goCheck('edit');
$result = SupervisionEntityParallelTestingLogic::edit($params,$this->adminId);
$result = SupervisionEntityParallelTestingLogic::edit($params);
if (true === $result) {
return $this->success('编辑成功', [], 1, 1);
}

4
app/adminapi/controller/supervision_work/SupervisionInspectionController.php
View File

@ -52,7 +52,7 @@ class SupervisionInspectionController extends BaseAdminController
public function add()
{
$params = (new SupervisionInspectionValidate())->post()->goCheck('add');
$result = SupervisionInspectionLogic::add($params,$this->adminId);
$result = SupervisionInspectionLogic::add($params);
if (true === $result) {
return $this->success('添加成功', [], 1, 1);
}
@ -69,7 +69,7 @@ class SupervisionInspectionController extends BaseAdminController
public function edit()
{
$params = (new SupervisionInspectionValidate())->post()->goCheck('edit');
$result = SupervisionInspectionLogic::edit($params,$this->adminId);
$result = SupervisionInspectionLogic::edit($params);
if (true === $result) {
return $this->success('编辑成功', [], 1, 1);
}

2
app/adminapi/controller/supervision_work/SupervisionMaterialEntryController.php
View File

@ -52,7 +52,7 @@ class SupervisionMaterialEntryController extends BaseAdminController
public function add()
{
$params = (new SupervisionMaterialEntryValidate())->post()->goCheck('add');
$result = SupervisionMaterialEntryLogic::add($params,$this->adminId);
$result = SupervisionMaterialEntryLogic::add($params);
if (true === $result) {
return $this->success('添加成功', [], 1, 1);
}

2
app/adminapi/controller/supervision_work/SupervisionMaterialParallelTestingController.php
View File

@ -52,7 +52,7 @@ class SupervisionMaterialParallelTestingController extends BaseAdminController
public function add()
{
$params = (new SupervisionMaterialParallelTestingValidate())->post()->goCheck('add');
$result = SupervisionMaterialParallelTestingLogic::add($params,$this->adminId);
$result = SupervisionMaterialParallelTestingLogic::add($params);
if (true === $result) {
return $this->success('添加成功', [], 1, 1);
}

2
app/adminapi/controller/supervision_work/SupervisionMeetingMinutesController.php
View File

@ -52,7 +52,7 @@ class SupervisionMeetingMinutesController extends BaseAdminController
public function add()
{
$params = (new SupervisionMeetingMinutesValidate())->post()->goCheck('add');
$result = SupervisionMeetingMinutesLogic::add($params,$this->adminId);
$result = SupervisionMeetingMinutesLogic::add($params);
if (true === $result) {
return $this->success('添加成功', [], 1, 1);
}

2
app/adminapi/controller/supervision_work/SupervisionNoticeController.php
View File

@ -52,7 +52,7 @@ class SupervisionNoticeController extends BaseAdminController
public function add()
{
$params = (new SupervisionNoticeValidate())->post()->goCheck('add');
$result = SupervisionNoticeLogic::add($params,$this->adminId);
$result = SupervisionNoticeLogic::add($params);
if (true === $result) {
return $this->success('添加成功', [], 1, 1);
}

2
app/adminapi/controller/supervision_work/SupervisionProblemController.php
View File

@ -52,7 +52,7 @@ class SupervisionProblemController extends BaseAdminController
public function add()
{
$params = (new SupervisionProblemValidate())->post()->goCheck('add');
$result = SupervisionProblemLogic::add($params,$this->adminId);
$result = SupervisionProblemLogic::add($params);
if (true === $result) {
return $this->success('添加成功', [], 1, 1);
}

4
app/adminapi/controller/supervision_work/SupervisionSideStationController.php
View File

@ -52,7 +52,7 @@ class SupervisionSideStationController extends BaseAdminController
public function add()
{
$params = (new SupervisionSideStationValidate())->post()->goCheck('add');
$result = SupervisionSideStationLogic::add($params,$this->adminId);
$result = SupervisionSideStationLogic::add($params);
if (true === $result) {
return $this->success('添加成功', [], 1, 1);
}
@ -69,7 +69,7 @@ class SupervisionSideStationController extends BaseAdminController
public function edit()
{
$params = (new SupervisionSideStationValidate())->post()->goCheck('edit');
$result = SupervisionSideStationLogic::edit($params,$this->adminId);
$result = SupervisionSideStationLogic::edit($params);
if (true === $result) {
return $this->success('编辑成功', [], 1, 1);
}

4
app/adminapi/controller/supervision_work/SupervisionTestBlocksSpecimensController.php
View File

@ -52,7 +52,7 @@ class SupervisionTestBlocksSpecimensController extends BaseAdminController
public function add()
{
$params = (new SupervisionTestBlocksSpecimensValidate())->post()->goCheck('add');
$result = SupervisionTestBlocksSpecimensLogic::add($params,$this->adminId);
$result = SupervisionTestBlocksSpecimensLogic::add($params);
if (true === $result) {
return $this->success('添加成功', [], 1, 1);
}
@ -69,7 +69,7 @@ class SupervisionTestBlocksSpecimensController extends BaseAdminController
public function edit()
{
$params = (new SupervisionTestBlocksSpecimensValidate())->post()->goCheck('edit');
$result = SupervisionTestBlocksSpecimensLogic::edit($params,$this->adminId);
$result = SupervisionTestBlocksSpecimensLogic::edit($params);
if (true === $result) {
return $this->success('编辑成功', [], 1, 1);
}

2
app/adminapi/controller/supervision_work/SupervisionWitnessSamplingController.php
View File

@ -52,7 +52,7 @@ class SupervisionWitnessSamplingController extends BaseAdminController
public function add()
{
$params = (new SupervisionWitnessSamplingValidate())->post()->goCheck('add');
$result = SupervisionWitnessSamplingLogic::add($params,$this->adminId);
$result = SupervisionWitnessSamplingLogic::add($params);
if (true === $result) {
return $this->success('添加成功', [], 1, 1);
}

3
app/adminapi/lists/supervision_const_prepare/SupervisionCommencementReportLists.php
View File

@ -16,7 +16,6 @@ namespace app\adminapi\lists\supervision_const_prepare;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\auth\Admin;
use app\common\model\supervision_const_prepare\SupervisionCommencementReport;
use app\common\lists\ListsSearchInterface;
use app\common\model\supervision_project\SupervisionProject;
@ -62,9 +61,7 @@ class SupervisionCommencementReportLists extends BaseAdminDataLists implements L
->order(['id' => 'desc'])
->select()->each(function($data){
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
$admin = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['create_user_name'] = $admin['name'];
})
->toArray();
}

3
app/adminapi/lists/supervision_const_prepare/SupervisionDesignDisclosureLists.php
View File

@ -16,7 +16,6 @@ namespace app\adminapi\lists\supervision_const_prepare;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\auth\Admin;
use app\common\model\supervision_const_prepare\SupervisionDesignDisclosure;
use app\common\lists\ListsSearchInterface;
use app\common\model\supervision_project\SupervisionProject;
@ -62,9 +61,7 @@ class SupervisionDesignDisclosureLists extends BaseAdminDataLists implements Lis
->order(['id' => 'desc'])
->select()->each(function($data){
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
$admin = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['create_user_name'] = $admin['name'];
})
->toArray();
}

2
app/adminapi/lists/supervision_const_prepare/SupervisionFirstMeetingLists.php
View File

@ -62,9 +62,7 @@ class SupervisionFirstMeetingLists extends BaseAdminDataLists implements ListsSe
->order(['id' => 'desc'])
->select()->each(function($data){
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
$admin = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['create_user_name'] = $admin['name'];
})
->toArray();
}

3
app/adminapi/lists/supervision_const_prepare/SupervisionRulesDisclosureLists.php
View File

@ -16,7 +16,6 @@ namespace app\adminapi\lists\supervision_const_prepare;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\auth\Admin;
use app\common\model\supervision_const_prepare\SupervisionRulesDisclosure;
use app\common\lists\ListsSearchInterface;
use app\common\model\supervision_project\SupervisionProject;
@ -62,9 +61,7 @@ class SupervisionRulesDisclosureLists extends BaseAdminDataLists implements List
->order(['id' => 'desc'])
->select()->each(function($data){
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
$admin = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['create_user_name'] = $admin['name'];
})
->toArray();
}

3
app/adminapi/lists/supervision_const_prepare/SupervisionRulesLists.php
View File

@ -16,7 +16,6 @@ namespace app\adminapi\lists\supervision_const_prepare;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\auth\Admin;
use app\common\model\supervision_const_prepare\SupervisionRules;
use app\common\lists\ListsSearchInterface;
use app\common\model\supervision_project\SupervisionProject;
@ -62,9 +61,7 @@ class SupervisionRulesLists extends BaseAdminDataLists implements ListsSearchInt
->order(['id' => 'desc'])
->select()->each(function($data){
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
$admin = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['create_user_name'] = $admin['name'];
})
->toArray();
}

3
app/adminapi/lists/supervision_ending/SupervisionProjectAcceptanceReportLists.php
View File

@ -16,7 +16,6 @@ namespace app\adminapi\lists\supervision_ending;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\auth\Admin;
use app\common\model\supervision_ending\SupervisionProjectAcceptanceReport;
use app\common\lists\ListsSearchInterface;
use app\common\model\supervision_project\SupervisionProject;
@ -62,9 +61,7 @@ class SupervisionProjectAcceptanceReportLists extends BaseAdminDataLists impleme
->order(['id' => 'desc'])
->select()->each(function($data){
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
$create_user = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['create_user_name'] = $create_user['name'];
})
->toArray();
}

3
app/adminapi/lists/supervision_prepare/SupervisionConstructionPlanningLists.php
View File

@ -16,7 +16,6 @@ namespace app\adminapi\lists\supervision_prepare;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\auth\Admin;
use app\common\model\supervision_prepare\SupervisionConstructionPlanning;
use app\common\lists\ListsSearchInterface;
use app\common\model\supervision_project\SupervisionProject;
@ -62,9 +61,7 @@ class SupervisionConstructionPlanningLists extends BaseAdminDataLists implements
->order(['id' => 'desc'])
->select()->each(function($data){
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
$admin = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['create_user_name'] = $admin['name'];
})
->toArray();
}

3
app/adminapi/lists/supervision_prepare/SupervisionContractDisclosureLists.php
View File

@ -16,7 +16,6 @@ namespace app\adminapi\lists\supervision_prepare;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\auth\Admin;
use app\common\model\supervision_prepare\SupervisionContractDisclosure;
use app\common\lists\ListsSearchInterface;
use app\common\model\supervision_project\SupervisionProject;
@ -63,9 +62,7 @@ class SupervisionContractDisclosureLists extends BaseAdminDataLists implements L
->order(['id' => 'desc'])
->select()->each(function($data){
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
$admin = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['create_user_name'] = $admin['name'];
})
->toArray();
}

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

@ -16,7 +16,6 @@ namespace app\adminapi\lists\supervision_prepare;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\auth\Admin;
use app\common\model\supervision_prepare\SupervisionPlanning;
use app\common\lists\ListsSearchInterface;
use app\common\model\supervision_project\SupervisionProject;
@ -62,10 +61,8 @@ class SupervisionPlanningLists extends BaseAdminDataLists implements ListsSearch
->order(['id' => 'desc'])
->select()->each(function($data){
$project = SupervisionProject::field('project_name,project_manager')->where('id',$data['project_id'])->findOrEmpty();
$admin = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['project_manager'] = $project['project_manager'];
$data['create_user_name'] = $admin['name'];
$data['approval_type_text'] = $data->approval_type_text;
})
->toArray();

3
app/adminapi/lists/supervision_qualification_review/SupervisionConstructionManagementPersonnelLists.php
View File

@ -16,7 +16,6 @@ namespace app\adminapi\lists\supervision_qualification_review;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\auth\Admin;
use app\common\model\supervision_project\SupervisionParticipatingUnits;
use app\common\model\supervision_qualification_review\SupervisionConstructionManagementPersonnel;
use app\common\lists\ListsSearchInterface;
@ -64,9 +63,7 @@ class SupervisionConstructionManagementPersonnelLists extends BaseAdminDataLists
->select()->each(function($data){
$unit_qualification = SupervisionParticipatingUnitsQualifications::field('company_id')->where('id',$data['unit_qualification_id'])->findOrEmpty();
$company = SupervisionParticipatingUnits::field('unit_name')->where('id',$unit_qualification['company_id'])->findOrEmpty();
$admin = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty();
$data['company_name'] = $company['unit_name'];
$data['create_user_name'] = $admin['name'];
$data['qualification_one_status_text'] = $data->qualification_one_status_text;
$data['qualification_two_status_text'] = $data->qualification_two_status_text;
})

3
app/adminapi/lists/supervision_qualification_review/SupervisionLargeEquipmentLists.php
View File

@ -16,7 +16,6 @@ namespace app\adminapi\lists\supervision_qualification_review;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\auth\Admin;
use app\common\model\supervision_project\SupervisionParticipatingUnits;
use app\common\model\supervision_qualification_review\SupervisionLargeEquipment;
use app\common\lists\ListsSearchInterface;
@ -65,9 +64,7 @@ class SupervisionLargeEquipmentLists extends BaseAdminDataLists implements Lists
->select()->each(function($data){
$unit_qualification = SupervisionParticipatingUnitsQualifications::field('company_id')->where('id',$data['unit_qualification_id'])->findOrEmpty();
$company = SupervisionParticipatingUnits::field('unit_name')->where('id',$unit_qualification['company_id'])->findOrEmpty();
$admin = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty();
$data['company_name'] = $company['unit_name'];
$data['create_user_name'] = $admin['name'];
$data['qualification_one_status_text'] = $data->qualification_one_status_text;
$data['qualification_two_status_text'] = $data->qualification_two_status_text;
})

3
app/adminapi/lists/supervision_work/SupervisionAcceptLists.php
View File

@ -16,7 +16,6 @@ namespace app\adminapi\lists\supervision_work;
use app\adminapi\lists\BaseAdminDataLists;
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\SupervisionAccept;
@ -68,12 +67,10 @@ class SupervisionAcceptLists extends BaseAdminDataLists implements ListsSearchIn
$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');
$create_user = Admin::field('name')->where('id',$data['create_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['create_user_name'] = $create_user['name'];
$data['accept_type_text'] = $data->accept_type_text;
$data['accept_result_text'] = $data->accept_result_text;
$data['problem_num'] = SupervisionProblem::field('id')->where('data_id',$data['id'])->where('data_type',3)->count();

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

@ -16,7 +16,6 @@ namespace app\adminapi\lists\supervision_work;
use app\adminapi\lists\BaseAdminDataLists;
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;
@ -65,10 +64,8 @@ class SupervisionDeviceEntryLists extends BaseAdminDataLists implements ListsSea
->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();
$create_user = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['company_name'] = $company['unit_name'];
$data['create_user_name'] = $create_user['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();

3
app/adminapi/lists/supervision_work/SupervisionEntityParallelTestingLists.php
View File

@ -16,7 +16,6 @@ namespace app\adminapi\lists\supervision_work;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\auth\Admin;
use app\common\model\supervision_project\SupervisionProject;
use app\common\model\supervision_work\SupervisionCheckItem;
use app\common\model\supervision_work\SupervisionEntityParallelTesting;
@ -64,10 +63,8 @@ class SupervisionEntityParallelTestingLists extends BaseAdminDataLists implement
->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();
$create_user = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['check_item_name'] = $check_item['node_name'];
$data['create_user_name'] = $create_user['name'];
$data['result_text'] = $data->result_text;
})
->toArray();

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

@ -16,7 +16,6 @@ namespace app\adminapi\lists\supervision_work;
use app\adminapi\lists\BaseAdminDataLists;
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;
@ -68,12 +67,10 @@ class SupervisionInspectionLists extends BaseAdminDataLists implements ListsSear
$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');
$create_user = Admin::field('name')->where('id',$data['create_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['create_user_name'] = $create_user['name'];
$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();

3
app/adminapi/lists/supervision_work/SupervisionProblemLists.php
View File

@ -16,7 +16,6 @@ namespace app\adminapi\lists\supervision_work;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\auth\Admin;
use app\common\model\supervision_work\SupervisionProblem;
use app\common\lists\ListsSearchInterface;
@ -60,8 +59,6 @@ class SupervisionProblemLists extends BaseAdminDataLists implements ListsSearchI
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()->each(function($data){
$create_user = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty();
$data['create_user_name'] = $create_user['name'];
$data['problem_cate'] = strval($data['problem_cate']);
$data['problem_cate_text'] = $data->problem_cate_text;
$data['rectification_result_text'] = $data->rectification_result_text;

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

@ -16,7 +16,6 @@ namespace app\adminapi\lists\supervision_work;
use app\adminapi\lists\BaseAdminDataLists;
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;
@ -68,12 +67,10 @@ class SupervisionSideStationLists extends BaseAdminDataLists implements ListsSea
$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');
$create_user = Admin::field('name')->where('id',$data['create_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['create_user_name'] = $create_user['name'];
$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();

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

@ -16,7 +16,6 @@ namespace app\adminapi\lists\supervision_work;
use app\adminapi\lists\BaseAdminDataLists;
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;
@ -65,10 +64,8 @@ class SupervisionTestBlocksSpecimensLists extends BaseAdminDataLists implements
->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();
$create_user = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['company_name'] = $company['unit_name'];
$data['create_user_name'] = $create_user['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();

10
app/adminapi/logic/supervision_connect/SupervisionProjectCaseReviewLogic.php
View File

@ -15,7 +15,6 @@
namespace app\adminapi\logic\supervision_connect;
use app\common\model\auth\Admin;
use app\common\model\supervision_connect\SupervisionProjectCaseReview;
use app\common\logic\BaseLogic;
use app\common\model\supervision_project\SupervisionProject;
@ -38,7 +37,7 @@ class SupervisionProjectCaseReviewLogic extends BaseLogic
* @author likeadmin
* @date 2024/03/04 17:27
*/
public static function add(array $params,$admin_id): bool
public static function add(array $params): bool
{
Db::startTrans();
try {
@ -49,7 +48,8 @@ class SupervisionProjectCaseReviewLogic extends BaseLogic
'review_content' => $params['review_content'],
'remark' => $params['remark'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $admin_id
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
]);
Db::commit();
return true;
@ -79,6 +79,8 @@ class SupervisionProjectCaseReviewLogic extends BaseLogic
'review_content' => $params['review_content'],
'remark' => $params['remark'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
'update_time' => time()
]);
Db::commit();
@ -115,10 +117,8 @@ class SupervisionProjectCaseReviewLogic extends BaseLogic
{
$data = SupervisionProjectCaseReview::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$project = SupervisionProject::field('project_name,project_manager')->where('id',$data['project_id'])->findOrEmpty();
$create_user = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['project_manager'] = $project['project_manager'];
$data['create_user_name'] = $create_user['name'];
$data['review_type_text'] = $data->review_type_text;
return $data->toArray();
}

10
app/adminapi/logic/supervision_connect/SupervisionProjectInfoReportLogic.php
View File

@ -15,7 +15,6 @@
namespace app\adminapi\logic\supervision_connect;
use app\common\model\auth\Admin;
use app\common\model\supervision_connect\SupervisionProjectInfoReport;
use app\common\logic\BaseLogic;
use app\common\model\supervision_project\SupervisionProject;
@ -38,7 +37,7 @@ class SupervisionProjectInfoReportLogic extends BaseLogic
* @author likeadmin
* @date 2024/03/05 10:53
*/
public static function add(array $params,$admin_id): bool
public static function add(array $params): bool
{
Db::startTrans();
try {
@ -52,7 +51,8 @@ class SupervisionProjectInfoReportLogic extends BaseLogic
'opinions' => $params['opinions'],
'giver' => $params['giver'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $admin_id
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
]);
Db::commit();
return true;
@ -85,6 +85,8 @@ class SupervisionProjectInfoReportLogic extends BaseLogic
'opinions' => $params['opinions'],
'giver' => $params['giver'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
'update_time' => time()
]);
Db::commit();
@ -121,10 +123,8 @@ class SupervisionProjectInfoReportLogic extends BaseLogic
{
$data = SupervisionProjectInfoReport::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$project = SupervisionProject::field('project_name,project_manager')->where('id',$data['project_id'])->findOrEmpty();
$create_user = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['project_manager'] = $project['project_manager'];
$data['create_user_name'] = $create_user['name'];
$data['severity_text'] = $data->severity_text;
return $data->toArray();
}

14
app/adminapi/logic/supervision_connect/SupervisionProjectMilestonesLogic.php
View File

@ -15,7 +15,6 @@
namespace app\adminapi\logic\supervision_connect;
use app\common\model\auth\Admin;
use app\common\model\supervision_connect\SupervisionProjectMilestones;
use app\common\logic\BaseLogic;
use app\common\model\supervision_project\SupervisionProject;
@ -38,7 +37,7 @@ class SupervisionProjectMilestonesLogic extends BaseLogic
* @author likeadmin
* @date 2024/03/05 10:28
*/
public static function add(array $params,$admin_id): bool
public static function add(array $params): bool
{
Db::startTrans();
try {
@ -46,9 +45,10 @@ class SupervisionProjectMilestonesLogic extends BaseLogic
'project_id' => $params['project_id'],
'title' => $params['title'],
'content' => $params['content'],
'remark' => $params['remark'],
'remark' => $params['remark'] ?? '',
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $admin_id
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
]);
Db::commit();
return true;
@ -75,8 +75,10 @@ class SupervisionProjectMilestonesLogic extends BaseLogic
'project_id' => $params['project_id'],
'title' => $params['title'],
'content' => $params['content'],
'remark' => $params['remark'],
'remark' => $params['remark'] ?? '',
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
'update_time' => time()
]);
Db::commit();
@ -113,9 +115,7 @@ class SupervisionProjectMilestonesLogic extends BaseLogic
{
$data = SupervisionProjectMilestones::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
$create_user = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['create_user_name'] = $create_user['name'];
return $data->toArray();
}
}

8
app/adminapi/logic/supervision_connect/SupervisionProjectMonthlyReportLogic.php
View File

@ -15,7 +15,6 @@
namespace app\adminapi\logic\supervision_connect;
use app\common\model\auth\Admin;
use app\common\model\supervision_connect\SupervisionProjectMonthlyReport;
use app\common\logic\BaseLogic;
use app\common\model\supervision_project\SupervisionProject;
@ -63,7 +62,8 @@ class SupervisionProjectMonthlyReportLogic extends BaseLogic
'safety_situation' => $params['safety_situation'],
'remark' => $params['remark'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $admin_id
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
]);
Db::commit();
return true;
@ -107,6 +107,8 @@ class SupervisionProjectMonthlyReportLogic extends BaseLogic
'safety_situation' => $params['safety_situation'],
'remark' => $params['remark'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
'update_time' => time()
]);
Db::commit();
@ -143,11 +145,9 @@ class SupervisionProjectMonthlyReportLogic extends BaseLogic
{
$data = SupervisionProjectMonthlyReport::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$project = SupervisionProject::field('project_name,project_manager,implementation_department')->where('id',$data['project_id'])->findOrEmpty();
$create_user = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['project_manager'] = $project['project_manager'];
$data['implementation_department'] = $project['implementation_department'];
$data['create_user_name'] = $create_user['name'];
$data['engineering_status_text'] = $data->engineering_status_text;
return $data->toArray();
}

10
app/adminapi/logic/supervision_const_prepare/SupervisionCommencementReportLogic.php
View File

@ -15,7 +15,6 @@
namespace app\adminapi\logic\supervision_const_prepare;
use app\common\model\auth\Admin;
use app\common\model\supervision_const_prepare\SupervisionCommencementReport;
use app\common\logic\BaseLogic;
use app\common\model\supervision_project\SupervisionProject;
@ -38,7 +37,7 @@ class SupervisionCommencementReportLogic extends BaseLogic
* @author likeadmin
* @date 2024/02/26 10:17
*/
public static function add(array $params,$admin_id): bool
public static function add(array $params): bool
{
Db::startTrans();
try {
@ -47,7 +46,8 @@ class SupervisionCommencementReportLogic extends BaseLogic
'doc_name' => $params['doc_name'],
'doc_desc' => $params['doc_desc'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $admin_id,
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
]);
Db::commit();
return true;
@ -75,6 +75,8 @@ class SupervisionCommencementReportLogic extends BaseLogic
'doc_name' => $params['doc_name'],
'doc_desc' => $params['doc_desc'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
'update_time' => time(),
]);
Db::commit();
@ -111,9 +113,7 @@ class SupervisionCommencementReportLogic extends BaseLogic
{
$data = SupervisionCommencementReport::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
$admin = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['create_user_name'] = $admin['name'];
return $data->toArray();
}
}

10
app/adminapi/logic/supervision_const_prepare/SupervisionDesignDisclosureLogic.php
View File

@ -15,7 +15,6 @@
namespace app\adminapi\logic\supervision_const_prepare;
use app\common\model\auth\Admin;
use app\common\model\supervision_const_prepare\SupervisionDesignDisclosure;
use app\common\logic\BaseLogic;
use app\common\model\supervision_project\SupervisionProject;
@ -38,7 +37,7 @@ class SupervisionDesignDisclosureLogic extends BaseLogic
* @author likeadmin
* @date 2024/02/26 09:36
*/
public static function add(array $params,$admin_id): bool
public static function add(array $params): bool
{
Db::startTrans();
try {
@ -47,7 +46,8 @@ class SupervisionDesignDisclosureLogic extends BaseLogic
'doc_name' => $params['doc_name'],
'doc_desc' => $params['doc_desc'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $admin_id,
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
]);
Db::commit();
return true;
@ -75,6 +75,8 @@ class SupervisionDesignDisclosureLogic extends BaseLogic
'doc_name' => $params['doc_name'],
'doc_desc' => $params['doc_desc'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
'update_time' => time(),
]);
Db::commit();
@ -111,9 +113,7 @@ class SupervisionDesignDisclosureLogic extends BaseLogic
{
$data = SupervisionDesignDisclosure::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
$admin = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['create_user_name'] = $admin['name'];
return $data->toArray();
}
}

10
app/adminapi/logic/supervision_const_prepare/SupervisionFirstMeetingLogic.php
View File

@ -15,7 +15,6 @@
namespace app\adminapi\logic\supervision_const_prepare;
use app\common\model\auth\Admin;
use app\common\model\supervision_const_prepare\SupervisionFirstMeeting;
use app\common\logic\BaseLogic;
use app\common\model\supervision_project\SupervisionProject;
@ -38,7 +37,7 @@ class SupervisionFirstMeetingLogic extends BaseLogic
* @author likeadmin
* @date 2024/02/26 09:12
*/
public static function add(array $params,$admin_id): bool
public static function add(array $params): bool
{
Db::startTrans();
try {
@ -47,7 +46,8 @@ class SupervisionFirstMeetingLogic extends BaseLogic
'doc_name' => $params['doc_name'],
'doc_desc' => $params['doc_desc'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $admin_id,
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
]);
Db::commit();
return true;
@ -75,6 +75,8 @@ class SupervisionFirstMeetingLogic extends BaseLogic
'doc_name' => $params['doc_name'],
'doc_desc' => $params['doc_desc'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
'update_time' => time(),
]);
Db::commit();
@ -111,9 +113,7 @@ class SupervisionFirstMeetingLogic extends BaseLogic
{
$data = SupervisionFirstMeeting::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
$admin = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['create_user_name'] = $admin['name'];
return $data->toArray();
}
}

10
app/adminapi/logic/supervision_const_prepare/SupervisionRulesDisclosureLogic.php
View File

@ -15,7 +15,6 @@
namespace app\adminapi\logic\supervision_const_prepare;
use app\common\model\auth\Admin;
use app\common\model\supervision_const_prepare\SupervisionRulesDisclosure;
use app\common\logic\BaseLogic;
use app\common\model\supervision_project\SupervisionProject;
@ -38,7 +37,7 @@ class SupervisionRulesDisclosureLogic extends BaseLogic
* @author likeadmin
* @date 2024/02/26 09:49
*/
public static function add(array $params,$admin_id): bool
public static function add(array $params): bool
{
Db::startTrans();
try {
@ -47,7 +46,8 @@ class SupervisionRulesDisclosureLogic extends BaseLogic
'doc_name' => $params['doc_name'],
'doc_desc' => $params['doc_desc'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $admin_id,
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
]);
Db::commit();
return true;
@ -75,6 +75,8 @@ class SupervisionRulesDisclosureLogic extends BaseLogic
'doc_name' => $params['doc_name'],
'doc_desc' => $params['doc_desc'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
'update_time' => time(),
]);
Db::commit();
@ -111,9 +113,7 @@ class SupervisionRulesDisclosureLogic extends BaseLogic
{
$data = SupervisionRulesDisclosure::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
$admin = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['create_user_name'] = $admin['name'];
return $data->toArray();
}
}

10
app/adminapi/logic/supervision_const_prepare/SupervisionRulesLogic.php
View File

@ -15,7 +15,6 @@
namespace app\adminapi\logic\supervision_const_prepare;
use app\common\model\auth\Admin;
use app\common\model\supervision_const_prepare\SupervisionRules;
use app\common\logic\BaseLogic;
use app\common\model\supervision_project\SupervisionProject;
@ -38,7 +37,7 @@ class SupervisionRulesLogic extends BaseLogic
* @author likeadmin
* @date 2024/02/26 09:49
*/
public static function add(array $params,$admin_id): bool
public static function add(array $params): bool
{
Db::startTrans();
try {
@ -47,7 +46,8 @@ class SupervisionRulesLogic extends BaseLogic
'doc_name' => $params['doc_name'],
'doc_desc' => $params['doc_desc'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $admin_id,
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
]);
Db::commit();
return true;
@ -75,6 +75,8 @@ class SupervisionRulesLogic extends BaseLogic
'doc_name' => $params['doc_name'],
'doc_desc' => $params['doc_desc'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
'update_time' => time(),
]);
Db::commit();
@ -111,9 +113,7 @@ class SupervisionRulesLogic extends BaseLogic
{
$data = SupervisionRules::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
$admin = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['create_user_name'] = $admin['name'];
return $data->toArray();
}
}

10
app/adminapi/logic/supervision_dangerous/SupervisionDangerousEngineeringCaseLogic.php
View File

@ -15,7 +15,6 @@
namespace app\adminapi\logic\supervision_dangerous;
use app\common\model\auth\Admin;
use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringCase;
use app\common\logic\BaseLogic;
use app\common\model\supervision_dangerous\SupervisionDangerousEngineeringMonitoring;
@ -39,7 +38,7 @@ class SupervisionDangerousEngineeringCaseLogic extends BaseLogic
* @author likeadmin
* @date 2024/03/04 14:00
*/
public static function add(array $params,$admin_id): bool
public static function add(array $params): bool
{
Db::startTrans();
try {
@ -50,7 +49,8 @@ class SupervisionDangerousEngineeringCaseLogic extends BaseLogic
'review_content' => $params['review_content'],
'remark' => $params['remark'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $admin_id
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
]);
Db::commit();
return true;
@ -80,6 +80,8 @@ class SupervisionDangerousEngineeringCaseLogic extends BaseLogic
'review_content' => $params['review_content'],
'remark' => $params['remark'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
'update_time' => time()
]);
Db::commit();
@ -117,12 +119,10 @@ class SupervisionDangerousEngineeringCaseLogic extends BaseLogic
$data = SupervisionDangerousEngineeringCase::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$dangerous_engineering_monitoring = SupervisionDangerousEngineeringMonitoring::field('project_id,type,partial_project')->where('id',$data['dangerous_engineering_monitoring_id'])->findOrEmpty();
$project = SupervisionProject::field('project_name')->where('id',$dangerous_engineering_monitoring['project_id'])->findOrEmpty();
$create_user = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty();
$data['dangerous_engineering_monitoring_title'] = $project['project_name'];
$data['project_name'] = $project['project_name'];
$data['type'] = $dangerous_engineering_monitoring->type_text;
$data['partial_project'] = $dangerous_engineering_monitoring->partial_project_text;
$data['create_user_name'] = $create_user['name'];
return $data->toArray();
}
}

6
app/adminapi/logic/supervision_dangerous/SupervisionDangerousEngineeringMonitoringLogic.php
View File

@ -108,17 +108,17 @@ class SupervisionDangerousEngineeringMonitoringLogic extends BaseLogic
*/
public static function delete(array $params): bool
{
$case = SupervisionDangerousEngineeringCase::where('dangerous_engineering_monitoring_id',$params['id'])->findOrEmpty();
$case = SupervisionDangerousEngineeringCase::where('dangerous_engineering_monitoring_id','in',$params['id'])->findOrEmpty();
if(!$case->isEmpty()){
self::setError('当前数据下存在危大方案提交信息,须先删除危大方案提交信息');
return false;
}
$eliminate = SupervisionDangerousEngineeringEliminate::where('dangerous_engineering_monitoring_id',$params['id'])->findOrEmpty();
$eliminate = SupervisionDangerousEngineeringEliminate::where('dangerous_engineering_monitoring_id','in',$params['id'])->findOrEmpty();
if(!$eliminate->isEmpty()){
self::setError('当前数据下存在危大工程消除信息,须先删除危大工程消除信息');
return false;
}
$construction = SupervisionDangerousEngineeringConstruction::where('dangerous_engineering_monitoring_id',$params['id'])->findOrEmpty();
$construction = SupervisionDangerousEngineeringConstruction::where('dangerous_engineering_monitoring_id','in',$params['id'])->findOrEmpty();
if(!$construction->isEmpty()){
self::setError('当前数据下存在危大工程施工信息,须先删除危大工程施工信息');
return false;

10
app/adminapi/logic/supervision_dangerous/SupervisionExcessRiskSecurityMonitoringLogic.php
View File

@ -15,7 +15,6 @@
namespace app\adminapi\logic\supervision_dangerous;
use app\common\model\auth\Admin;
use app\common\model\supervision_dangerous\SupervisionExcessRiskSecurityMonitoring;
use app\common\logic\BaseLogic;
use app\common\model\supervision_project\SupervisionProject;
@ -38,7 +37,7 @@ class SupervisionExcessRiskSecurityMonitoringLogic extends BaseLogic
* @author likeadmin
* @date 2024/03/04 10:11
*/
public static function add(array $params,$admin_id): bool
public static function add(array $params): bool
{
Db::startTrans();
try {
@ -61,7 +60,8 @@ class SupervisionExcessRiskSecurityMonitoringLogic extends BaseLogic
'exceed_the_control_value' => $params['exceed_the_control_value'],
'exceed_the_warning_value' => $params['exceed_the_warning_value'],
'control_measures' => $params['control_measures'],
'create_user' => $admin_id
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
]);
Db::commit();
return true;
@ -103,6 +103,8 @@ class SupervisionExcessRiskSecurityMonitoringLogic extends BaseLogic
'exceed_the_control_value' => $params['exceed_the_control_value'],
'exceed_the_warning_value' => $params['exceed_the_warning_value'],
'control_measures' => $params['control_measures'],
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
'update_time' => time()
]);
Db::commit();
@ -139,9 +141,7 @@ class SupervisionExcessRiskSecurityMonitoringLogic extends BaseLogic
{
$data = SupervisionExcessRiskSecurityMonitoring::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
$admin = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['create_user_name'] = $admin['name'];
$data['partial_project_text'] = $data->partial_project_text;
$data['is_discuss_text'] = $data->is_discuss_text;
$data['is_modify_text'] = $data->is_modify_text;

8
app/adminapi/logic/supervision_dangerous/SupervisionHighRiskSecurityMonitoringLogic.php
View File

@ -15,7 +15,6 @@
namespace app\adminapi\logic\supervision_dangerous;
use app\common\model\auth\Admin;
use app\common\model\supervision_dangerous\SupervisionHighRiskSecurityMonitoring;
use app\common\logic\BaseLogic;
use app\common\model\supervision_project\SupervisionProject;
@ -60,7 +59,8 @@ class SupervisionHighRiskSecurityMonitoringLogic extends BaseLogic
'exceed_the_control_value' => $params['exceed_the_control_value'],
'exceed_the_warning_value' => $params['exceed_the_warning_value'],
'control_measures' => $params['control_measures'],
'create_user' => $admin_id
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
]);
Db::commit();
return true;
@ -101,6 +101,8 @@ class SupervisionHighRiskSecurityMonitoringLogic extends BaseLogic
'exceed_the_control_value' => $params['exceed_the_control_value'],
'exceed_the_warning_value' => $params['exceed_the_warning_value'],
'control_measures' => $params['control_measures'],
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
'update_time' => time()
]);
Db::commit();
@ -137,9 +139,7 @@ class SupervisionHighRiskSecurityMonitoringLogic extends BaseLogic
{
$data = SupervisionHighRiskSecurityMonitoring::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
$admin = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['create_user_name'] = $admin['name'];
$data['partial_project_text'] = $data->partial_project_text;
$data['is_report_text'] = $data->is_report_text;
$data['is_agree_text'] = $data->is_agree_text;

2
app/adminapi/logic/supervision_dangerous/SupervisionLargeMechanicalEquipmentLogic.php
View File

@ -157,7 +157,7 @@ class SupervisionLargeMechanicalEquipmentLogic extends BaseLogic
*/
public static function delete(array $params): bool
{
$maintenance_record = SupervisionLargeMechanicalEquipmentMaintenanceRecord::where('large_mechanical_equipment_id',$params['id'])->findOrEmpty();
$maintenance_record = SupervisionLargeMechanicalEquipmentMaintenanceRecord::where('large_mechanical_equipment_id','in',$params['id'])->findOrEmpty();
if(!$maintenance_record->isEmpty()){
self::setError('当前数据下存在机械维修保养记录,请先删除机械维修保养记录数据');
return false;

10
app/adminapi/logic/supervision_ending/SupervisionProjectAcceptanceReportLogic.php
View File

@ -15,7 +15,6 @@
namespace app\adminapi\logic\supervision_ending;
use app\common\model\auth\Admin;
use app\common\model\supervision_ending\SupervisionProjectAcceptanceReport;
use app\common\logic\BaseLogic;
use app\common\model\supervision_project\SupervisionProject;
@ -38,7 +37,7 @@ class SupervisionProjectAcceptanceReportLogic extends BaseLogic
* @author likeadmin
* @date 2024/03/05 14:47
*/
public static function add(array $params,$admin_id): bool
public static function add(array $params): bool
{
Db::startTrans();
try {
@ -47,7 +46,8 @@ class SupervisionProjectAcceptanceReportLogic extends BaseLogic
'title' => $params['title'],
'content' => $params['content'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $admin_id
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
]);
Db::commit();
return true;
@ -75,6 +75,8 @@ class SupervisionProjectAcceptanceReportLogic extends BaseLogic
'title' => $params['title'],
'content' => $params['content'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
'update_time' => time()
]);
Db::commit();
@ -111,9 +113,7 @@ class SupervisionProjectAcceptanceReportLogic extends BaseLogic
{
$data = SupervisionProjectAcceptanceReport::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
$create_user = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['create_user_name'] = $create_user['name'];
return $data->toArray();
}
}

2
app/adminapi/logic/supervision_ending/SupervisionProjectDataArchivingLogic.php
View File

@ -123,7 +123,7 @@ class SupervisionProjectDataArchivingLogic extends BaseLogic
*/
public static function delete(array $params): bool
{
$detail = SupervisionProjectDataArchivingDetail::where('data_archiving_id',$params['id'])->findOrEmpty();
$detail = SupervisionProjectDataArchivingDetail::where('data_archiving_id','in',$params['id'])->findOrEmpty();
if(!$detail->isEmpty()){
self::setError('当前数据下存在资料归档目录信息,须先删除资料归档目录信息');
return false;

10
app/adminapi/logic/supervision_ending/SupervisionProjectOwnerEvaluationLogic.php
View File

@ -15,7 +15,6 @@
namespace app\adminapi\logic\supervision_ending;
use app\common\model\auth\Admin;
use app\common\model\supervision_ending\SupervisionProjectOwnerEvaluation;
use app\common\logic\BaseLogic;
use app\common\model\supervision_project\SupervisionProject;
@ -38,7 +37,7 @@ class SupervisionProjectOwnerEvaluationLogic extends BaseLogic
* @author likeadmin
* @date 2024/03/05 15:18
*/
public static function add(array $params,$admin_id): bool
public static function add(array $params): bool
{
Db::startTrans();
try {
@ -47,7 +46,8 @@ class SupervisionProjectOwnerEvaluationLogic extends BaseLogic
'title' => $params['title'],
'content' => $params['content'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $admin_id
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
]);
Db::commit();
return true;
@ -75,6 +75,8 @@ class SupervisionProjectOwnerEvaluationLogic extends BaseLogic
'title' => $params['title'],
'content' => $params['content'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
'update_time' => time()
]);
Db::commit();
@ -111,9 +113,7 @@ class SupervisionProjectOwnerEvaluationLogic extends BaseLogic
{
$data = SupervisionProjectOwnerEvaluation::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
$create_user = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['create_user_name'] = $create_user['name'];
return $data->toArray();
}
}

10
app/adminapi/logic/supervision_prepare/SupervisionConstructionPlanningLogic.php
View File

@ -15,7 +15,6 @@
namespace app\adminapi\logic\supervision_prepare;
use app\common\model\auth\Admin;
use app\common\model\supervision_prepare\SupervisionConstructionPlanning;
use app\common\logic\BaseLogic;
use app\common\model\supervision_project\SupervisionProject;
@ -38,7 +37,7 @@ class SupervisionConstructionPlanningLogic extends BaseLogic
* @author likeadmin
* @date 2024/02/23 17:43
*/
public static function add(array $params,$admin_id): bool
public static function add(array $params): bool
{
Db::startTrans();
try {
@ -47,7 +46,8 @@ class SupervisionConstructionPlanningLogic extends BaseLogic
'doc_name' => $params['doc_name'],
'doc_desc' => $params['doc_desc'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $admin_id,
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
]);
Db::commit();
return true;
@ -75,6 +75,8 @@ class SupervisionConstructionPlanningLogic extends BaseLogic
'doc_name' => $params['doc_name'],
'doc_desc' => $params['doc_desc'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
'update_time' => time(),
]);
Db::commit();
@ -111,9 +113,7 @@ class SupervisionConstructionPlanningLogic extends BaseLogic
{
$data = SupervisionConstructionPlanning::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
$admin = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['create_user_name'] = $admin['name'];
return $data->toArray();
}
}

10
app/adminapi/logic/supervision_prepare/SupervisionContractDisclosureLogic.php
View File

@ -15,7 +15,6 @@
namespace app\adminapi\logic\supervision_prepare;
use app\common\model\auth\Admin;
use app\common\model\supervision_prepare\SupervisionContractDisclosure;
use app\common\logic\BaseLogic;
use app\common\model\supervision_project\SupervisionProject;
@ -38,7 +37,7 @@ class SupervisionContractDisclosureLogic extends BaseLogic
* @author likeadmin
* @date 2024/02/23 17:19
*/
public static function add(array $params,$admin_id): bool
public static function add(array $params): bool
{
Db::startTrans();
try {
@ -47,7 +46,8 @@ class SupervisionContractDisclosureLogic extends BaseLogic
'doc_name' => $params['doc_name'],
'doc_desc' => $params['doc_desc'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $admin_id,
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
]);
Db::commit();
return true;
@ -75,6 +75,8 @@ class SupervisionContractDisclosureLogic extends BaseLogic
'doc_name' => $params['doc_name'],
'doc_desc' => $params['doc_desc'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
'update_time' => time(),
]);
Db::commit();
@ -111,9 +113,7 @@ class SupervisionContractDisclosureLogic extends BaseLogic
{
$data = SupervisionContractDisclosure::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty();
$admin = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['create_user_name'] = $admin['name'];
return $data->toArray();
}
}

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

@ -15,7 +15,6 @@
namespace app\adminapi\logic\supervision_prepare;
use app\common\model\auth\Admin;
use app\common\model\supervision_prepare\SupervisionPlanning;
use app\common\logic\BaseLogic;
use app\common\model\supervision_project\SupervisionProject;
@ -38,7 +37,7 @@ class SupervisionPlanningLogic extends BaseLogic
* @author likeadmin
* @date 2024/02/23 16:45
*/
public static function add(array $params,$admin_id): bool
public static function add(array $params): bool
{
Db::startTrans();
try {
@ -50,7 +49,8 @@ class SupervisionPlanningLogic extends BaseLogic
'approval_content' => $params['approval_content'],
'remark' => $params['remark'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $admin_id,
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
]);
Db::commit();
return true;
@ -81,6 +81,8 @@ class SupervisionPlanningLogic extends BaseLogic
'approval_content' => $params['approval_content'],
'remark' => $params['remark'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
'update_time' => time(),
]);
Db::commit();
@ -117,10 +119,8 @@ class SupervisionPlanningLogic extends BaseLogic
{
$data = SupervisionPlanning::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$project = SupervisionProject::field('project_name,project_manager')->where('id',$data['project_id'])->findOrEmpty();
$admin = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['project_manager'] = $project['project_manager'];
$data['create_user_name'] = $admin['name'];
$data['approval_type_text'] = $data->approval_type_text;
return $data->toArray();
}

14
app/adminapi/logic/supervision_project/SupervisionProjectLogic.php
View File

@ -15,7 +15,6 @@
namespace app\adminapi\logic\supervision_project;
use app\common\model\auth\Admin;
use app\common\model\supervision_project\SupervisionProject;
use app\common\logic\BaseLogic;
use think\facade\Db;
@ -37,7 +36,7 @@ class SupervisionProjectLogic extends BaseLogic
* @author likeadmin
* @date 2024/02/23 09:52
*/
public static function add(array $params,$admin_id): bool
public static function add(array $params): bool
{
Db::startTrans();
try {
@ -51,7 +50,7 @@ class SupervisionProjectLogic extends BaseLogic
'address' => $params['address'],
'project_level' => $params['project_level'],
'total_investment' => $params['total_investment'],
'initiation_date' => $params['initiation_date'],
'initiation_date' => !empty($params['initiation_date']) ? strtotime($params['initiation_date']) : 0,
'contract' => $params['contract'],
'contract_amount' => $params['contract_amount'],
'actual_start_date' => !empty($params['actual_start_date']) ? strtotime($params['actual_start_date']) : 0,
@ -69,7 +68,8 @@ class SupervisionProjectLogic extends BaseLogic
'project_manager' => $params['project_manager'],
'part_a_unit' => $params['part_a_unit'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $admin_id,
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
]);
Db::commit();
return true;
@ -101,7 +101,7 @@ class SupervisionProjectLogic extends BaseLogic
'address' => $params['address'],
'project_level' => $params['project_level'],
'total_investment' => $params['total_investment'],
'initiation_date' => $params['initiation_date'],
'initiation_date' => !empty($params['initiation_date']) ? strtotime($params['initiation_date']) : 0,
'contract' => $params['contract'],
'contract_amount' => $params['contract_amount'],
'actual_start_date' => !empty($params['actual_start_date']) ? strtotime($params['actual_start_date']) : 0,
@ -119,6 +119,8 @@ class SupervisionProjectLogic extends BaseLogic
'project_manager' => $params['project_manager'],
'part_a_unit' => $params['part_a_unit'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
'update_time' => time(),
]);
Db::commit();
@ -154,8 +156,6 @@ class SupervisionProjectLogic extends BaseLogic
public static function detail($params): array
{
$data = SupervisionProject::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$admin = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty();
$data['create_user_name'] = $admin['name'];
$data['industry_text'] = $data->industry_text;
$data['nature_text'] = $data->nature_text;
$data['build_area_text'] = $data->build_area_text;

10
app/adminapi/logic/supervision_qualification_review/SupervisionConstructionManagementPersonnelLogic.php
View File

@ -15,7 +15,6 @@
namespace app\adminapi\logic\supervision_qualification_review;
use app\common\model\auth\Admin;
use app\common\model\supervision_project\SupervisionParticipatingUnits;
use app\common\model\supervision_qualification_review\SupervisionConstructionManagementPersonnel;
use app\common\logic\BaseLogic;
@ -39,7 +38,7 @@ class SupervisionConstructionManagementPersonnelLogic extends BaseLogic
* @author likeadmin
* @date 2024/02/26 10:33
*/
public static function add(array $params,$admin_id): bool
public static function add(array $params): bool
{
Db::startTrans();
try {
@ -63,7 +62,8 @@ class SupervisionConstructionManagementPersonnelLogic extends BaseLogic
'qualification_two_status' => $params['qualification_two_status'],
'remark' => $params['remark'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $admin_id,
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
]);
Db::commit();
return true;
@ -106,6 +106,8 @@ class SupervisionConstructionManagementPersonnelLogic extends BaseLogic
'qualification_two_status' => $params['qualification_two_status'],
'remark' => $params['remark'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
'update_time' => time(),
]);
Db::commit();
@ -143,9 +145,7 @@ class SupervisionConstructionManagementPersonnelLogic extends BaseLogic
$data = SupervisionConstructionManagementPersonnel::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$unit_qualification = SupervisionParticipatingUnitsQualifications::field('company_id')->where('id',$data['unit_qualification_id'])->findOrEmpty();
$company = SupervisionParticipatingUnits::field('unit_name')->where('id',$unit_qualification['company_id'])->findOrEmpty();
$admin = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty();
$data['company_name'] = $company['unit_name'];
$data['create_user_name'] = $admin['name'];
$data['qualification_one_status_text'] = $data->qualification_one_status_text;
$data['qualification_two_status_text'] = $data->qualification_two_status_text;
return $data->toArray();

10
app/adminapi/logic/supervision_qualification_review/SupervisionLargeEquipmentLogic.php
View File

@ -15,7 +15,6 @@
namespace app\adminapi\logic\supervision_qualification_review;
use app\common\model\auth\Admin;
use app\common\model\supervision_project\SupervisionParticipatingUnits;
use app\common\model\supervision_qualification_review\SupervisionLargeEquipment;
use app\common\logic\BaseLogic;
@ -39,7 +38,7 @@ class SupervisionLargeEquipmentLogic extends BaseLogic
* @author likeadmin
* @date 2024/02/26 13:51
*/
public static function add(array $params,$admin_id): bool
public static function add(array $params): bool
{
Db::startTrans();
try {
@ -60,7 +59,8 @@ class SupervisionLargeEquipmentLogic extends BaseLogic
'qualification_two_status' => $params['qualification_two_status'],
'remark' => $params['remark'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $admin_id,
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
]);
Db::commit();
return true;
@ -100,6 +100,8 @@ class SupervisionLargeEquipmentLogic extends BaseLogic
'qualification_two_status' => $params['qualification_two_status'],
'remark' => $params['remark'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
'update_time' => time(),
]);
Db::commit();
@ -137,9 +139,7 @@ class SupervisionLargeEquipmentLogic extends BaseLogic
$data = SupervisionLargeEquipment::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$unit_qualification = SupervisionParticipatingUnitsQualifications::field('company_id')->where('id',$data['unit_qualification_id'])->findOrEmpty();
$company = SupervisionParticipatingUnits::field('unit_name')->where('id',$unit_qualification['company_id'])->findOrEmpty();
$admin = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty();
$data['company_name'] = $company['unit_name'];
$data['create_user_name'] = $admin['name'];
$data['qualification_one_status_text'] = $data->qualification_one_status_text;
$data['qualification_two_status_text'] = $data->qualification_two_status_text;
return $data->toArray();

20
app/adminapi/logic/supervision_work/SupervisionAcceptLogic.php
View File

@ -15,7 +15,6 @@
namespace app\adminapi\logic\supervision_work;
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\SupervisionAccept;
@ -42,7 +41,7 @@ class SupervisionAcceptLogic extends BaseLogic
* @author likeadmin
* @date 2024/02/27 15:23
*/
public static function add(array $params,$admin_id): bool
public static function add(array $params): bool
{
Db::startTrans();
try {
@ -59,7 +58,8 @@ class SupervisionAcceptLogic extends BaseLogic
'check_item_detail_ids' => $params['check_item_detail_ids'] ? json_encode($params['check_item_detail_ids']) : null,
'remark' => $params['remark'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $admin_id
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
]);
if(!empty($params['accept_check_result'])){
foreach($params['accept_check_result'] as $v){
@ -81,7 +81,7 @@ class SupervisionAcceptLogic extends BaseLogic
'problem_cate' => $v['problem_cate'],
'problem_description' => $v['problem_description'],
'problem_name' => $v['problem_name'],
'create_user' => $admin_id,
'create_user' => $params['create_user'],
]);
}
}
@ -102,7 +102,7 @@ class SupervisionAcceptLogic extends BaseLogic
* @author likeadmin
* @date 2024/02/27 15:23
*/
public static function edit(array $params,$admin_id): bool
public static function edit(array $params): bool
{
$data = SupervisionAccept::field('check_item_detail_ids')->where('id',$params['id'])->findOrEmpty();
Db::startTrans();
@ -119,6 +119,8 @@ class SupervisionAcceptLogic extends BaseLogic
'check_item_detail_ids' => $params['check_item_detail_ids'] ? json_encode($params['check_item_detail_ids']) : null,
'remark' => $params['remark'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $params['create_user'],
'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'])){
@ -167,7 +169,7 @@ class SupervisionAcceptLogic extends BaseLogic
'problem_cate' => $v['problem_cate'],
'problem_description' => $v['problem_description'],
'problem_name' => $v['problem_name'],
'create_user' => $admin_id,
'create_user' => $params['create_user'],
]);
}
}
@ -218,12 +220,12 @@ class SupervisionAcceptLogic extends BaseLogic
*/
public static function delete(array $params): bool
{
$accept_result = SupervisionAcceptResult::where('accept_id',$params['id'])->findOrEmpty();
$accept_result = SupervisionAcceptResult::where('accept_id','in',$params['id'])->findOrEmpty();
if(!$accept_result->isEmpty()){
self::setError('该验收内容下存在验收结果数据，请先删除验收结果数据');
return false;
}
$accept_problem = SupervisionProblem::where('data_id',$params['id'])->where('data_type',3)->findOrEmpty();
$accept_problem = SupervisionProblem::where('data_id','in',$params['id'])->where('data_type',3)->findOrEmpty();
if(!$accept_problem->isEmpty()){
self::setError('该验收内容下存在验收问题数据，请先删除验收问题数据');
return false;
@ -246,12 +248,10 @@ class SupervisionAcceptLogic extends BaseLogic
$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');
$create_user = Admin::field('name')->where('id',$data['create_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['create_user_name'] = $create_user['name'];
$data['accept_type_text'] = $data->accept_type_text;
$data['accept_result_text'] = $data->accept_result_text;
return $data->toArray();

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

@ -15,7 +15,6 @@
namespace app\adminapi\logic\supervision_work;
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;
@ -41,7 +40,7 @@ class SupervisionDeviceEntryLogic extends BaseLogic
* @author likeadmin
* @date 2024/02/28 16:12
*/
public static function add(array $params,$admin_id): bool
public static function add(array $params): bool
{
Db::startTrans();
try {
@ -53,7 +52,8 @@ class SupervisionDeviceEntryLogic extends BaseLogic
'enter_result' => $params['enter_result'],
'co_participant' => $params['co_participant'],
'remark' => $params['remark'],
'create_user' => $admin_id
'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){
@ -78,7 +78,7 @@ class SupervisionDeviceEntryLogic extends BaseLogic
'problem_cate' => $v['problem_cate'],
'problem_description' => $v['problem_description'],
'problem_name' => $v['problem_name'],
'create_user' => $admin_id
'create_user' => $params['create_user']
]);
}
}
@ -99,7 +99,7 @@ class SupervisionDeviceEntryLogic extends BaseLogic
* @author likeadmin
* @date 2024/02/28 16:12
*/
public static function edit(array $params,$admin_id): bool
public static function edit(array $params): bool
{
Db::startTrans();
try {
@ -110,6 +110,8 @@ class SupervisionDeviceEntryLogic extends BaseLogic
'enter_result' => $params['enter_result'],
'co_participant' => $params['co_participant'],
'remark' => $params['remark'],
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
'update_time' => time()
]);
if(!empty($params['entry_detail'])){
@ -160,7 +162,7 @@ class SupervisionDeviceEntryLogic extends BaseLogic
'problem_cate' => $v['problem_cate'],
'problem_description' => $v['problem_description'],
'problem_name' => $v['problem_name'],
'create_user' => $admin_id
'create_user' => $params['create_user']
]);
}
}
@ -184,12 +186,12 @@ class SupervisionDeviceEntryLogic extends BaseLogic
*/
public static function delete(array $params): bool
{
$entry_detail = SupervisionDeviceEntryDetail::where('device_entry_id',$params['id'])->findOrEmpty();
$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',$params['id'])->where('data_type',4)->findOrEmpty();
$entry_problem = SupervisionProblem::where('data_id','in',$params['id'])->where('data_type',4)->findOrEmpty();
if(!$entry_problem->isEmpty()){
self::setError('该内容下存在设备问题数据，请先删除设备问题数据');
return false;
@ -210,10 +212,8 @@ class SupervisionDeviceEntryLogic extends BaseLogic
$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();
$create_user = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['company_name'] = $company['unit_name'];
$data['create_user_name'] = $create_user['name'];
$data['enter_result_text'] = $data->enter_result_text;
return $data->toArray();
}

18
app/adminapi/logic/supervision_work/SupervisionEntityParallelTestingLogic.php
View File

@ -15,7 +15,6 @@
namespace app\adminapi\logic\supervision_work;
use app\common\model\auth\Admin;
use app\common\model\supervision_project\SupervisionProject;
use app\common\model\supervision_work\SupervisionCheckItem;
use app\common\model\supervision_work\SupervisionEntityParallelTesting;
@ -40,7 +39,7 @@ class SupervisionEntityParallelTestingLogic extends BaseLogic
* @author likeadmin
* @date 2024/02/29 16:32
*/
public static function add(array $params,$admin_id): bool
public static function add(array $params): bool
{
Db::startTrans();
try {
@ -55,7 +54,8 @@ class SupervisionEntityParallelTestingLogic extends BaseLogic
'result' => $params['result'],
'remark' => $params['remark'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $admin_id
'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){
@ -65,7 +65,7 @@ class SupervisionEntityParallelTestingLogic extends BaseLogic
'problem_cate' => $v['problem_cate'],
'problem_description' => $v['problem_description'],
'problem_name' => $v['problem_name'],
'create_user' => $admin_id,
'create_user' => $params['create_user'],
]);
}
}
@ -86,7 +86,7 @@ class SupervisionEntityParallelTestingLogic extends BaseLogic
* @author likeadmin
* @date 2024/02/29 16:32
*/
public static function edit(array $params,$admin_id): bool
public static function edit(array $params): bool
{
Db::startTrans();
try {
@ -100,6 +100,8 @@ class SupervisionEntityParallelTestingLogic extends BaseLogic
'result' => $params['result'],
'remark' => $params['remark'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
'update_time' => time(),
]);
if(!empty($params['problem'])){
@ -120,7 +122,7 @@ class SupervisionEntityParallelTestingLogic extends BaseLogic
'problem_cate' => $v['problem_cate'],
'problem_description' => $v['problem_description'],
'problem_name' => $v['problem_name'],
'create_user' => $admin_id,
'create_user' => $params['create_user'],
]);
}
}
@ -144,7 +146,7 @@ class SupervisionEntityParallelTestingLogic extends BaseLogic
*/
public static function delete(array $params): bool
{
$problem = SupervisionProblem::where('data_id',$params['id'])->where('data_type',8)->findOrEmpty();
$problem = SupervisionProblem::where('data_id','in',$params['id'])->where('data_type',8)->findOrEmpty();
if(!$problem->isEmpty()){
self::setError('该内容下存在实体平行检验问题数据，请先删除实体平行检验问题数据');
return false;
@ -165,10 +167,8 @@ class SupervisionEntityParallelTestingLogic extends BaseLogic
$data = SupervisionEntityParallelTesting::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();
$create_user = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['check_item_name'] = $check_item['node_name'];
$data['create_user_name'] = $create_user['name'];
$data['result_text'] = $data->result_text;
$data['problem_num'] = SupervisionProblem::field('id')->where('data_id',$data['id'])->where('data_type',8)->count();
$data['reply_num'] = SupervisionProblem::field('id')->where('data_id',$data['id'])->where('data_type',8)->where('is_rectification',1)->count();

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

@ -15,7 +15,6 @@
namespace app\adminapi\logic\supervision_work;
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;
@ -42,7 +41,7 @@ class SupervisionInspectionLogic extends BaseLogic
* @author likeadmin
* @date 2024/02/26 17:18
*/
public static function add(array $params,$admin_id): bool
public static function add(array $params): bool
{
Db::startTrans();
try {
@ -63,7 +62,8 @@ class SupervisionInspectionLogic extends BaseLogic
'follow_user' => $params['follow_user'],
'check_item_detail_ids' => $params['check_item_detail_ids'] ? json_encode($params['check_item_detail_ids']) : null,
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $admin_id,
'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){
@ -84,7 +84,7 @@ class SupervisionInspectionLogic extends BaseLogic
'problem_cate' => $v['problem_cate'],
'problem_description' => $v['problem_description'],
'problem_name' => $v['problem_name'],
'create_user' => $admin_id,
'create_user' => $params['create_user'],
]);
}
}
@ -105,7 +105,7 @@ class SupervisionInspectionLogic extends BaseLogic
* @author likeadmin
* @date 2024/02/26 17:18
*/
public static function edit(array $params,$admin_id): bool
public static function edit(array $params): bool
{
$data = SupervisionInspection::field('check_item_detail_ids')->where('id',$params['id'])->findOrEmpty();
Db::startTrans();
@ -126,6 +126,8 @@ class SupervisionInspectionLogic extends BaseLogic
'follow_user' => $params['follow_user'],
'check_item_detail_ids' => $params['check_item_detail_ids'] ? json_encode($params['check_item_detail_ids']) : null,
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $params['create_user'],
'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'])){
@ -171,7 +173,7 @@ class SupervisionInspectionLogic extends BaseLogic
'problem_cate' => $v['problem_cate'],
'problem_description' => $v['problem_description'],
'problem_name' => $v['problem_name'],
'create_user' => $admin_id,
'create_user' => $params['create_user'],
]);
}
}
@ -195,12 +197,12 @@ class SupervisionInspectionLogic extends BaseLogic
*/
public static function delete(array $params): bool
{
$inspection_result = SupervisionInspectionResult::where('inspection_id',$params['id'])->findOrEmpty();
$inspection_result = SupervisionInspectionResult::where('inspection_id','in',$params['id'])->findOrEmpty();
if(!$inspection_result->isEmpty()){
self::setError('该巡视内容下存在巡视结果数据，请先删除巡视结果数据');
return false;
}
$inspection_problem = SupervisionProblem::where('data_id',$params['id'])->where('data_type',1)->findOrEmpty();
$inspection_problem = SupervisionProblem::where('data_id','in',$params['id'])->where('data_type',1)->findOrEmpty();
if(!$inspection_problem->isEmpty()){
self::setError('该巡视内容下存在巡视问题数据，请先删除巡视问题数据');
return false;
@ -223,12 +225,10 @@ class SupervisionInspectionLogic extends BaseLogic
$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');
$create_user = Admin::field('name')->where('id',$data['create_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['create_user_name'] = $create_user['name'];
$data['inspection_type_text'] = $data->inspection_type_text;
$data['is_important_text'] = $data->is_important_text;
return $data->toArray();

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

@ -15,7 +15,6 @@
namespace app\adminapi\logic\supervision_work;
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;
@ -40,7 +39,7 @@ class SupervisionMaterialEntryLogic extends BaseLogic
* @author likeadmin
* @date 2024/02/28 13:41
*/
public static function add(array $params,$admin_id): bool
public static function add(array $params): bool
{
Db::startTrans();
try {
@ -54,7 +53,8 @@ class SupervisionMaterialEntryLogic extends BaseLogic
'enter_result' => $params['enter_result'],
'parallel_test' => $params['parallel_test'],
'remark' => $params['remark'],
'create_user' => $admin_id,
'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) {
@ -99,6 +99,8 @@ class SupervisionMaterialEntryLogic extends BaseLogic
'enter_result' => $params['enter_result'],
'parallel_test' => $params['parallel_test'],
'remark' => $params['remark'],
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
'update_time' => time(),
]);
if(!empty($params['entry_detail'])){
@ -146,7 +148,7 @@ class SupervisionMaterialEntryLogic extends BaseLogic
*/
public static function delete(array $params): bool
{
$entry_detail = SupervisionMaterialEntryDetail::where('material_entry_id',$params['id'])->findOrEmpty();
$entry_detail = SupervisionMaterialEntryDetail::where('material_entry_id','in',$params['id'])->findOrEmpty();
if(!$entry_detail->isEmpty()){
self::setError('当前数据下存在材料信息记录,请先删除材料信息记录');
return false;
@ -167,10 +169,8 @@ class SupervisionMaterialEntryLogic extends BaseLogic
$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();
$create_user = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['company_name'] = $company['unit_name'];
$data['create_user_name'] = $create_user['name'];
$data['enter_result_text'] = $data->enter_result_text;
$data['parallel_test_text'] = $data->parallel_test_text;
return $data->toArray();

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

@ -15,7 +15,6 @@
namespace app\adminapi\logic\supervision_work;
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;
@ -41,7 +40,7 @@ class SupervisionMaterialParallelTestingLogic extends BaseLogic
* @author likeadmin
* @date 2024/02/29 15:00
*/
public static function add(array $params,$admin_id): bool
public static function add(array $params): bool
{
Db::startTrans();
try {
@ -53,7 +52,8 @@ class SupervisionMaterialParallelTestingLogic extends BaseLogic
'inspection_date' => !empty($params['inspection_date']) ? strtotime($params['inspection_date']) : 0,
'remark' => $params['remark'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $admin_id
'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){
@ -92,6 +92,8 @@ class SupervisionMaterialParallelTestingLogic extends BaseLogic
'inspection_date' => !empty($params['inspection_date']) ? strtotime($params['inspection_date']) : 0,
'remark' => $params['remark'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
'update_time' => time()
]);
if(!empty($params['detail'])){
@ -153,12 +155,10 @@ class SupervisionMaterialParallelTestingLogic extends BaseLogic
$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();
$create_user = Admin::field('name')->where('id',$data['create_user'])->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['create_user_name'] = $create_user['name'];
return $data->toArray();
}
}

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

@ -37,7 +37,7 @@ class SupervisionMeetingMinutesLogic extends BaseLogic
* @author likeadmin
* @date 2024/03/01 14:31
*/
public static function add(array $params,$admin_id): bool
public static function add(array $params): bool
{
Db::startTrans();
try {
@ -52,7 +52,8 @@ class SupervisionMeetingMinutesLogic extends BaseLogic
'attendees' => $params['attendees'],
'content' => $params['content'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $admin_id,
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
]);
Db::commit();
return true;
@ -86,6 +87,8 @@ class SupervisionMeetingMinutesLogic extends BaseLogic
'attendees' => $params['attendees'],
'content' => $params['content'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
'update_time' => time()
]);
Db::commit();

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

@ -15,7 +15,6 @@
namespace app\adminapi\logic\supervision_work;
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;
@ -40,7 +39,7 @@ class SupervisionNoticeLogic extends BaseLogic
* @author likeadmin
* @date 2024/03/01 09:20
*/
public static function add(array $params,$admin_id): bool
public static function add(array $params): bool
{
Db::startTrans();
try {
@ -52,7 +51,8 @@ class SupervisionNoticeLogic extends BaseLogic
'notify_user' => $params['notify_user'],
'issue_date' => !empty($params['issue_date']) ? strtotime($params['issue_date']) : 0,
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $admin_id,
'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){
@ -92,6 +92,8 @@ class SupervisionNoticeLogic extends BaseLogic
'notify_user' => $params['notify_user'],
'issue_date' => !empty($params['issue_date']) ? strtotime($params['issue_date']) : 0,
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
'update_time' => time(),
]);
if(!empty($params['problem'])){
@ -158,7 +160,7 @@ class SupervisionNoticeLogic extends BaseLogic
*/
public static function delete(array $params): bool
{
$problem = SupervisionNoticeProblem::where('notice_id',$params['id'])->findOrEmpty();
$problem = SupervisionNoticeProblem::where('notice_id','in',$params['id'])->findOrEmpty();
if(!$problem->isEmpty()){
self::setError('该数据下存在通知问题数据，请先删除通知问题数据');
return false;
@ -179,10 +181,8 @@ class SupervisionNoticeLogic extends BaseLogic
$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();
$create_user = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['company_name'] = $company['unit_name'];
$data['create_user_name'] = $create_user['name'];
return $data->toArray();
}
}

10
app/adminapi/logic/supervision_work/SupervisionProblemLogic.php
View File

@ -15,7 +15,6 @@
namespace app\adminapi\logic\supervision_work;
use app\common\model\auth\Admin;
use app\common\model\supervision_work\SupervisionProblem;
use app\common\logic\BaseLogic;
use think\facade\Db;
@ -37,7 +36,7 @@ class SupervisionProblemLogic extends BaseLogic
* @author likeadmin
* @date 2024/02/28 09:19
*/
public static function add(array $params,$admin_id): bool
public static function add(array $params): bool
{
Db::startTrans();
try {
@ -47,7 +46,8 @@ class SupervisionProblemLogic extends BaseLogic
'problem_cate' => $params['problem_cate'],
'problem_description' => $params['problem_description'],
'problem_name' => $params['problem_name'],
'create_user' => $admin_id,
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
]);
Db::commit();
return true;
@ -76,6 +76,8 @@ class SupervisionProblemLogic extends BaseLogic
'problem_cate' => $params['problem_cate'],
'problem_description' => $params['problem_description'],
'problem_name' => $params['problem_name'],
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
'update_time' => time(),
]);
Db::commit();
@ -140,8 +142,6 @@ class SupervisionProblemLogic extends BaseLogic
public static function detail($params): array
{
$data = SupervisionProblem::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$create_user = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty();
$data['create_user_name'] = $create_user['name'];
$data['problem_cate_text'] = $data->problem_cate_text;
$data['rectification_result_text'] = $data->rectification_result_text;
$data['is_rectification_text'] = $data->is_rectification_text;

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

@ -15,7 +15,6 @@
namespace app\adminapi\logic\supervision_work;
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;
@ -42,7 +41,7 @@ class SupervisionSideStationLogic extends BaseLogic
* @author likeadmin
* @date 2024/02/27 13:58
*/
public static function add(array $params,$admin_id): bool
public static function add(array $params): bool
{
Db::startTrans();
try {
@ -62,7 +61,8 @@ class SupervisionSideStationLogic extends BaseLogic
'side_station_user' => $params['side_station_user'],
'check_item_detail_ids' => $params['check_item_detail_ids'] ? json_encode($params['check_item_detail_ids']) : null,
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $admin_id
'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){
@ -83,7 +83,7 @@ class SupervisionSideStationLogic extends BaseLogic
'problem_cate' => $v['problem_cate'],
'problem_description' => $v['problem_description'],
'problem_name' => $v['problem_name'],
'create_user' => $admin_id
'create_user' => $params['create_user']
]);
}
}
@ -104,7 +104,7 @@ class SupervisionSideStationLogic extends BaseLogic
* @author likeadmin
* @date 2024/02/27 13:58
*/
public static function edit(array $params,$admin_id): bool
public static function edit(array $params): bool
{
$data = SupervisionSideStation::field('check_item_detail_ids')->where('id',$params['id'])->findOrEmpty();
Db::startTrans();
@ -124,6 +124,8 @@ class SupervisionSideStationLogic extends BaseLogic
'side_station_user' => $params['side_station_user'],
'check_item_detail_ids' => $params['check_item_detail_ids'] ? json_encode($params['check_item_detail_ids']) : null,
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $params['create_user'],
'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'])){
@ -170,7 +172,7 @@ class SupervisionSideStationLogic extends BaseLogic
'problem_cate' => $v['problem_cate'],
'problem_description' => $v['problem_description'],
'problem_name' => $v['problem_name'],
'create_user' => $admin_id
'create_user' => $params['create_user']
]);
}
}
@ -194,12 +196,12 @@ class SupervisionSideStationLogic extends BaseLogic
*/
public static function delete(array $params): bool
{
$side_station_result = SupervisionSideStationResult::where('side_station_id',$params['id'])->findOrEmpty();
$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',$params['id'])->where('data_type',2)->findOrEmpty();
$side_station_problem = SupervisionProblem::where('data_id','in',$params['id'])->where('data_type',2)->findOrEmpty();
if(!$side_station_problem->isEmpty()){
self::setError('该旁站内容下存在旁站问题数据，请先删除旁站问题数据');
return false;
@ -222,12 +224,10 @@ class SupervisionSideStationLogic extends BaseLogic
$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');
$create_user = Admin::field('name')->where('id',$data['create_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['create_user_name'] = $create_user['name'];
$data['side_station_type_text'] = $data->side_station_type_text;
$data['side_station_result_text'] = $data->side_station_result_text;
return $data->toArray();

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

@ -15,7 +15,6 @@
namespace app\adminapi\logic\supervision_work;
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;
@ -40,7 +39,7 @@ class SupervisionTestBlocksSpecimensLogic extends BaseLogic
* @author likeadmin
* @date 2024/02/29 14:02
*/
public static function add(array $params,$admin_id): bool
public static function add(array $params): bool
{
Db::startTrans();
try {
@ -56,7 +55,8 @@ class SupervisionTestBlocksSpecimensLogic extends BaseLogic
'test_result' => $params['test_result'],
'remark' => $params['remark'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $admin_id
'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){
@ -66,7 +66,7 @@ class SupervisionTestBlocksSpecimensLogic extends BaseLogic
'problem_cate' => $v['problem_cate'],
'problem_description' => $v['problem_description'],
'problem_name' => $v['problem_name'],
'create_user' => $admin_id,
'create_user' => $params['create_user'],
]);
}
}
@ -87,7 +87,7 @@ class SupervisionTestBlocksSpecimensLogic extends BaseLogic
* @author likeadmin
* @date 2024/02/29 14:02
*/
public static function edit(array $params,$admin_id): bool
public static function edit(array $params): bool
{
Db::startTrans();
try {
@ -102,6 +102,8 @@ class SupervisionTestBlocksSpecimensLogic extends BaseLogic
'test_result' => $params['test_result'],
'remark' => $params['remark'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'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){
@ -121,7 +123,7 @@ class SupervisionTestBlocksSpecimensLogic extends BaseLogic
'problem_cate' => $v['problem_cate'],
'problem_description' => $v['problem_description'],
'problem_name' => $v['problem_name'],
'create_user' => $admin_id,
'create_user' => $params['create_user'],
]);
}
}
@ -145,7 +147,7 @@ class SupervisionTestBlocksSpecimensLogic extends BaseLogic
*/
public static function delete(array $params): bool
{
$problem = SupervisionProblem::where('data_id',$params['id'])->where('data_type',6)->findOrEmpty();
$problem = SupervisionProblem::where('data_id','in',$params['id'])->where('data_type',6)->findOrEmpty();
if(!$problem->isEmpty()){
self::setError('该内容下存在试块试件见证问题数据，请先删除试块试件见证问题数据');
return false;
@ -166,10 +168,8 @@ class SupervisionTestBlocksSpecimensLogic extends BaseLogic
$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();
$create_user = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty();
$data['project_name'] = $project['project_name'];
$data['company_name'] = $company['unit_name'];
$data['create_user_name'] = $create_user['name'];
$data['test_result_text'] = $data->test_result_text;
return $data->toArray();
}

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

@ -15,7 +15,6 @@
namespace app\adminapi\logic\supervision_work;
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;
@ -41,7 +40,7 @@ class SupervisionWitnessSamplingLogic extends BaseLogic
* @author likeadmin
* @date 2024/02/29 09:22
*/
public static function add(array $params,$admin_id): bool
public static function add(array $params): bool
{
Db::startTrans();
try {
@ -53,7 +52,8 @@ class SupervisionWitnessSamplingLogic extends BaseLogic
'witness' => $params['witness'],
'sampler' => $params['sampler'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $admin_id
'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){
@ -92,6 +92,8 @@ class SupervisionWitnessSamplingLogic extends BaseLogic
'witness' => $params['witness'],
'sampler' => $params['sampler'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
'update_time' => time()
]);
if(!empty($params['sampling_detail'])){
@ -132,7 +134,7 @@ class SupervisionWitnessSamplingLogic extends BaseLogic
*/
public static function delete(array $params): bool
{
$witness_sampling_detail = SupervisionWitnessSamplingDetail::where('witness_sampling_id',$params['id'])->findOrEmpty();
$witness_sampling_detail = SupervisionWitnessSamplingDetail::where('witness_sampling_id','in',$params['id'])->findOrEmpty();
if(!$witness_sampling_detail->isEmpty()){
self::setError('当前数据下存在材料信息内容,请先删除材料信息内容');
return false;
@ -154,12 +156,10 @@ class SupervisionWitnessSamplingLogic extends BaseLogic
$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();
$create_user = Admin::field('name')->where('id',$data['create_user'])->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['create_user_name'] = $create_user['name'];
return $data->toArray();
}
}

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

@ -126,7 +126,7 @@ class SupervisionWorkContactLogic extends BaseLogic
*/
public static function delete(array $params): bool
{
$problem = SupervisionWorkContactProblem::where('work_contact_id',$params['id'])->findOrEmpty();
$problem = SupervisionWorkContactProblem::where('work_contact_id','in',$params['id'])->findOrEmpty();
if(!$problem->isEmpty()){
self::setError('该数据下存在通知问题数据，请先删除通知问题数据');
return false;

8
app/adminapi/validate/supervision_connect/SupervisionCompanyCheckValidate.php
View File

@ -145,12 +145,4 @@ class SupervisionCompanyCheckValidate extends BaseValidate
return true;
}
public function checkAnnex($value): bool|string
{
if(!empty($value) && $value != '' && !is_array($value)){
return '附件格式错误';
}
return true;
}
}

11
app/adminapi/validate/supervision_connect/SupervisionProjectCaseReviewValidate.php
View File

@ -39,6 +39,8 @@ class SupervisionProjectCaseReviewValidate extends BaseValidate
'review_type' => 'require|checkReviewType',
'case_name' => 'require',
'review_content' => 'require',
'create_user' => 'require',
'create_time' => 'require|dateFormat:Y-m-d H:i:s',
'annex' => 'checkAnnex'
];
@ -55,6 +57,7 @@ class SupervisionProjectCaseReviewValidate extends BaseValidate
'review_content' => '评审内容',
'remark' => '备注',
'create_user' => '创建人',
'create_time' => '创建时间',
];
@ -129,12 +132,4 @@ class SupervisionProjectCaseReviewValidate extends BaseValidate
return true;
}
public function checkAnnex($value): bool|string
{
if(!empty($value) && $value != '' && !is_array($value)){
return '附件格式错误';
}
return true;
}
}

14
app/adminapi/validate/supervision_connect/SupervisionProjectInfoReportValidate.php
View File

@ -40,7 +40,9 @@ class SupervisionProjectInfoReportValidate extends BaseValidate
'happen_date' => 'require|dateFormat:Y-m-d',
'severity' => 'require|checkSeverity',
'info_cate' => 'checkInfoCate',
'annex' => 'checkAnnex'
'annex' => 'checkAnnex',
'create_user' => 'require',
'create_time' => 'require|dateFormat:Y-m-d H:i:s',
];
@ -58,6 +60,7 @@ class SupervisionProjectInfoReportValidate extends BaseValidate
'opinions' => '项目部意见',
'giver' => '主送人',
'create_user' => '创建人',
'create_time' => '创建时间',
];
@ -146,13 +149,4 @@ class SupervisionProjectInfoReportValidate extends BaseValidate
return true;
}
public function checkAnnex($value): bool|string
{
if(!empty($value) && $value != '' && !is_array($value)){
return '附件格式错误';
}
return true;
}
}

13
app/adminapi/validate/supervision_connect/SupervisionProjectMilestonesValidate.php
View File

@ -38,7 +38,9 @@ class SupervisionProjectMilestonesValidate extends BaseValidate
'title' => 'require',
'content' => 'require',
'remark' => 'require',
'annex' => 'checkAnnex'
'annex' => 'checkAnnex',
'create_user' => 'require',
'create_time' => 'require|dateFormat:Y-m-d H:i:s',
];
@ -53,6 +55,7 @@ class SupervisionProjectMilestonesValidate extends BaseValidate
'content' => '正文内容',
'remark' => '备注',
'create_user' => '发布人',
'create_time' => '发布时间',
];
@ -119,12 +122,4 @@ class SupervisionProjectMilestonesValidate extends BaseValidate
return true;
}
public function checkAnnex($value): bool|string
{
if(!empty($value) && $value != '' && !is_array($value)){
return '附件格式错误';
}
return true;
}
}

13
app/adminapi/validate/supervision_connect/SupervisionProjectMonthlyReportValidate.php
View File

@ -45,7 +45,9 @@ class SupervisionProjectMonthlyReportValidate extends BaseValidate
'total_amount' => 'require|float',
'this_month_pay' => 'require|float',
'total_pay' => 'require|float',
'annex' => 'checkAnnex'
'annex' => 'checkAnnex',
'create_user' => 'require',
'create_time' => 'require|dateFormat:Y-m-d H:i:s',
];
@ -75,6 +77,7 @@ class SupervisionProjectMonthlyReportValidate extends BaseValidate
'safety_situation' => '本月安全情况',
'remark' => '备注',
'create_user' => '创建人',
'create_time' => '创建时间',
];
@ -150,12 +153,4 @@ class SupervisionProjectMonthlyReportValidate extends BaseValidate
return true;
}
public function checkAnnex($value): bool|string
{
if(!empty($value) && $value != '' && !is_array($value)){
return '附件格式错误';
}
return true;
}
}

11
app/adminapi/validate/supervision_const_prepare/SupervisionCommencementReportValidate.php
View File

@ -37,6 +37,8 @@ class SupervisionCommencementReportValidate extends BaseValidate
'project_id' => 'require|checkProject',
'doc_name' => 'require',
'annex' => 'checkAnnex',
'create_user' => 'require',
'create_time' => 'require|dateFormat:Y-m-d H:i:s',
];
@ -50,6 +52,7 @@ class SupervisionCommencementReportValidate extends BaseValidate
'doc_name' => '文档名称',
'doc_desc' => '文档简介',
'create_user' => '操作人',
'create_time' => '操作时间',
];
@ -116,12 +119,4 @@ class SupervisionCommencementReportValidate extends BaseValidate
return true;
}
public function checkAnnex($value): bool|string
{
if(!empty($value) && $value != '' && !is_array($value)){
return '附件格式错误';
}
return true;
}
}

11
app/adminapi/validate/supervision_const_prepare/SupervisionDesignDisclosureValidate.php
View File

@ -37,6 +37,8 @@ class SupervisionDesignDisclosureValidate extends BaseValidate
'project_id' => 'require|checkProject',
'doc_name' => 'require',
'annex' => 'checkAnnex',
'create_user' => 'require',
'create_time' => 'require|dateFormat:Y-m-d H:i:s',
];
@ -50,6 +52,7 @@ class SupervisionDesignDisclosureValidate extends BaseValidate
'doc_name' => '文档名称',
'doc_desc' => '文档简介',
'create_user' => '操作人',
'create_time' => '操作时间',
];
@ -116,12 +119,4 @@ class SupervisionDesignDisclosureValidate extends BaseValidate
return true;
}
public function checkAnnex($value): bool|string
{
if(!empty($value) && $value != '' && !is_array($value)){
return '附件格式错误';
}
return true;
}
}

11
app/adminapi/validate/supervision_const_prepare/SupervisionFirstMeetingValidate.php
View File

@ -37,6 +37,8 @@ class SupervisionFirstMeetingValidate extends BaseValidate
'project_id' => 'require|checkProject',
'doc_name' => 'require',
'annex' => 'checkAnnex',
'create_user' => 'require',
'create_time' => 'require|dateFormat:Y-m-d H:i:s',
];
@ -51,6 +53,7 @@ class SupervisionFirstMeetingValidate extends BaseValidate
'doc_desc' => '文档简介',
'annex' => '附件',
'create_user' => '操作人',
'create_time' => '操作时间',
];
@ -117,12 +120,4 @@ class SupervisionFirstMeetingValidate extends BaseValidate
return true;
}
public function checkAnnex($value): bool|string
{
if(!empty($value) && $value != '' && !is_array($value)){
return '附件格式错误';
}
return true;
}
}

11
app/adminapi/validate/supervision_const_prepare/SupervisionRulesDisclosureValidate.php
View File

@ -37,6 +37,8 @@ class SupervisionRulesDisclosureValidate extends BaseValidate
'project_id' => 'require|checkProject',
'doc_name' => 'require',
'annex' => 'checkAnnex',
'create_user' => 'require',
'create_time' => 'require|dateFormat:Y-m-d H:i:s',
];
@ -50,6 +52,7 @@ class SupervisionRulesDisclosureValidate extends BaseValidate
'doc_name' => '文档名称',
'doc_desc' => '文档简介',
'create_user' => '操作人',
'create_time' => '操作时间',
];
@ -116,12 +119,4 @@ class SupervisionRulesDisclosureValidate extends BaseValidate
return true;
}
public function checkAnnex($value): bool|string
{
if(!empty($value) && $value != '' && !is_array($value)){
return '附件格式错误';
}
return true;
}
}

11
app/adminapi/validate/supervision_const_prepare/SupervisionRulesValidate.php
View File

@ -37,6 +37,8 @@ class SupervisionRulesValidate extends BaseValidate
'project_id' => 'require|checkProject',
'doc_name' => 'require',
'annex' => 'checkAnnex',
'create_user' => 'require',
'create_time' => 'require|dateFormat:Y-m-d H:i:s',
];
@ -50,6 +52,7 @@ class SupervisionRulesValidate extends BaseValidate
'doc_name' => '文档名称',
'doc_desc' => '文档简介',
'create_user' => '操作人',
'create_time' => '操作时间',
];
@ -116,12 +119,4 @@ class SupervisionRulesValidate extends BaseValidate
return true;
}
public function checkAnnex($value): bool|string
{
if(!empty($value) && $value != '' && !is_array($value)){
return '附件格式错误';
}
return true;
}
}

13
app/adminapi/validate/supervision_dangerous/SupervisionDangerousEngineeringCaseValidate.php
View File

@ -38,7 +38,9 @@ class SupervisionDangerousEngineeringCaseValidate extends BaseValidate
'case_name' => 'require',
'assessor' => 'require',
'review_content' => 'require',
'annex' => 'checkAnnex'
'annex' => 'checkAnnex',
'create_user' => 'require',
'create_time' => 'require|dateFormat:Y-m-d H:i:s',
];
@ -54,6 +56,7 @@ class SupervisionDangerousEngineeringCaseValidate extends BaseValidate
'review_content' => '评审内容',
'remark' => '备注',
'create_user' => '提交人',
'create_time' => '提交时间',
];
@ -120,12 +123,4 @@ class SupervisionDangerousEngineeringCaseValidate extends BaseValidate
return true;
}
public function checkAnnex($value): bool|string
{
if(!empty($value) && $value != '' && !is_array($value)){
return '附件格式错误';
}
return true;
}
}

3
app/adminapi/validate/supervision_dangerous/SupervisionExcessRiskSecurityMonitoringValidate.php
View File

@ -48,6 +48,8 @@ class SupervisionExcessRiskSecurityMonitoringValidate extends BaseValidate
'check_time' => 'dateFormat:Y-m-d',
'exceed_the_control_value' => 'require|in:0,1',
'exceed_the_warning_value' => 'require|in:0,1',
'create_user' => 'require',
'create_time' => 'require|dateFormat:Y-m-d H:i:s',
];
@ -76,6 +78,7 @@ class SupervisionExcessRiskSecurityMonitoringValidate extends BaseValidate
'exceed_the_warning_value' => '是否超预警值',
'control_measures' => '控制措施',
'create_user' => '创建人',
'create_time' => '创建时间',
];

3
app/adminapi/validate/supervision_dangerous/SupervisionHighRiskSecurityMonitoringValidate.php
View File

@ -47,6 +47,8 @@ class SupervisionHighRiskSecurityMonitoringValidate extends BaseValidate
'check_time' => 'dateFormat:Y-m-d',
'exceed_the_control_value' => 'require|in:0,1',
'exceed_the_warning_value' => 'require|in:0,1',
'create_user' => 'require',
'create_time' => 'require|dateFormat:Y-m-d H:i:s',
];
@ -74,6 +76,7 @@ class SupervisionHighRiskSecurityMonitoringValidate extends BaseValidate
'exceed_the_warning_value' => '是否超预警值',
'control_measures' => '控制措施',
'create_user' => '创建人',
'create_time' => '创建时间',
];

8
app/adminapi/validate/supervision_dangerous/SupervisionLargeMechanicalEquipmentValidate.php
View File

@ -175,14 +175,6 @@ class SupervisionLargeMechanicalEquipmentValidate extends BaseValidate
return true;
}
public function checkAnnex($value): bool|string
{
if(!empty($value) && $value != '' && !is_array($value)){
return '附件格式错误';
}
return true;
}
public function checkMaintenanceRecord($value): bool|string
{
if(!isset($value) || $value == '') return true;

8
app/adminapi/validate/supervision_dangerous/SupervisionSafetyWarningSignValidate.php
View File

@ -120,12 +120,4 @@ class SupervisionSafetyWarningSignValidate extends BaseValidate
return true;
}
public function checkAnnex($value): bool|string
{
if(!empty($value) && $value != '' && !is_array($value)){
return '附件格式错误';
}
return true;
}
}

Some files were not shown because too many files have changed in this diff Show More