From f36b761638b9012de74bca454d8cb1a037634db6 Mon Sep 17 00:00:00 2001 From: weiz <736250432@qq.com> Date: Tue, 12 Mar 2024 14:03:57 +0800 Subject: [PATCH] update --- ...SupervisionProjectCaseReviewController.php | 2 +- ...SupervisionProjectInfoReportController.php | 2 +- ...SupervisionProjectMilestonesController.php | 2 +- ...ervisionProjectMonthlyReportController.php | 2 +- ...upervisionCommencementReportController.php | 2 +- .../SupervisionDesignDisclosureController.php | 2 +- .../SupervisionFirstMeetingController.php | 2 +- .../SupervisionRulesController.php | 2 +- .../SupervisionRulesDisclosureController.php | 2 +- ...sionDangerousEngineeringCaseController.php | 2 +- ...ExcessRiskSecurityMonitoringController.php | 2 +- ...onHighRiskSecurityMonitoringController.php | 2 +- ...isionProjectAcceptanceReportController.php | 2 +- ...ervisionConstructionPlanningController.php | 2 +- ...upervisionContractDisclosureController.php | 2 +- .../SupervisionPlanningController.php | 2 +- .../SupervisionProjectController.php | 2 +- ...structionManagementPersonnelController.php | 2 +- .../SupervisionLargeEquipmentController.php | 2 +- .../SupervisionAcceptController.php | 4 ++-- .../SupervisionDeviceEntryController.php | 4 ++-- ...rvisionEntityParallelTestingController.php | 4 ++-- .../SupervisionInspectionController.php | 4 ++-- .../SupervisionMaterialEntryController.php | 2 +- ...isionMaterialParallelTestingController.php | 2 +- .../SupervisionMeetingMinutesController.php | 2 +- .../SupervisionNoticeController.php | 2 +- .../SupervisionProblemController.php | 2 +- .../SupervisionSideStationController.php | 4 ++-- ...pervisionTestBlocksSpecimensController.php | 4 ++-- .../SupervisionWitnessSamplingController.php | 2 +- .../SupervisionCommencementReportLists.php | 3 --- .../SupervisionDesignDisclosureLists.php | 3 --- .../SupervisionFirstMeetingLists.php | 2 -- .../SupervisionRulesDisclosureLists.php | 3 --- .../SupervisionRulesLists.php | 3 --- ...upervisionProjectAcceptanceReportLists.php | 3 --- .../SupervisionConstructionPlanningLists.php | 3 --- .../SupervisionContractDisclosureLists.php | 3 --- .../SupervisionPlanningLists.php | 3 --- ...onConstructionManagementPersonnelLists.php | 3 --- .../SupervisionLargeEquipmentLists.php | 3 --- .../SupervisionAcceptLists.php | 3 --- .../SupervisionDeviceEntryLists.php | 3 --- .../SupervisionEntityParallelTestingLists.php | 3 --- .../SupervisionInspectionLists.php | 3 --- .../SupervisionProblemLists.php | 3 --- .../SupervisionSideStationLists.php | 3 --- .../SupervisionTestBlocksSpecimensLists.php | 3 --- .../SupervisionProjectCaseReviewLogic.php | 10 +++++----- .../SupervisionProjectInfoReportLogic.php | 10 +++++----- .../SupervisionProjectMilestonesLogic.php | 14 ++++++------- .../SupervisionProjectMonthlyReportLogic.php | 8 ++++---- .../SupervisionCommencementReportLogic.php | 10 +++++----- .../SupervisionDesignDisclosureLogic.php | 10 +++++----- .../SupervisionFirstMeetingLogic.php | 10 +++++----- .../SupervisionRulesDisclosureLogic.php | 10 +++++----- .../SupervisionRulesLogic.php | 10 +++++----- ...pervisionDangerousEngineeringCaseLogic.php | 10 +++++----- ...ionDangerousEngineeringMonitoringLogic.php | 6 +++--- ...isionExcessRiskSecurityMonitoringLogic.php | 10 +++++----- ...rvisionHighRiskSecurityMonitoringLogic.php | 8 ++++---- ...pervisionLargeMechanicalEquipmentLogic.php | 2 +- ...upervisionProjectAcceptanceReportLogic.php | 10 +++++----- .../SupervisionProjectDataArchivingLogic.php | 2 +- ...SupervisionProjectOwnerEvaluationLogic.php | 10 +++++----- .../SupervisionConstructionPlanningLogic.php | 10 +++++----- .../SupervisionContractDisclosureLogic.php | 10 +++++----- .../SupervisionPlanningLogic.php | 10 +++++----- .../SupervisionProjectLogic.php | 14 ++++++------- ...onConstructionManagementPersonnelLogic.php | 10 +++++----- .../SupervisionLargeEquipmentLogic.php | 10 +++++----- .../SupervisionAcceptLogic.php | 20 +++++++++---------- .../SupervisionDeviceEntryLogic.php | 20 +++++++++---------- .../SupervisionEntityParallelTestingLogic.php | 18 ++++++++--------- .../SupervisionInspectionLogic.php | 20 +++++++++---------- .../SupervisionMaterialEntryLogic.php | 12 +++++------ ...upervisionMaterialParallelTestingLogic.php | 10 +++++----- .../SupervisionMeetingMinutesLogic.php | 7 +++++-- .../SupervisionNoticeLogic.php | 12 +++++------ .../SupervisionProblemLogic.php | 10 +++++----- .../SupervisionSideStationLogic.php | 20 +++++++++---------- .../SupervisionTestBlocksSpecimensLogic.php | 18 ++++++++--------- .../SupervisionWitnessSamplingLogic.php | 12 +++++------ .../SupervisionWorkContactLogic.php | 2 +- .../SupervisionCompanyCheckValidate.php | 8 -------- .../SupervisionProjectCaseReviewValidate.php | 11 +++------- .../SupervisionProjectInfoReportValidate.php | 14 ++++--------- .../SupervisionProjectMilestonesValidate.php | 13 ++++-------- ...upervisionProjectMonthlyReportValidate.php | 13 ++++-------- .../SupervisionCommencementReportValidate.php | 11 +++------- .../SupervisionDesignDisclosureValidate.php | 11 +++------- .../SupervisionFirstMeetingValidate.php | 11 +++------- .../SupervisionRulesDisclosureValidate.php | 11 +++------- .../SupervisionRulesValidate.php | 11 +++------- ...visionDangerousEngineeringCaseValidate.php | 13 ++++-------- ...onExcessRiskSecurityMonitoringValidate.php | 3 +++ ...sionHighRiskSecurityMonitoringValidate.php | 3 +++ ...visionLargeMechanicalEquipmentValidate.php | 8 -------- .../SupervisionSafetyWarningSignValidate.php | 8 -------- ...rvisionProjectAcceptanceReportValidate.php | 18 +++++++---------- ...ervisionProjectOwnerEvaluationValidate.php | 18 +++++++---------- ...upervisionConstructionPlanningValidate.php | 12 ++++------- .../SupervisionContractDisclosureValidate.php | 12 ++++------- .../SupervisionPlanningValidate.php | 12 ++++------- .../SupervisionProjectValidate.php | 12 +++-------- ...onstructionManagementPersonnelValidate.php | 11 +++------- .../SupervisionLargeEquipmentValidate.php | 11 +++------- ...rticipatingUnitsQualificationsValidate.php | 8 -------- .../SupervisionAcceptValidate.php | 11 +++------- .../SupervisionDeviceEntryValidate.php | 3 +++ .../SupervisionDiaryValidate.php | 8 -------- ...pervisionEntityParallelTestingValidate.php | 11 +++------- .../SupervisionInspectionValidate.php | 11 +++------- .../SupervisionMaterialEntryValidate.php | 3 +++ ...nMaterialParallelTestingDetailValidate.php | 8 -------- ...rvisionMaterialParallelTestingValidate.php | 11 +++------- .../SupervisionMeetingMinutesValidate.php | 13 ++++-------- .../SupervisionNoticeValidate.php | 17 ++++++---------- .../SupervisionProblemValidate.php | 16 ++++++--------- .../SupervisionSideStationValidate.php | 13 ++++-------- ...SupervisionTestBlocksSpecimensValidate.php | 13 ++++-------- ...pervisionWitnessSamplingDetailValidate.php | 8 -------- .../SupervisionWitnessSamplingValidate.php | 11 +++------- .../SupervisionWorkContactValidate.php | 8 -------- .../SupervisionCompanyCheck.php | 4 ---- .../SupervisionProjectCaseReview.php | 4 ---- .../SupervisionProjectInfoReport.php | 4 ---- .../SupervisionProjectMilestones.php | 4 ---- .../SupervisionProjectMonthlyReport.php | 4 ---- .../SupervisionCommencementReport.php | 4 ---- .../SupervisionDesignDisclosure.php | 4 ---- .../SupervisionFirstMeeting.php | 4 ---- .../SupervisionRules.php | 5 ----- .../SupervisionRulesDisclosure.php | 5 ----- .../SupervisionDangerousEngineeringCase.php | 4 ---- .../SupervisionLargeMechanicalEquipment.php | 5 ----- .../SupervisionSafetyWarningSign.php | 4 ---- .../SupervisionProjectAcceptanceReport.php | 3 --- .../SupervisionConstructionPlanning.php | 5 ----- .../SupervisionContractDisclosure.php | 5 ----- .../SupervisionPlanning.php | 5 ----- .../SupervisionProject.php | 4 ++-- ...rvisionConstructionManagementPersonnel.php | 5 ----- .../SupervisionLargeEquipment.php | 5 ----- ...visionParticipatingUnitsQualifications.php | 5 ----- .../supervision_work/SupervisionAccept.php | 5 ----- .../supervision_work/SupervisionDiary.php | 5 ----- .../SupervisionEntityParallelTesting.php | 5 ----- .../SupervisionInspection.php | 5 ----- .../SupervisionMaterialParallelTesting.php | 4 ---- .../SupervisionMeetingMinutes.php | 5 ----- .../supervision_work/SupervisionNotice.php | 5 ----- .../SupervisionSideStation.php | 5 ----- .../SupervisionTestBlocksSpecimens.php | 5 ----- .../SupervisionWitnessSampling.php | 4 ---- .../SupervisionWorkContact.php | 5 ----- 157 files changed, 358 insertions(+), 737 deletions(-) diff --git a/app/adminapi/controller/supervision_connect/SupervisionProjectCaseReviewController.php b/app/adminapi/controller/supervision_connect/SupervisionProjectCaseReviewController.php index a4cecad4f..1edbbb7f5 100644 --- a/app/adminapi/controller/supervision_connect/SupervisionProjectCaseReviewController.php +++ b/app/adminapi/controller/supervision_connect/SupervisionProjectCaseReviewController.php @@ -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); } diff --git a/app/adminapi/controller/supervision_connect/SupervisionProjectInfoReportController.php b/app/adminapi/controller/supervision_connect/SupervisionProjectInfoReportController.php index ea705b9c3..829217c8d 100644 --- a/app/adminapi/controller/supervision_connect/SupervisionProjectInfoReportController.php +++ b/app/adminapi/controller/supervision_connect/SupervisionProjectInfoReportController.php @@ -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); } diff --git a/app/adminapi/controller/supervision_connect/SupervisionProjectMilestonesController.php b/app/adminapi/controller/supervision_connect/SupervisionProjectMilestonesController.php index 5d8099cba..1ac412580 100644 --- a/app/adminapi/controller/supervision_connect/SupervisionProjectMilestonesController.php +++ b/app/adminapi/controller/supervision_connect/SupervisionProjectMilestonesController.php @@ -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); } diff --git a/app/adminapi/controller/supervision_connect/SupervisionProjectMonthlyReportController.php b/app/adminapi/controller/supervision_connect/SupervisionProjectMonthlyReportController.php index 9e4993141..6829630cb 100644 --- a/app/adminapi/controller/supervision_connect/SupervisionProjectMonthlyReportController.php +++ b/app/adminapi/controller/supervision_connect/SupervisionProjectMonthlyReportController.php @@ -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); } diff --git a/app/adminapi/controller/supervision_const_prepare/SupervisionCommencementReportController.php b/app/adminapi/controller/supervision_const_prepare/SupervisionCommencementReportController.php index 2aeff1fe7..399cd4c05 100644 --- a/app/adminapi/controller/supervision_const_prepare/SupervisionCommencementReportController.php +++ b/app/adminapi/controller/supervision_const_prepare/SupervisionCommencementReportController.php @@ -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); } diff --git a/app/adminapi/controller/supervision_const_prepare/SupervisionDesignDisclosureController.php b/app/adminapi/controller/supervision_const_prepare/SupervisionDesignDisclosureController.php index 08f655aec..2e288ea16 100644 --- a/app/adminapi/controller/supervision_const_prepare/SupervisionDesignDisclosureController.php +++ b/app/adminapi/controller/supervision_const_prepare/SupervisionDesignDisclosureController.php @@ -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); } diff --git a/app/adminapi/controller/supervision_const_prepare/SupervisionFirstMeetingController.php b/app/adminapi/controller/supervision_const_prepare/SupervisionFirstMeetingController.php index 36653bb15..da8aa9877 100644 --- a/app/adminapi/controller/supervision_const_prepare/SupervisionFirstMeetingController.php +++ b/app/adminapi/controller/supervision_const_prepare/SupervisionFirstMeetingController.php @@ -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); } diff --git a/app/adminapi/controller/supervision_const_prepare/SupervisionRulesController.php b/app/adminapi/controller/supervision_const_prepare/SupervisionRulesController.php index e1d3666c6..6d21eb1a1 100644 --- a/app/adminapi/controller/supervision_const_prepare/SupervisionRulesController.php +++ b/app/adminapi/controller/supervision_const_prepare/SupervisionRulesController.php @@ -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); } diff --git a/app/adminapi/controller/supervision_const_prepare/SupervisionRulesDisclosureController.php b/app/adminapi/controller/supervision_const_prepare/SupervisionRulesDisclosureController.php index 3d60804a7..71264e3e4 100644 --- a/app/adminapi/controller/supervision_const_prepare/SupervisionRulesDisclosureController.php +++ b/app/adminapi/controller/supervision_const_prepare/SupervisionRulesDisclosureController.php @@ -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); } diff --git a/app/adminapi/controller/supervision_dangerous/SupervisionDangerousEngineeringCaseController.php b/app/adminapi/controller/supervision_dangerous/SupervisionDangerousEngineeringCaseController.php index 8fb253295..214a5157f 100644 --- a/app/adminapi/controller/supervision_dangerous/SupervisionDangerousEngineeringCaseController.php +++ b/app/adminapi/controller/supervision_dangerous/SupervisionDangerousEngineeringCaseController.php @@ -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); } diff --git a/app/adminapi/controller/supervision_dangerous/SupervisionExcessRiskSecurityMonitoringController.php b/app/adminapi/controller/supervision_dangerous/SupervisionExcessRiskSecurityMonitoringController.php index 2b9cad53b..e559f340c 100644 --- a/app/adminapi/controller/supervision_dangerous/SupervisionExcessRiskSecurityMonitoringController.php +++ b/app/adminapi/controller/supervision_dangerous/SupervisionExcessRiskSecurityMonitoringController.php @@ -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); } diff --git a/app/adminapi/controller/supervision_dangerous/SupervisionHighRiskSecurityMonitoringController.php b/app/adminapi/controller/supervision_dangerous/SupervisionHighRiskSecurityMonitoringController.php index 7ec2ca8f2..bdb4ef5e3 100644 --- a/app/adminapi/controller/supervision_dangerous/SupervisionHighRiskSecurityMonitoringController.php +++ b/app/adminapi/controller/supervision_dangerous/SupervisionHighRiskSecurityMonitoringController.php @@ -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); } diff --git a/app/adminapi/controller/supervision_ending/SupervisionProjectAcceptanceReportController.php b/app/adminapi/controller/supervision_ending/SupervisionProjectAcceptanceReportController.php index 6bd6810bf..d213eb192 100644 --- a/app/adminapi/controller/supervision_ending/SupervisionProjectAcceptanceReportController.php +++ b/app/adminapi/controller/supervision_ending/SupervisionProjectAcceptanceReportController.php @@ -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); } diff --git a/app/adminapi/controller/supervision_prepare/SupervisionConstructionPlanningController.php b/app/adminapi/controller/supervision_prepare/SupervisionConstructionPlanningController.php index 39f6c52b3..3c8850fe4 100644 --- a/app/adminapi/controller/supervision_prepare/SupervisionConstructionPlanningController.php +++ b/app/adminapi/controller/supervision_prepare/SupervisionConstructionPlanningController.php @@ -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); } diff --git a/app/adminapi/controller/supervision_prepare/SupervisionContractDisclosureController.php b/app/adminapi/controller/supervision_prepare/SupervisionContractDisclosureController.php index 1c81f3993..9a7663604 100644 --- a/app/adminapi/controller/supervision_prepare/SupervisionContractDisclosureController.php +++ b/app/adminapi/controller/supervision_prepare/SupervisionContractDisclosureController.php @@ -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); } diff --git a/app/adminapi/controller/supervision_prepare/SupervisionPlanningController.php b/app/adminapi/controller/supervision_prepare/SupervisionPlanningController.php index a6185c385..e4448cb03 100644 --- a/app/adminapi/controller/supervision_prepare/SupervisionPlanningController.php +++ b/app/adminapi/controller/supervision_prepare/SupervisionPlanningController.php @@ -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); } diff --git a/app/adminapi/controller/supervision_project/SupervisionProjectController.php b/app/adminapi/controller/supervision_project/SupervisionProjectController.php index d0b146175..b5e3491d7 100644 --- a/app/adminapi/controller/supervision_project/SupervisionProjectController.php +++ b/app/adminapi/controller/supervision_project/SupervisionProjectController.php @@ -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); } diff --git a/app/adminapi/controller/supervision_qualification_review/SupervisionConstructionManagementPersonnelController.php b/app/adminapi/controller/supervision_qualification_review/SupervisionConstructionManagementPersonnelController.php index 423b44d48..f06641f04 100644 --- a/app/adminapi/controller/supervision_qualification_review/SupervisionConstructionManagementPersonnelController.php +++ b/app/adminapi/controller/supervision_qualification_review/SupervisionConstructionManagementPersonnelController.php @@ -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); } diff --git a/app/adminapi/controller/supervision_qualification_review/SupervisionLargeEquipmentController.php b/app/adminapi/controller/supervision_qualification_review/SupervisionLargeEquipmentController.php index 39aea3ce1..661c4996e 100644 --- a/app/adminapi/controller/supervision_qualification_review/SupervisionLargeEquipmentController.php +++ b/app/adminapi/controller/supervision_qualification_review/SupervisionLargeEquipmentController.php @@ -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); } diff --git a/app/adminapi/controller/supervision_work/SupervisionAcceptController.php b/app/adminapi/controller/supervision_work/SupervisionAcceptController.php index acdc0fc1e..205a67fb4 100644 --- a/app/adminapi/controller/supervision_work/SupervisionAcceptController.php +++ b/app/adminapi/controller/supervision_work/SupervisionAcceptController.php @@ -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); } diff --git a/app/adminapi/controller/supervision_work/SupervisionDeviceEntryController.php b/app/adminapi/controller/supervision_work/SupervisionDeviceEntryController.php index 479c660e1..31673def5 100644 --- a/app/adminapi/controller/supervision_work/SupervisionDeviceEntryController.php +++ b/app/adminapi/controller/supervision_work/SupervisionDeviceEntryController.php @@ -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); } diff --git a/app/adminapi/controller/supervision_work/SupervisionEntityParallelTestingController.php b/app/adminapi/controller/supervision_work/SupervisionEntityParallelTestingController.php index c6a1b57f8..db8d70029 100644 --- a/app/adminapi/controller/supervision_work/SupervisionEntityParallelTestingController.php +++ b/app/adminapi/controller/supervision_work/SupervisionEntityParallelTestingController.php @@ -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); } diff --git a/app/adminapi/controller/supervision_work/SupervisionInspectionController.php b/app/adminapi/controller/supervision_work/SupervisionInspectionController.php index 6f2eb9903..3c48e6be8 100644 --- a/app/adminapi/controller/supervision_work/SupervisionInspectionController.php +++ b/app/adminapi/controller/supervision_work/SupervisionInspectionController.php @@ -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); } diff --git a/app/adminapi/controller/supervision_work/SupervisionMaterialEntryController.php b/app/adminapi/controller/supervision_work/SupervisionMaterialEntryController.php index 0c37063bc..bec3a89e1 100644 --- a/app/adminapi/controller/supervision_work/SupervisionMaterialEntryController.php +++ b/app/adminapi/controller/supervision_work/SupervisionMaterialEntryController.php @@ -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); } diff --git a/app/adminapi/controller/supervision_work/SupervisionMaterialParallelTestingController.php b/app/adminapi/controller/supervision_work/SupervisionMaterialParallelTestingController.php index 822dbf8c0..84a1e817e 100644 --- a/app/adminapi/controller/supervision_work/SupervisionMaterialParallelTestingController.php +++ b/app/adminapi/controller/supervision_work/SupervisionMaterialParallelTestingController.php @@ -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); } diff --git a/app/adminapi/controller/supervision_work/SupervisionMeetingMinutesController.php b/app/adminapi/controller/supervision_work/SupervisionMeetingMinutesController.php index 87ba2ed3e..b3a8adcd7 100644 --- a/app/adminapi/controller/supervision_work/SupervisionMeetingMinutesController.php +++ b/app/adminapi/controller/supervision_work/SupervisionMeetingMinutesController.php @@ -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); } diff --git a/app/adminapi/controller/supervision_work/SupervisionNoticeController.php b/app/adminapi/controller/supervision_work/SupervisionNoticeController.php index 466731770..3d37fdb03 100644 --- a/app/adminapi/controller/supervision_work/SupervisionNoticeController.php +++ b/app/adminapi/controller/supervision_work/SupervisionNoticeController.php @@ -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); } diff --git a/app/adminapi/controller/supervision_work/SupervisionProblemController.php b/app/adminapi/controller/supervision_work/SupervisionProblemController.php index 507639f28..985a451c0 100644 --- a/app/adminapi/controller/supervision_work/SupervisionProblemController.php +++ b/app/adminapi/controller/supervision_work/SupervisionProblemController.php @@ -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); } diff --git a/app/adminapi/controller/supervision_work/SupervisionSideStationController.php b/app/adminapi/controller/supervision_work/SupervisionSideStationController.php index 4c23b8554..06aafb4ef 100644 --- a/app/adminapi/controller/supervision_work/SupervisionSideStationController.php +++ b/app/adminapi/controller/supervision_work/SupervisionSideStationController.php @@ -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); } diff --git a/app/adminapi/controller/supervision_work/SupervisionTestBlocksSpecimensController.php b/app/adminapi/controller/supervision_work/SupervisionTestBlocksSpecimensController.php index 9ac583a43..d0a94632f 100644 --- a/app/adminapi/controller/supervision_work/SupervisionTestBlocksSpecimensController.php +++ b/app/adminapi/controller/supervision_work/SupervisionTestBlocksSpecimensController.php @@ -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); } diff --git a/app/adminapi/controller/supervision_work/SupervisionWitnessSamplingController.php b/app/adminapi/controller/supervision_work/SupervisionWitnessSamplingController.php index d5906c6fd..b994b281c 100644 --- a/app/adminapi/controller/supervision_work/SupervisionWitnessSamplingController.php +++ b/app/adminapi/controller/supervision_work/SupervisionWitnessSamplingController.php @@ -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); } diff --git a/app/adminapi/lists/supervision_const_prepare/SupervisionCommencementReportLists.php b/app/adminapi/lists/supervision_const_prepare/SupervisionCommencementReportLists.php index cc9939535..2ef3f968d 100644 --- a/app/adminapi/lists/supervision_const_prepare/SupervisionCommencementReportLists.php +++ b/app/adminapi/lists/supervision_const_prepare/SupervisionCommencementReportLists.php @@ -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(); } diff --git a/app/adminapi/lists/supervision_const_prepare/SupervisionDesignDisclosureLists.php b/app/adminapi/lists/supervision_const_prepare/SupervisionDesignDisclosureLists.php index ef4040c26..19239f878 100644 --- a/app/adminapi/lists/supervision_const_prepare/SupervisionDesignDisclosureLists.php +++ b/app/adminapi/lists/supervision_const_prepare/SupervisionDesignDisclosureLists.php @@ -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(); } diff --git a/app/adminapi/lists/supervision_const_prepare/SupervisionFirstMeetingLists.php b/app/adminapi/lists/supervision_const_prepare/SupervisionFirstMeetingLists.php index b4d035e1b..90df84b41 100644 --- a/app/adminapi/lists/supervision_const_prepare/SupervisionFirstMeetingLists.php +++ b/app/adminapi/lists/supervision_const_prepare/SupervisionFirstMeetingLists.php @@ -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(); } diff --git a/app/adminapi/lists/supervision_const_prepare/SupervisionRulesDisclosureLists.php b/app/adminapi/lists/supervision_const_prepare/SupervisionRulesDisclosureLists.php index cbba08a77..0fa09a0ab 100644 --- a/app/adminapi/lists/supervision_const_prepare/SupervisionRulesDisclosureLists.php +++ b/app/adminapi/lists/supervision_const_prepare/SupervisionRulesDisclosureLists.php @@ -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(); } diff --git a/app/adminapi/lists/supervision_const_prepare/SupervisionRulesLists.php b/app/adminapi/lists/supervision_const_prepare/SupervisionRulesLists.php index 0fb1c9a77..7ed55e30a 100644 --- a/app/adminapi/lists/supervision_const_prepare/SupervisionRulesLists.php +++ b/app/adminapi/lists/supervision_const_prepare/SupervisionRulesLists.php @@ -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(); } diff --git a/app/adminapi/lists/supervision_ending/SupervisionProjectAcceptanceReportLists.php b/app/adminapi/lists/supervision_ending/SupervisionProjectAcceptanceReportLists.php index 32daa0a83..7963218eb 100644 --- a/app/adminapi/lists/supervision_ending/SupervisionProjectAcceptanceReportLists.php +++ b/app/adminapi/lists/supervision_ending/SupervisionProjectAcceptanceReportLists.php @@ -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(); } diff --git a/app/adminapi/lists/supervision_prepare/SupervisionConstructionPlanningLists.php b/app/adminapi/lists/supervision_prepare/SupervisionConstructionPlanningLists.php index 2d1ae6b72..f62dd466f 100644 --- a/app/adminapi/lists/supervision_prepare/SupervisionConstructionPlanningLists.php +++ b/app/adminapi/lists/supervision_prepare/SupervisionConstructionPlanningLists.php @@ -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(); } diff --git a/app/adminapi/lists/supervision_prepare/SupervisionContractDisclosureLists.php b/app/adminapi/lists/supervision_prepare/SupervisionContractDisclosureLists.php index d5582b3e5..440f3dfdb 100644 --- a/app/adminapi/lists/supervision_prepare/SupervisionContractDisclosureLists.php +++ b/app/adminapi/lists/supervision_prepare/SupervisionContractDisclosureLists.php @@ -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(); } diff --git a/app/adminapi/lists/supervision_prepare/SupervisionPlanningLists.php b/app/adminapi/lists/supervision_prepare/SupervisionPlanningLists.php index 468feea9d..87f936af2 100644 --- a/app/adminapi/lists/supervision_prepare/SupervisionPlanningLists.php +++ b/app/adminapi/lists/supervision_prepare/SupervisionPlanningLists.php @@ -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(); diff --git a/app/adminapi/lists/supervision_qualification_review/SupervisionConstructionManagementPersonnelLists.php b/app/adminapi/lists/supervision_qualification_review/SupervisionConstructionManagementPersonnelLists.php index 1e23a27d3..ea3dda670 100644 --- a/app/adminapi/lists/supervision_qualification_review/SupervisionConstructionManagementPersonnelLists.php +++ b/app/adminapi/lists/supervision_qualification_review/SupervisionConstructionManagementPersonnelLists.php @@ -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; }) diff --git a/app/adminapi/lists/supervision_qualification_review/SupervisionLargeEquipmentLists.php b/app/adminapi/lists/supervision_qualification_review/SupervisionLargeEquipmentLists.php index 417d610ca..93fc1e7f3 100644 --- a/app/adminapi/lists/supervision_qualification_review/SupervisionLargeEquipmentLists.php +++ b/app/adminapi/lists/supervision_qualification_review/SupervisionLargeEquipmentLists.php @@ -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; }) diff --git a/app/adminapi/lists/supervision_work/SupervisionAcceptLists.php b/app/adminapi/lists/supervision_work/SupervisionAcceptLists.php index 73d3d2fa3..83eec6341 100644 --- a/app/adminapi/lists/supervision_work/SupervisionAcceptLists.php +++ b/app/adminapi/lists/supervision_work/SupervisionAcceptLists.php @@ -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(); diff --git a/app/adminapi/lists/supervision_work/SupervisionDeviceEntryLists.php b/app/adminapi/lists/supervision_work/SupervisionDeviceEntryLists.php index faf9577b7..922dd51c7 100644 --- a/app/adminapi/lists/supervision_work/SupervisionDeviceEntryLists.php +++ b/app/adminapi/lists/supervision_work/SupervisionDeviceEntryLists.php @@ -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(); diff --git a/app/adminapi/lists/supervision_work/SupervisionEntityParallelTestingLists.php b/app/adminapi/lists/supervision_work/SupervisionEntityParallelTestingLists.php index 35786fbd3..7f23bbb3a 100644 --- a/app/adminapi/lists/supervision_work/SupervisionEntityParallelTestingLists.php +++ b/app/adminapi/lists/supervision_work/SupervisionEntityParallelTestingLists.php @@ -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(); diff --git a/app/adminapi/lists/supervision_work/SupervisionInspectionLists.php b/app/adminapi/lists/supervision_work/SupervisionInspectionLists.php index 5310bf395..33cb9199f 100644 --- a/app/adminapi/lists/supervision_work/SupervisionInspectionLists.php +++ b/app/adminapi/lists/supervision_work/SupervisionInspectionLists.php @@ -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(); diff --git a/app/adminapi/lists/supervision_work/SupervisionProblemLists.php b/app/adminapi/lists/supervision_work/SupervisionProblemLists.php index 4fccec1cf..da5c62617 100644 --- a/app/adminapi/lists/supervision_work/SupervisionProblemLists.php +++ b/app/adminapi/lists/supervision_work/SupervisionProblemLists.php @@ -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; diff --git a/app/adminapi/lists/supervision_work/SupervisionSideStationLists.php b/app/adminapi/lists/supervision_work/SupervisionSideStationLists.php index 41a2eb8f3..20152d871 100644 --- a/app/adminapi/lists/supervision_work/SupervisionSideStationLists.php +++ b/app/adminapi/lists/supervision_work/SupervisionSideStationLists.php @@ -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(); diff --git a/app/adminapi/lists/supervision_work/SupervisionTestBlocksSpecimensLists.php b/app/adminapi/lists/supervision_work/SupervisionTestBlocksSpecimensLists.php index 55473ae65..2db129668 100644 --- a/app/adminapi/lists/supervision_work/SupervisionTestBlocksSpecimensLists.php +++ b/app/adminapi/lists/supervision_work/SupervisionTestBlocksSpecimensLists.php @@ -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(); diff --git a/app/adminapi/logic/supervision_connect/SupervisionProjectCaseReviewLogic.php b/app/adminapi/logic/supervision_connect/SupervisionProjectCaseReviewLogic.php index 624ec0538..caa36e4b1 100644 --- a/app/adminapi/logic/supervision_connect/SupervisionProjectCaseReviewLogic.php +++ b/app/adminapi/logic/supervision_connect/SupervisionProjectCaseReviewLogic.php @@ -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(); } diff --git a/app/adminapi/logic/supervision_connect/SupervisionProjectInfoReportLogic.php b/app/adminapi/logic/supervision_connect/SupervisionProjectInfoReportLogic.php index 535ca788d..a0c648d16 100644 --- a/app/adminapi/logic/supervision_connect/SupervisionProjectInfoReportLogic.php +++ b/app/adminapi/logic/supervision_connect/SupervisionProjectInfoReportLogic.php @@ -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(); } diff --git a/app/adminapi/logic/supervision_connect/SupervisionProjectMilestonesLogic.php b/app/adminapi/logic/supervision_connect/SupervisionProjectMilestonesLogic.php index b4d5c0f3a..8ebfb9fce 100644 --- a/app/adminapi/logic/supervision_connect/SupervisionProjectMilestonesLogic.php +++ b/app/adminapi/logic/supervision_connect/SupervisionProjectMilestonesLogic.php @@ -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(); } } \ No newline at end of file diff --git a/app/adminapi/logic/supervision_connect/SupervisionProjectMonthlyReportLogic.php b/app/adminapi/logic/supervision_connect/SupervisionProjectMonthlyReportLogic.php index 356f96824..2ecf421c7 100644 --- a/app/adminapi/logic/supervision_connect/SupervisionProjectMonthlyReportLogic.php +++ b/app/adminapi/logic/supervision_connect/SupervisionProjectMonthlyReportLogic.php @@ -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(); } diff --git a/app/adminapi/logic/supervision_const_prepare/SupervisionCommencementReportLogic.php b/app/adminapi/logic/supervision_const_prepare/SupervisionCommencementReportLogic.php index f20e0ccde..43f5251d6 100644 --- a/app/adminapi/logic/supervision_const_prepare/SupervisionCommencementReportLogic.php +++ b/app/adminapi/logic/supervision_const_prepare/SupervisionCommencementReportLogic.php @@ -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(); } } \ No newline at end of file diff --git a/app/adminapi/logic/supervision_const_prepare/SupervisionDesignDisclosureLogic.php b/app/adminapi/logic/supervision_const_prepare/SupervisionDesignDisclosureLogic.php index b3674e7c1..a2e28039a 100644 --- a/app/adminapi/logic/supervision_const_prepare/SupervisionDesignDisclosureLogic.php +++ b/app/adminapi/logic/supervision_const_prepare/SupervisionDesignDisclosureLogic.php @@ -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(); } } \ No newline at end of file diff --git a/app/adminapi/logic/supervision_const_prepare/SupervisionFirstMeetingLogic.php b/app/adminapi/logic/supervision_const_prepare/SupervisionFirstMeetingLogic.php index fa3d7a25d..c2b9f9519 100644 --- a/app/adminapi/logic/supervision_const_prepare/SupervisionFirstMeetingLogic.php +++ b/app/adminapi/logic/supervision_const_prepare/SupervisionFirstMeetingLogic.php @@ -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(); } } \ No newline at end of file diff --git a/app/adminapi/logic/supervision_const_prepare/SupervisionRulesDisclosureLogic.php b/app/adminapi/logic/supervision_const_prepare/SupervisionRulesDisclosureLogic.php index 8b94392fc..1d2f2971c 100644 --- a/app/adminapi/logic/supervision_const_prepare/SupervisionRulesDisclosureLogic.php +++ b/app/adminapi/logic/supervision_const_prepare/SupervisionRulesDisclosureLogic.php @@ -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(); } } \ No newline at end of file diff --git a/app/adminapi/logic/supervision_const_prepare/SupervisionRulesLogic.php b/app/adminapi/logic/supervision_const_prepare/SupervisionRulesLogic.php index 569c02acb..2118d5f5b 100644 --- a/app/adminapi/logic/supervision_const_prepare/SupervisionRulesLogic.php +++ b/app/adminapi/logic/supervision_const_prepare/SupervisionRulesLogic.php @@ -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(); } } \ No newline at end of file diff --git a/app/adminapi/logic/supervision_dangerous/SupervisionDangerousEngineeringCaseLogic.php b/app/adminapi/logic/supervision_dangerous/SupervisionDangerousEngineeringCaseLogic.php index 4221b8111..0a93e2ed9 100644 --- a/app/adminapi/logic/supervision_dangerous/SupervisionDangerousEngineeringCaseLogic.php +++ b/app/adminapi/logic/supervision_dangerous/SupervisionDangerousEngineeringCaseLogic.php @@ -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(); } } \ No newline at end of file diff --git a/app/adminapi/logic/supervision_dangerous/SupervisionDangerousEngineeringMonitoringLogic.php b/app/adminapi/logic/supervision_dangerous/SupervisionDangerousEngineeringMonitoringLogic.php index ee00cb6ee..0530fa3a6 100644 --- a/app/adminapi/logic/supervision_dangerous/SupervisionDangerousEngineeringMonitoringLogic.php +++ b/app/adminapi/logic/supervision_dangerous/SupervisionDangerousEngineeringMonitoringLogic.php @@ -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; diff --git a/app/adminapi/logic/supervision_dangerous/SupervisionExcessRiskSecurityMonitoringLogic.php b/app/adminapi/logic/supervision_dangerous/SupervisionExcessRiskSecurityMonitoringLogic.php index 7c80684de..dba91bd8a 100644 --- a/app/adminapi/logic/supervision_dangerous/SupervisionExcessRiskSecurityMonitoringLogic.php +++ b/app/adminapi/logic/supervision_dangerous/SupervisionExcessRiskSecurityMonitoringLogic.php @@ -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; diff --git a/app/adminapi/logic/supervision_dangerous/SupervisionHighRiskSecurityMonitoringLogic.php b/app/adminapi/logic/supervision_dangerous/SupervisionHighRiskSecurityMonitoringLogic.php index f3409bb02..c96e1b5a8 100644 --- a/app/adminapi/logic/supervision_dangerous/SupervisionHighRiskSecurityMonitoringLogic.php +++ b/app/adminapi/logic/supervision_dangerous/SupervisionHighRiskSecurityMonitoringLogic.php @@ -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; diff --git a/app/adminapi/logic/supervision_dangerous/SupervisionLargeMechanicalEquipmentLogic.php b/app/adminapi/logic/supervision_dangerous/SupervisionLargeMechanicalEquipmentLogic.php index 2f690d254..b11bf5c97 100644 --- a/app/adminapi/logic/supervision_dangerous/SupervisionLargeMechanicalEquipmentLogic.php +++ b/app/adminapi/logic/supervision_dangerous/SupervisionLargeMechanicalEquipmentLogic.php @@ -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; diff --git a/app/adminapi/logic/supervision_ending/SupervisionProjectAcceptanceReportLogic.php b/app/adminapi/logic/supervision_ending/SupervisionProjectAcceptanceReportLogic.php index f5b10f54d..d852da5fa 100644 --- a/app/adminapi/logic/supervision_ending/SupervisionProjectAcceptanceReportLogic.php +++ b/app/adminapi/logic/supervision_ending/SupervisionProjectAcceptanceReportLogic.php @@ -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(); } } \ No newline at end of file diff --git a/app/adminapi/logic/supervision_ending/SupervisionProjectDataArchivingLogic.php b/app/adminapi/logic/supervision_ending/SupervisionProjectDataArchivingLogic.php index 067ef96a9..f5f3ab5b1 100644 --- a/app/adminapi/logic/supervision_ending/SupervisionProjectDataArchivingLogic.php +++ b/app/adminapi/logic/supervision_ending/SupervisionProjectDataArchivingLogic.php @@ -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; diff --git a/app/adminapi/logic/supervision_ending/SupervisionProjectOwnerEvaluationLogic.php b/app/adminapi/logic/supervision_ending/SupervisionProjectOwnerEvaluationLogic.php index 6101371c1..1bf0b0826 100644 --- a/app/adminapi/logic/supervision_ending/SupervisionProjectOwnerEvaluationLogic.php +++ b/app/adminapi/logic/supervision_ending/SupervisionProjectOwnerEvaluationLogic.php @@ -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(); } } \ No newline at end of file diff --git a/app/adminapi/logic/supervision_prepare/SupervisionConstructionPlanningLogic.php b/app/adminapi/logic/supervision_prepare/SupervisionConstructionPlanningLogic.php index 9c5ce28a2..8f76e787b 100644 --- a/app/adminapi/logic/supervision_prepare/SupervisionConstructionPlanningLogic.php +++ b/app/adminapi/logic/supervision_prepare/SupervisionConstructionPlanningLogic.php @@ -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(); } } \ No newline at end of file diff --git a/app/adminapi/logic/supervision_prepare/SupervisionContractDisclosureLogic.php b/app/adminapi/logic/supervision_prepare/SupervisionContractDisclosureLogic.php index 6ca1e2ce9..d149b7ee5 100644 --- a/app/adminapi/logic/supervision_prepare/SupervisionContractDisclosureLogic.php +++ b/app/adminapi/logic/supervision_prepare/SupervisionContractDisclosureLogic.php @@ -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(); } } \ No newline at end of file diff --git a/app/adminapi/logic/supervision_prepare/SupervisionPlanningLogic.php b/app/adminapi/logic/supervision_prepare/SupervisionPlanningLogic.php index f5600cd8e..e3efce884 100644 --- a/app/adminapi/logic/supervision_prepare/SupervisionPlanningLogic.php +++ b/app/adminapi/logic/supervision_prepare/SupervisionPlanningLogic.php @@ -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(); } diff --git a/app/adminapi/logic/supervision_project/SupervisionProjectLogic.php b/app/adminapi/logic/supervision_project/SupervisionProjectLogic.php index c36f7848f..47f1ce384 100644 --- a/app/adminapi/logic/supervision_project/SupervisionProjectLogic.php +++ b/app/adminapi/logic/supervision_project/SupervisionProjectLogic.php @@ -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; diff --git a/app/adminapi/logic/supervision_qualification_review/SupervisionConstructionManagementPersonnelLogic.php b/app/adminapi/logic/supervision_qualification_review/SupervisionConstructionManagementPersonnelLogic.php index bfeee25d4..2045ede9f 100644 --- a/app/adminapi/logic/supervision_qualification_review/SupervisionConstructionManagementPersonnelLogic.php +++ b/app/adminapi/logic/supervision_qualification_review/SupervisionConstructionManagementPersonnelLogic.php @@ -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(); diff --git a/app/adminapi/logic/supervision_qualification_review/SupervisionLargeEquipmentLogic.php b/app/adminapi/logic/supervision_qualification_review/SupervisionLargeEquipmentLogic.php index ee7821fcb..4f113ce1c 100644 --- a/app/adminapi/logic/supervision_qualification_review/SupervisionLargeEquipmentLogic.php +++ b/app/adminapi/logic/supervision_qualification_review/SupervisionLargeEquipmentLogic.php @@ -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(); diff --git a/app/adminapi/logic/supervision_work/SupervisionAcceptLogic.php b/app/adminapi/logic/supervision_work/SupervisionAcceptLogic.php index a93eb654a..1f32f3bac 100644 --- a/app/adminapi/logic/supervision_work/SupervisionAcceptLogic.php +++ b/app/adminapi/logic/supervision_work/SupervisionAcceptLogic.php @@ -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(); diff --git a/app/adminapi/logic/supervision_work/SupervisionDeviceEntryLogic.php b/app/adminapi/logic/supervision_work/SupervisionDeviceEntryLogic.php index 5ebef6632..621968d7f 100644 --- a/app/adminapi/logic/supervision_work/SupervisionDeviceEntryLogic.php +++ b/app/adminapi/logic/supervision_work/SupervisionDeviceEntryLogic.php @@ -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(); } diff --git a/app/adminapi/logic/supervision_work/SupervisionEntityParallelTestingLogic.php b/app/adminapi/logic/supervision_work/SupervisionEntityParallelTestingLogic.php index ff5349caa..d97b47e55 100644 --- a/app/adminapi/logic/supervision_work/SupervisionEntityParallelTestingLogic.php +++ b/app/adminapi/logic/supervision_work/SupervisionEntityParallelTestingLogic.php @@ -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(); diff --git a/app/adminapi/logic/supervision_work/SupervisionInspectionLogic.php b/app/adminapi/logic/supervision_work/SupervisionInspectionLogic.php index 275aa087c..a523bf4f0 100644 --- a/app/adminapi/logic/supervision_work/SupervisionInspectionLogic.php +++ b/app/adminapi/logic/supervision_work/SupervisionInspectionLogic.php @@ -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(); diff --git a/app/adminapi/logic/supervision_work/SupervisionMaterialEntryLogic.php b/app/adminapi/logic/supervision_work/SupervisionMaterialEntryLogic.php index 80ce6c1cd..188fa45c2 100644 --- a/app/adminapi/logic/supervision_work/SupervisionMaterialEntryLogic.php +++ b/app/adminapi/logic/supervision_work/SupervisionMaterialEntryLogic.php @@ -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(); diff --git a/app/adminapi/logic/supervision_work/SupervisionMaterialParallelTestingLogic.php b/app/adminapi/logic/supervision_work/SupervisionMaterialParallelTestingLogic.php index 6cbeb723f..f4c007cb8 100644 --- a/app/adminapi/logic/supervision_work/SupervisionMaterialParallelTestingLogic.php +++ b/app/adminapi/logic/supervision_work/SupervisionMaterialParallelTestingLogic.php @@ -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(); } } \ No newline at end of file diff --git a/app/adminapi/logic/supervision_work/SupervisionMeetingMinutesLogic.php b/app/adminapi/logic/supervision_work/SupervisionMeetingMinutesLogic.php index d47ffbfe0..5834f7ba1 100644 --- a/app/adminapi/logic/supervision_work/SupervisionMeetingMinutesLogic.php +++ b/app/adminapi/logic/supervision_work/SupervisionMeetingMinutesLogic.php @@ -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(); diff --git a/app/adminapi/logic/supervision_work/SupervisionNoticeLogic.php b/app/adminapi/logic/supervision_work/SupervisionNoticeLogic.php index a0aeeff8d..8e46261f4 100644 --- a/app/adminapi/logic/supervision_work/SupervisionNoticeLogic.php +++ b/app/adminapi/logic/supervision_work/SupervisionNoticeLogic.php @@ -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(); } } \ No newline at end of file diff --git a/app/adminapi/logic/supervision_work/SupervisionProblemLogic.php b/app/adminapi/logic/supervision_work/SupervisionProblemLogic.php index d6fa286da..063e5108a 100644 --- a/app/adminapi/logic/supervision_work/SupervisionProblemLogic.php +++ b/app/adminapi/logic/supervision_work/SupervisionProblemLogic.php @@ -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; diff --git a/app/adminapi/logic/supervision_work/SupervisionSideStationLogic.php b/app/adminapi/logic/supervision_work/SupervisionSideStationLogic.php index 32c860aeb..fe1173a3b 100644 --- a/app/adminapi/logic/supervision_work/SupervisionSideStationLogic.php +++ b/app/adminapi/logic/supervision_work/SupervisionSideStationLogic.php @@ -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(); diff --git a/app/adminapi/logic/supervision_work/SupervisionTestBlocksSpecimensLogic.php b/app/adminapi/logic/supervision_work/SupervisionTestBlocksSpecimensLogic.php index 98e93a5b7..67c067065 100644 --- a/app/adminapi/logic/supervision_work/SupervisionTestBlocksSpecimensLogic.php +++ b/app/adminapi/logic/supervision_work/SupervisionTestBlocksSpecimensLogic.php @@ -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(); } diff --git a/app/adminapi/logic/supervision_work/SupervisionWitnessSamplingLogic.php b/app/adminapi/logic/supervision_work/SupervisionWitnessSamplingLogic.php index a104a1fbd..d3b8146fb 100644 --- a/app/adminapi/logic/supervision_work/SupervisionWitnessSamplingLogic.php +++ b/app/adminapi/logic/supervision_work/SupervisionWitnessSamplingLogic.php @@ -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(); } } \ No newline at end of file diff --git a/app/adminapi/logic/supervision_work/SupervisionWorkContactLogic.php b/app/adminapi/logic/supervision_work/SupervisionWorkContactLogic.php index ebdf3633b..7e9fcf40d 100644 --- a/app/adminapi/logic/supervision_work/SupervisionWorkContactLogic.php +++ b/app/adminapi/logic/supervision_work/SupervisionWorkContactLogic.php @@ -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; diff --git a/app/adminapi/validate/supervision_connect/SupervisionCompanyCheckValidate.php b/app/adminapi/validate/supervision_connect/SupervisionCompanyCheckValidate.php index c784ca8eb..f74d2a5c3 100644 --- a/app/adminapi/validate/supervision_connect/SupervisionCompanyCheckValidate.php +++ b/app/adminapi/validate/supervision_connect/SupervisionCompanyCheckValidate.php @@ -144,13 +144,5 @@ class SupervisionCompanyCheckValidate extends BaseValidate } return true; } - - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != '' && !is_array($value)){ - return '附件格式错误'; - } - return true; - } } \ No newline at end of file diff --git a/app/adminapi/validate/supervision_connect/SupervisionProjectCaseReviewValidate.php b/app/adminapi/validate/supervision_connect/SupervisionProjectCaseReviewValidate.php index e5ca5d600..24c18581c 100644 --- a/app/adminapi/validate/supervision_connect/SupervisionProjectCaseReviewValidate.php +++ b/app/adminapi/validate/supervision_connect/SupervisionProjectCaseReviewValidate.php @@ -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' => '创建时间', ]; @@ -128,13 +131,5 @@ class SupervisionProjectCaseReviewValidate extends BaseValidate } return true; } - - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != '' && !is_array($value)){ - return '附件格式错误'; - } - return true; - } } \ No newline at end of file diff --git a/app/adminapi/validate/supervision_connect/SupervisionProjectInfoReportValidate.php b/app/adminapi/validate/supervision_connect/SupervisionProjectInfoReportValidate.php index dcfba3404..d555a7959 100644 --- a/app/adminapi/validate/supervision_connect/SupervisionProjectInfoReportValidate.php +++ b/app/adminapi/validate/supervision_connect/SupervisionProjectInfoReportValidate.php @@ -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; - } - - } \ No newline at end of file diff --git a/app/adminapi/validate/supervision_connect/SupervisionProjectMilestonesValidate.php b/app/adminapi/validate/supervision_connect/SupervisionProjectMilestonesValidate.php index 947aa9548..8f9346760 100644 --- a/app/adminapi/validate/supervision_connect/SupervisionProjectMilestonesValidate.php +++ b/app/adminapi/validate/supervision_connect/SupervisionProjectMilestonesValidate.php @@ -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' => '发布时间', ]; @@ -118,13 +121,5 @@ class SupervisionProjectMilestonesValidate extends BaseValidate } return true; } - - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != '' && !is_array($value)){ - return '附件格式错误'; - } - return true; - } } \ No newline at end of file diff --git a/app/adminapi/validate/supervision_connect/SupervisionProjectMonthlyReportValidate.php b/app/adminapi/validate/supervision_connect/SupervisionProjectMonthlyReportValidate.php index 4f550974d..bfe20afd0 100644 --- a/app/adminapi/validate/supervision_connect/SupervisionProjectMonthlyReportValidate.php +++ b/app/adminapi/validate/supervision_connect/SupervisionProjectMonthlyReportValidate.php @@ -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' => '创建时间', ]; @@ -149,13 +152,5 @@ class SupervisionProjectMonthlyReportValidate extends BaseValidate } return true; } - - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != '' && !is_array($value)){ - return '附件格式错误'; - } - return true; - } } \ No newline at end of file diff --git a/app/adminapi/validate/supervision_const_prepare/SupervisionCommencementReportValidate.php b/app/adminapi/validate/supervision_const_prepare/SupervisionCommencementReportValidate.php index 61b12438d..de8f875b0 100644 --- a/app/adminapi/validate/supervision_const_prepare/SupervisionCommencementReportValidate.php +++ b/app/adminapi/validate/supervision_const_prepare/SupervisionCommencementReportValidate.php @@ -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' => '操作时间', ]; @@ -115,13 +118,5 @@ class SupervisionCommencementReportValidate extends BaseValidate } return true; } - - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != '' && !is_array($value)){ - return '附件格式错误'; - } - return true; - } } \ No newline at end of file diff --git a/app/adminapi/validate/supervision_const_prepare/SupervisionDesignDisclosureValidate.php b/app/adminapi/validate/supervision_const_prepare/SupervisionDesignDisclosureValidate.php index 9fc678e02..81e0d0ff2 100644 --- a/app/adminapi/validate/supervision_const_prepare/SupervisionDesignDisclosureValidate.php +++ b/app/adminapi/validate/supervision_const_prepare/SupervisionDesignDisclosureValidate.php @@ -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' => '操作时间', ]; @@ -115,13 +118,5 @@ class SupervisionDesignDisclosureValidate extends BaseValidate } return true; } - - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != '' && !is_array($value)){ - return '附件格式错误'; - } - return true; - } } \ No newline at end of file diff --git a/app/adminapi/validate/supervision_const_prepare/SupervisionFirstMeetingValidate.php b/app/adminapi/validate/supervision_const_prepare/SupervisionFirstMeetingValidate.php index e05c31da4..f60172f81 100644 --- a/app/adminapi/validate/supervision_const_prepare/SupervisionFirstMeetingValidate.php +++ b/app/adminapi/validate/supervision_const_prepare/SupervisionFirstMeetingValidate.php @@ -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' => '操作时间', ]; @@ -116,13 +119,5 @@ class SupervisionFirstMeetingValidate extends BaseValidate } return true; } - - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != '' && !is_array($value)){ - return '附件格式错误'; - } - return true; - } } \ No newline at end of file diff --git a/app/adminapi/validate/supervision_const_prepare/SupervisionRulesDisclosureValidate.php b/app/adminapi/validate/supervision_const_prepare/SupervisionRulesDisclosureValidate.php index 166f90159..ca8235198 100644 --- a/app/adminapi/validate/supervision_const_prepare/SupervisionRulesDisclosureValidate.php +++ b/app/adminapi/validate/supervision_const_prepare/SupervisionRulesDisclosureValidate.php @@ -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' => '操作时间', ]; @@ -115,13 +118,5 @@ class SupervisionRulesDisclosureValidate extends BaseValidate } return true; } - - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != '' && !is_array($value)){ - return '附件格式错误'; - } - return true; - } } \ No newline at end of file diff --git a/app/adminapi/validate/supervision_const_prepare/SupervisionRulesValidate.php b/app/adminapi/validate/supervision_const_prepare/SupervisionRulesValidate.php index bdcf00b72..5eb965492 100644 --- a/app/adminapi/validate/supervision_const_prepare/SupervisionRulesValidate.php +++ b/app/adminapi/validate/supervision_const_prepare/SupervisionRulesValidate.php @@ -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' => '操作时间', ]; @@ -115,13 +118,5 @@ class SupervisionRulesValidate extends BaseValidate } return true; } - - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != '' && !is_array($value)){ - return '附件格式错误'; - } - return true; - } } \ No newline at end of file diff --git a/app/adminapi/validate/supervision_dangerous/SupervisionDangerousEngineeringCaseValidate.php b/app/adminapi/validate/supervision_dangerous/SupervisionDangerousEngineeringCaseValidate.php index 97d6982f2..0a6a045e0 100644 --- a/app/adminapi/validate/supervision_dangerous/SupervisionDangerousEngineeringCaseValidate.php +++ b/app/adminapi/validate/supervision_dangerous/SupervisionDangerousEngineeringCaseValidate.php @@ -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' => '提交时间', ]; @@ -119,13 +122,5 @@ class SupervisionDangerousEngineeringCaseValidate extends BaseValidate } return true; } - - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != '' && !is_array($value)){ - return '附件格式错误'; - } - return true; - } } \ No newline at end of file diff --git a/app/adminapi/validate/supervision_dangerous/SupervisionExcessRiskSecurityMonitoringValidate.php b/app/adminapi/validate/supervision_dangerous/SupervisionExcessRiskSecurityMonitoringValidate.php index 2184d98e0..c93154c39 100644 --- a/app/adminapi/validate/supervision_dangerous/SupervisionExcessRiskSecurityMonitoringValidate.php +++ b/app/adminapi/validate/supervision_dangerous/SupervisionExcessRiskSecurityMonitoringValidate.php @@ -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' => '创建时间', ]; diff --git a/app/adminapi/validate/supervision_dangerous/SupervisionHighRiskSecurityMonitoringValidate.php b/app/adminapi/validate/supervision_dangerous/SupervisionHighRiskSecurityMonitoringValidate.php index 5e9c36102..7ae3388b7 100644 --- a/app/adminapi/validate/supervision_dangerous/SupervisionHighRiskSecurityMonitoringValidate.php +++ b/app/adminapi/validate/supervision_dangerous/SupervisionHighRiskSecurityMonitoringValidate.php @@ -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' => '创建时间', ]; diff --git a/app/adminapi/validate/supervision_dangerous/SupervisionLargeMechanicalEquipmentValidate.php b/app/adminapi/validate/supervision_dangerous/SupervisionLargeMechanicalEquipmentValidate.php index 355295698..fd4d53857 100644 --- a/app/adminapi/validate/supervision_dangerous/SupervisionLargeMechanicalEquipmentValidate.php +++ b/app/adminapi/validate/supervision_dangerous/SupervisionLargeMechanicalEquipmentValidate.php @@ -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; diff --git a/app/adminapi/validate/supervision_dangerous/SupervisionSafetyWarningSignValidate.php b/app/adminapi/validate/supervision_dangerous/SupervisionSafetyWarningSignValidate.php index 68ed0444d..49da22309 100644 --- a/app/adminapi/validate/supervision_dangerous/SupervisionSafetyWarningSignValidate.php +++ b/app/adminapi/validate/supervision_dangerous/SupervisionSafetyWarningSignValidate.php @@ -119,13 +119,5 @@ class SupervisionSafetyWarningSignValidate extends BaseValidate } return true; } - - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != '' && !is_array($value)){ - return '附件格式错误'; - } - return true; - } } \ No newline at end of file diff --git a/app/adminapi/validate/supervision_ending/SupervisionProjectAcceptanceReportValidate.php b/app/adminapi/validate/supervision_ending/SupervisionProjectAcceptanceReportValidate.php index 3593a9cdf..15dadd477 100644 --- a/app/adminapi/validate/supervision_ending/SupervisionProjectAcceptanceReportValidate.php +++ b/app/adminapi/validate/supervision_ending/SupervisionProjectAcceptanceReportValidate.php @@ -37,7 +37,9 @@ class SupervisionProjectAcceptanceReportValidate extends BaseValidate 'project_id' => 'require|checkProject', 'title' => 'require', 'content' => 'require', - 'annex' => 'checkAnnex' + 'annex' => 'checkAnnex', + 'create_user' => 'require', + 'create_time' => 'require|dateFormat:Y-m-d H:i:s', ]; @@ -50,6 +52,8 @@ class SupervisionProjectAcceptanceReportValidate extends BaseValidate 'project_id' => '项目id', 'title' => '文档名称', 'content' => '文档简介', + 'create_user' => '操作人', + 'create_time' => '操作时间', ]; @@ -61,7 +65,7 @@ class SupervisionProjectAcceptanceReportValidate extends BaseValidate */ public function sceneAdd() { - return $this->only(['project_id','title','content','annex']); + return $this->only(['project_id','title','content','annex','create_user','create_time']); } @@ -73,7 +77,7 @@ class SupervisionProjectAcceptanceReportValidate extends BaseValidate */ public function sceneEdit() { - return $this->only(['id','project_id','title','content','annex']); + return $this->only(['id','project_id','title','content','annex','create_user','create_time']); } @@ -117,13 +121,5 @@ class SupervisionProjectAcceptanceReportValidate extends BaseValidate } return true; } - - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != '' && !is_array($value)){ - return '附件格式错误'; - } - return true; - } } \ No newline at end of file diff --git a/app/adminapi/validate/supervision_ending/SupervisionProjectOwnerEvaluationValidate.php b/app/adminapi/validate/supervision_ending/SupervisionProjectOwnerEvaluationValidate.php index b01778ca6..f1ed9e7d3 100644 --- a/app/adminapi/validate/supervision_ending/SupervisionProjectOwnerEvaluationValidate.php +++ b/app/adminapi/validate/supervision_ending/SupervisionProjectOwnerEvaluationValidate.php @@ -37,7 +37,9 @@ class SupervisionProjectOwnerEvaluationValidate extends BaseValidate 'project_id' => 'require|checkProject', 'title' => 'require', 'content' => 'require', - 'annex' => 'checkAnnex' + 'annex' => 'checkAnnex', + 'create_user' => 'require', + 'create_time' => 'require|dateFormat:Y-m-d H:i:s', ]; @@ -50,6 +52,8 @@ class SupervisionProjectOwnerEvaluationValidate extends BaseValidate 'project_id' => '项目id', 'title' => '文档名称', 'content' => '文档简介', + 'create_user' => '操作人', + 'create_time' => '操作日期', ]; @@ -61,7 +65,7 @@ class SupervisionProjectOwnerEvaluationValidate extends BaseValidate */ public function sceneAdd() { - return $this->only(['project_id','title','content','annex']); + return $this->only(['project_id','title','content','annex','create_user','create_time']); } @@ -73,7 +77,7 @@ class SupervisionProjectOwnerEvaluationValidate extends BaseValidate */ public function sceneEdit() { - return $this->only(['id','project_id','title','content','annex']); + return $this->only(['id','project_id','title','content','annex','create_user','create_time']); } @@ -117,13 +121,5 @@ class SupervisionProjectOwnerEvaluationValidate extends BaseValidate } return true; } - - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != '' && !is_array($value)){ - return '附件格式错误'; - } - return true; - } } \ No newline at end of file diff --git a/app/adminapi/validate/supervision_prepare/SupervisionConstructionPlanningValidate.php b/app/adminapi/validate/supervision_prepare/SupervisionConstructionPlanningValidate.php index f1c23e514..0aedc0ccb 100644 --- a/app/adminapi/validate/supervision_prepare/SupervisionConstructionPlanningValidate.php +++ b/app/adminapi/validate/supervision_prepare/SupervisionConstructionPlanningValidate.php @@ -37,6 +37,8 @@ class SupervisionConstructionPlanningValidate extends BaseValidate 'project_id' => 'require|checkProject', 'doc_name' => 'require', 'annex' => 'checkAnnex', + 'create_user' => 'require', + 'create_time' => 'require|dateFormat:Y-m-d H:i:s', ]; @@ -49,6 +51,8 @@ class SupervisionConstructionPlanningValidate extends BaseValidate 'project_id' => '项目id', 'doc_name' => '文档名称', 'doc_desc' => '文档简介', + 'create_user' => '操作人', + 'create_time' => '操作时间', ]; @@ -114,13 +118,5 @@ class SupervisionConstructionPlanningValidate extends BaseValidate } return true; } - - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != '' && !is_array($value)){ - return '附件格式错误'; - } - return true; - } } \ No newline at end of file diff --git a/app/adminapi/validate/supervision_prepare/SupervisionContractDisclosureValidate.php b/app/adminapi/validate/supervision_prepare/SupervisionContractDisclosureValidate.php index 7bd3e71f7..2f610a1ce 100644 --- a/app/adminapi/validate/supervision_prepare/SupervisionContractDisclosureValidate.php +++ b/app/adminapi/validate/supervision_prepare/SupervisionContractDisclosureValidate.php @@ -37,6 +37,8 @@ class SupervisionContractDisclosureValidate extends BaseValidate 'project_id' => 'require|checkProject', 'doc_name' => 'require', 'annex' => 'checkAnnex', + 'create_user' => 'require', + 'create_time' => 'require|dateFormat:Y-m-d H:i:s', ]; @@ -49,6 +51,8 @@ class SupervisionContractDisclosureValidate extends BaseValidate 'project_id' => '项目id', 'doc_name' => '文档名称', 'doc_desc' => '文档简介', + 'create_user' => '操作人', + 'create_time' => '操作时间', ]; @@ -114,13 +118,5 @@ class SupervisionContractDisclosureValidate extends BaseValidate } return true; } - - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != '' && !is_array($value)){ - return '附件格式错误'; - } - return true; - } } \ No newline at end of file diff --git a/app/adminapi/validate/supervision_prepare/SupervisionPlanningValidate.php b/app/adminapi/validate/supervision_prepare/SupervisionPlanningValidate.php index ad318db5d..32bec6836 100644 --- a/app/adminapi/validate/supervision_prepare/SupervisionPlanningValidate.php +++ b/app/adminapi/validate/supervision_prepare/SupervisionPlanningValidate.php @@ -40,6 +40,8 @@ class SupervisionPlanningValidate extends BaseValidate 'scheme_name' => 'require', 'approval_content' => 'require', 'annex' => 'checkAnnex', + 'create_user' => 'require', + 'create_time' => 'require|dateFormat:Y-m-d H:i:s', ]; @@ -55,6 +57,8 @@ class SupervisionPlanningValidate extends BaseValidate 'scheme_name' => '方案名称', 'approval_content' => '评审内容', 'remark' => '备注', + 'create_user' => '录入人', + 'create_time' => '录入时间', ]; @@ -128,13 +132,5 @@ class SupervisionPlanningValidate extends BaseValidate } return true; } - - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != '' && !is_array($value)){ - return '附件格式错误'; - } - return true; - } } \ No newline at end of file diff --git a/app/adminapi/validate/supervision_project/SupervisionProjectValidate.php b/app/adminapi/validate/supervision_project/SupervisionProjectValidate.php index d486c0163..5c53544df 100644 --- a/app/adminapi/validate/supervision_project/SupervisionProjectValidate.php +++ b/app/adminapi/validate/supervision_project/SupervisionProjectValidate.php @@ -49,6 +49,8 @@ class SupervisionProjectValidate extends BaseValidate 'supervision_department' => 'require', 'engineering_status' => 'checkEngineeringStatus', 'annex' => 'checkAnnex', + 'create_user' => 'require', + 'create_time' => 'require|dateFormat:Y-m-d H:i:s', ]; @@ -85,7 +87,7 @@ class SupervisionProjectValidate extends BaseValidate 'project_manager' => '项目负责人员', 'part_a_unit' => '甲方单位', 'create_user' => '创建人', - + 'create_time' => '创建时间', ]; @@ -187,13 +189,5 @@ class SupervisionProjectValidate extends BaseValidate } return true; } - - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != '' && !is_array($value)){ - return '附件格式错误'; - } - return true; - } } \ No newline at end of file diff --git a/app/adminapi/validate/supervision_qualification_review/SupervisionConstructionManagementPersonnelValidate.php b/app/adminapi/validate/supervision_qualification_review/SupervisionConstructionManagementPersonnelValidate.php index 68354157d..05e79aa7f 100644 --- a/app/adminapi/validate/supervision_qualification_review/SupervisionConstructionManagementPersonnelValidate.php +++ b/app/adminapi/validate/supervision_qualification_review/SupervisionConstructionManagementPersonnelValidate.php @@ -43,6 +43,8 @@ class SupervisionConstructionManagementPersonnelValidate extends BaseValidate 'effective_date_two' => 'dateFormat:Y-m-d', 'qualification_two_status' => 'in:0,1', 'annex' => 'checkAnnex', + 'create_user' => 'require', + 'create_time' => 'require|dateFormat:Y-m-d H:i:s', ]; @@ -71,6 +73,7 @@ class SupervisionConstructionManagementPersonnelValidate extends BaseValidate 'qualification_two_status' => '资质2状态', 'remark' => '备注', 'create_user' => '创建人', + 'create_time' => '创建时间', ]; @@ -136,13 +139,5 @@ class SupervisionConstructionManagementPersonnelValidate extends BaseValidate } return true; } - - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != '' && !is_array($value)){ - return '附件格式错误'; - } - return true; - } } \ No newline at end of file diff --git a/app/adminapi/validate/supervision_qualification_review/SupervisionLargeEquipmentValidate.php b/app/adminapi/validate/supervision_qualification_review/SupervisionLargeEquipmentValidate.php index 4dadf29e2..8e9aba79e 100644 --- a/app/adminapi/validate/supervision_qualification_review/SupervisionLargeEquipmentValidate.php +++ b/app/adminapi/validate/supervision_qualification_review/SupervisionLargeEquipmentValidate.php @@ -42,6 +42,8 @@ class SupervisionLargeEquipmentValidate extends BaseValidate 'effective_date_two' => 'dateFormat:Y-m-d', 'qualification_two_status' => 'in:0,1', 'annex' => 'checkAnnex', + 'create_user' => 'require', + 'create_time' => 'require|dateFormat:Y-m-d H:i:s', ]; @@ -67,6 +69,7 @@ class SupervisionLargeEquipmentValidate extends BaseValidate 'qualification_two_status' => '资质2状态', 'remark' => '备注', 'create_user' => '创建人', + 'create_time' => '创建时间', ]; @@ -132,13 +135,5 @@ class SupervisionLargeEquipmentValidate extends BaseValidate } return true; } - - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != '' && !is_array($value)){ - return '附件格式错误'; - } - return true; - } } \ No newline at end of file diff --git a/app/adminapi/validate/supervision_qualification_review/SupervisionParticipatingUnitsQualificationsValidate.php b/app/adminapi/validate/supervision_qualification_review/SupervisionParticipatingUnitsQualificationsValidate.php index aa4a525a7..d67915ea7 100644 --- a/app/adminapi/validate/supervision_qualification_review/SupervisionParticipatingUnitsQualificationsValidate.php +++ b/app/adminapi/validate/supervision_qualification_review/SupervisionParticipatingUnitsQualificationsValidate.php @@ -132,13 +132,5 @@ class SupervisionParticipatingUnitsQualificationsValidate extends BaseValidate } return true; } - - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != '' && !is_array($value)){ - return '附件格式错误'; - } - return true; - } } \ No newline at end of file diff --git a/app/adminapi/validate/supervision_work/SupervisionAcceptValidate.php b/app/adminapi/validate/supervision_work/SupervisionAcceptValidate.php index ada29034c..346b2f440 100644 --- a/app/adminapi/validate/supervision_work/SupervisionAcceptValidate.php +++ b/app/adminapi/validate/supervision_work/SupervisionAcceptValidate.php @@ -47,6 +47,8 @@ class SupervisionAcceptValidate extends BaseValidate 'accept_result' => 'require|in:0,1', 'check_item_detail_ids' => 'checkCheckItemDetail', 'annex' => 'checkAnnex', + 'create_user' => 'require', + 'create_time' => 'require|dateFormat:Y-m-d H:i:s', 'accept_check_result' => 'checkAcceptResult', 'accept_check_problem' => 'checkAcceptProblem' ]; @@ -69,6 +71,7 @@ class SupervisionAcceptValidate extends BaseValidate 'accept_result' => '验收结果', 'remark' => '备注', 'create_user' => '创建人', + 'create_time' => '创建时间', ]; @@ -186,14 +189,6 @@ class SupervisionAcceptValidate extends BaseValidate return true; } - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != '' && !is_array($value)){ - return '附件格式错误'; - } - return true; - } - public function checkAcceptResult($value): bool|string { if(!isset($value) || $value == '') return true; diff --git a/app/adminapi/validate/supervision_work/SupervisionDeviceEntryValidate.php b/app/adminapi/validate/supervision_work/SupervisionDeviceEntryValidate.php index b4588461e..018493c8b 100644 --- a/app/adminapi/validate/supervision_work/SupervisionDeviceEntryValidate.php +++ b/app/adminapi/validate/supervision_work/SupervisionDeviceEntryValidate.php @@ -41,6 +41,8 @@ class SupervisionDeviceEntryValidate extends BaseValidate 'project_id' => 'require|checkProject', 'enter_time' => 'require|dateFormat:Y-m-d H:i:s', 'company_id' => 'checkCompany', + 'create_user' => 'require', + 'create_time' => 'require|dateFormat:Y-m-d H:i:s', 'enter_result' => 'require|in:0,1', 'entry_detail' => 'checkEntryDetail', 'entry_problem' => 'checkEntryProblem' @@ -61,6 +63,7 @@ class SupervisionDeviceEntryValidate extends BaseValidate 'co_participant' => '共同参与人', 'remark' => '备注', 'create_user' => '操作人', + 'create_time' => '操作时间', ]; diff --git a/app/adminapi/validate/supervision_work/SupervisionDiaryValidate.php b/app/adminapi/validate/supervision_work/SupervisionDiaryValidate.php index 9adc2073e..2f4e74873 100644 --- a/app/adminapi/validate/supervision_work/SupervisionDiaryValidate.php +++ b/app/adminapi/validate/supervision_work/SupervisionDiaryValidate.php @@ -124,13 +124,5 @@ class SupervisionDiaryValidate extends BaseValidate } return true; } - - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != '' && !is_array($value)){ - return '附件格式错误'; - } - return true; - } } \ No newline at end of file diff --git a/app/adminapi/validate/supervision_work/SupervisionEntityParallelTestingValidate.php b/app/adminapi/validate/supervision_work/SupervisionEntityParallelTestingValidate.php index 794e17940..0e10c9e22 100644 --- a/app/adminapi/validate/supervision_work/SupervisionEntityParallelTestingValidate.php +++ b/app/adminapi/validate/supervision_work/SupervisionEntityParallelTestingValidate.php @@ -44,6 +44,8 @@ class SupervisionEntityParallelTestingValidate extends BaseValidate 'end_time' => 'require|dateFormat:Y-m-d', 'result' => 'require|in:0,1', 'annex' => 'checkAnnex', + 'create_user' => 'require', + 'create_time' => 'require|dateFormat:Y-m-d H:i:s', 'problem' => 'checkProblem' ]; @@ -64,6 +66,7 @@ class SupervisionEntityParallelTestingValidate extends BaseValidate 'result' => '检验结果', 'remark' => '备注', 'create_user' => '创建人', + 'create_time' => '创建日期', ]; @@ -138,14 +141,6 @@ class SupervisionEntityParallelTestingValidate extends BaseValidate return true; } - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != '' && !is_array($value)){ - return '附件格式错误'; - } - return true; - } - public function checkProblem($value): bool|string { if(!isset($value) || $value == '') return true; diff --git a/app/adminapi/validate/supervision_work/SupervisionInspectionValidate.php b/app/adminapi/validate/supervision_work/SupervisionInspectionValidate.php index 214737104..e4e45c34e 100644 --- a/app/adminapi/validate/supervision_work/SupervisionInspectionValidate.php +++ b/app/adminapi/validate/supervision_work/SupervisionInspectionValidate.php @@ -52,6 +52,8 @@ class SupervisionInspectionValidate extends BaseValidate 'is_important' => 'in:0,1', 'check_item_detail_ids' => 'checkCheckItemDetail', 'annex' => 'checkAnnex', + 'create_user' => 'require', + 'create_time' => 'require|dateFormat:Y-m-d H:i:s', 'inspection_result' => 'checkInspectionResult', 'inspection_problem' => 'checkInspectionProblem' ]; @@ -78,6 +80,7 @@ class SupervisionInspectionValidate extends BaseValidate 'follow_user' => '关注人', 'check_item_detail_ids' => '检查表单选择', 'create_user' => '创建人', + 'create_time' => '创建时间', ]; @@ -184,14 +187,6 @@ class SupervisionInspectionValidate extends BaseValidate return true; } - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != '' && !is_array($value)){ - return '附件格式错误'; - } - return true; - } - public function checkInspectionResult($value): bool|string { if(!isset($value) || $value == '') return true; diff --git a/app/adminapi/validate/supervision_work/SupervisionMaterialEntryValidate.php b/app/adminapi/validate/supervision_work/SupervisionMaterialEntryValidate.php index 5a6152b83..1b8b3cdbc 100644 --- a/app/adminapi/validate/supervision_work/SupervisionMaterialEntryValidate.php +++ b/app/adminapi/validate/supervision_work/SupervisionMaterialEntryValidate.php @@ -42,6 +42,8 @@ class SupervisionMaterialEntryValidate extends BaseValidate 'enter_time' => 'require|dateFormat:Y-m-d H:i:s', 'enter_result' => 'require|in:0,1,2', 'parallel_test' => 'require|in:0,1', + 'create_user' => 'require', + 'create_time' => 'require|dateFormat:Y-m-d H:i:s', 'entry_detail' => 'checkEntryDetail', ]; @@ -62,6 +64,7 @@ class SupervisionMaterialEntryValidate extends BaseValidate 'parallel_test' => '是否平行检验', 'remark' => '备注', 'create_user' => '创建人', + 'create_time' => '创建时间', ]; diff --git a/app/adminapi/validate/supervision_work/SupervisionMaterialParallelTestingDetailValidate.php b/app/adminapi/validate/supervision_work/SupervisionMaterialParallelTestingDetailValidate.php index f1dd03667..d59a73271 100644 --- a/app/adminapi/validate/supervision_work/SupervisionMaterialParallelTestingDetailValidate.php +++ b/app/adminapi/validate/supervision_work/SupervisionMaterialParallelTestingDetailValidate.php @@ -152,14 +152,6 @@ class SupervisionMaterialParallelTestingDetailValidate extends BaseValidate return true; } - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != '' && !is_array($value)){ - return '附件格式错误'; - } - return true; - } - public function checkProblem($value): bool|string { if(!isset($value) || $value == '') return true; diff --git a/app/adminapi/validate/supervision_work/SupervisionMaterialParallelTestingValidate.php b/app/adminapi/validate/supervision_work/SupervisionMaterialParallelTestingValidate.php index f002022d0..505e9511c 100644 --- a/app/adminapi/validate/supervision_work/SupervisionMaterialParallelTestingValidate.php +++ b/app/adminapi/validate/supervision_work/SupervisionMaterialParallelTestingValidate.php @@ -42,6 +42,8 @@ class SupervisionMaterialParallelTestingValidate extends BaseValidate 'inspector' => 'require', 'inspection_date' => 'require|dateFormat:Y-m-d', 'annex' => 'checkAnnex', + 'create_user' => 'require', + 'create_time' => 'require|dateFormat:Y-m-d H:i:s', 'detail' => 'checkDetail' ]; @@ -59,6 +61,7 @@ class SupervisionMaterialParallelTestingValidate extends BaseValidate 'inspection_date' => '送检日期', 'remark' => '备注', 'create_user' => '创建人', + 'create_time' => '创建时间', ]; @@ -134,14 +137,6 @@ class SupervisionMaterialParallelTestingValidate extends BaseValidate return true; } - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != '' && !is_array($value)){ - return '附件格式错误'; - } - return true; - } - public function checkDetail($value,$rule,$params): bool|string { if(!isset($value) || $value == '') return true; diff --git a/app/adminapi/validate/supervision_work/SupervisionMeetingMinutesValidate.php b/app/adminapi/validate/supervision_work/SupervisionMeetingMinutesValidate.php index 742cb6dc9..2f0f29255 100644 --- a/app/adminapi/validate/supervision_work/SupervisionMeetingMinutesValidate.php +++ b/app/adminapi/validate/supervision_work/SupervisionMeetingMinutesValidate.php @@ -38,6 +38,8 @@ class SupervisionMeetingMinutesValidate extends BaseValidate 'theme' => 'require', 'time' => 'dateFormat:Y-m-d', 'annex' => 'checkAnnex', + 'create_user' => 'require', + 'create_time' => 'require|dateFormat:Y-m-d H:i:s', ]; @@ -56,7 +58,8 @@ class SupervisionMeetingMinutesValidate extends BaseValidate 'location' => '会议地点', 'attendees' => '与会人员', 'content' => '会议内容', - 'create_user' => 'create_user', + 'create_user' => '操作人', + 'create_time' => '创建时间', ]; @@ -122,13 +125,5 @@ class SupervisionMeetingMinutesValidate extends BaseValidate } return true; } - - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != '' && !is_array($value)){ - return '附件格式错误'; - } - return true; - } } \ No newline at end of file diff --git a/app/adminapi/validate/supervision_work/SupervisionNoticeValidate.php b/app/adminapi/validate/supervision_work/SupervisionNoticeValidate.php index 5e90c795d..986466b3d 100644 --- a/app/adminapi/validate/supervision_work/SupervisionNoticeValidate.php +++ b/app/adminapi/validate/supervision_work/SupervisionNoticeValidate.php @@ -46,7 +46,9 @@ class SupervisionNoticeValidate extends BaseValidate 'rectification_reply_user' => 'require', 'rectification_reply_opinions' => 'require', 'rectification_reply_annex' => 'checkAnnex', - 'problem' => 'checkProblem' + 'problem' => 'checkProblem', + 'create_user' => 'require', + 'create_time' => 'require|dateFormat:Y-m-d H:i:s', ]; @@ -65,6 +67,7 @@ class SupervisionNoticeValidate extends BaseValidate 'rectification_reply_user' => '整改回复人', 'rectification_reply_opinions' => '整改回复意见', 'create_user' => '填写人', + 'create_time' => '填写日期', ]; @@ -77,7 +80,7 @@ class SupervisionNoticeValidate extends BaseValidate */ public function sceneAdd() { - return $this->only(['project_id','reply_date','company_id','notify_user','issue_date','annex','problem']); + return $this->only(['project_id','reply_date','company_id','notify_user','issue_date','annex','create_user','create_time','problem']); } @@ -89,7 +92,7 @@ class SupervisionNoticeValidate extends BaseValidate */ public function sceneEdit() { - return $this->only(['id','project_id','reply_date','company_id','notify_user','issue_date','annex','problem']); + return $this->only(['id','project_id','reply_date','company_id','notify_user','issue_date','annex','create_user','create_time','problem']); } /** @@ -154,14 +157,6 @@ class SupervisionNoticeValidate extends BaseValidate return true; } - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != '' && !is_array($value)){ - return '附件格式错误'; - } - return true; - } - public function checkProblem($value): bool|string { if(!isset($value) || $value == '') return true; diff --git a/app/adminapi/validate/supervision_work/SupervisionProblemValidate.php b/app/adminapi/validate/supervision_work/SupervisionProblemValidate.php index 707972e6c..6cb68750b 100644 --- a/app/adminapi/validate/supervision_work/SupervisionProblemValidate.php +++ b/app/adminapi/validate/supervision_work/SupervisionProblemValidate.php @@ -45,6 +45,8 @@ class SupervisionProblemValidate extends BaseValidate 'rectification_opinion' => 'require', 'is_rectification' => 'require|in:0,1', 'rectification_annex' => 'checkAnnex', + 'create_user' => 'require', + 'create_time' => 'require|dateFormat:Y-m-d H:i:s', ]; @@ -64,6 +66,8 @@ class SupervisionProblemValidate extends BaseValidate 'rectification_result' => '整改结果', 'rectification_opinion' => '整改意见', 'is_rectification' => '是否整改', + 'create_user' => '问题发现人', + 'create_time' => '发现日期', ]; @@ -75,7 +79,7 @@ class SupervisionProblemValidate extends BaseValidate */ public function sceneAdd() { - return $this->only(['data_id','data_type','problem_cate','problem_description','problem_name']); + return $this->only(['data_id','data_type','problem_cate','problem_description','problem_name','create_user','create_time']); } @@ -87,7 +91,7 @@ class SupervisionProblemValidate extends BaseValidate */ public function sceneEdit() { - return $this->only(['id','data_id','data_type','problem_cate','problem_description','problem_name']); + return $this->only(['id','data_id','data_type','problem_cate','problem_description','problem_name','create_user','create_time']); } /** @@ -142,13 +146,5 @@ class SupervisionProblemValidate extends BaseValidate } return true; } - - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != '' && !is_array($value)){ - return '附件格式错误'; - } - return true; - } } \ No newline at end of file diff --git a/app/adminapi/validate/supervision_work/SupervisionSideStationValidate.php b/app/adminapi/validate/supervision_work/SupervisionSideStationValidate.php index 995fcf7bb..a34ad84df 100644 --- a/app/adminapi/validate/supervision_work/SupervisionSideStationValidate.php +++ b/app/adminapi/validate/supervision_work/SupervisionSideStationValidate.php @@ -51,7 +51,9 @@ class SupervisionSideStationValidate extends BaseValidate 'check_item_detail_ids' => 'checkCheckItemDetail', 'annex' => 'checkAnnex', 'side_result' => 'checkSideResult', - 'side_problem' => 'checkSideProblem' + 'side_problem' => 'checkSideProblem', + 'create_user' => 'require', + 'create_time' => 'require|dateFormat:Y-m-d H:i:s', ]; @@ -75,6 +77,7 @@ class SupervisionSideStationValidate extends BaseValidate 'side_station_result' => '旁站结果 0-完成 1-交班', 'side_station_user' => '旁站人员', 'create_user' => '创建人', + 'create_time' => '创建时间', ]; @@ -181,14 +184,6 @@ class SupervisionSideStationValidate extends BaseValidate return true; } - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != '' && !is_array($value)){ - return '附件格式错误'; - } - return true; - } - public function checkSideResult($value): bool|string { if(!isset($value) || $value == '') return true; diff --git a/app/adminapi/validate/supervision_work/SupervisionTestBlocksSpecimensValidate.php b/app/adminapi/validate/supervision_work/SupervisionTestBlocksSpecimensValidate.php index 21cb39709..a232b6899 100644 --- a/app/adminapi/validate/supervision_work/SupervisionTestBlocksSpecimensValidate.php +++ b/app/adminapi/validate/supervision_work/SupervisionTestBlocksSpecimensValidate.php @@ -44,7 +44,9 @@ class SupervisionTestBlocksSpecimensValidate extends BaseValidate 'end_date' => 'require|dateFormat:Y-m-d', 'test_result' => 'require|in:0,1', 'annex' => 'checkAnnex', - 'problem' => 'checkProblem' + 'problem' => 'checkProblem', + 'create_user' => 'require', + 'create_time' => 'require|dateFormat:Y-m-d H:i:s', ]; @@ -65,6 +67,7 @@ class SupervisionTestBlocksSpecimensValidate extends BaseValidate 'test_result' => '试验结果 0-符合标准 1-不符合标准', 'remark' => '备注', 'create_user' => '创建人', + 'create_time' => '创建时间', ]; @@ -139,14 +142,6 @@ class SupervisionTestBlocksSpecimensValidate extends BaseValidate return true; } - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != '' && !is_array($value)){ - return '附件格式错误'; - } - return true; - } - public function checkProblem($value): bool|string { if(!isset($value) || $value == '') return true; diff --git a/app/adminapi/validate/supervision_work/SupervisionWitnessSamplingDetailValidate.php b/app/adminapi/validate/supervision_work/SupervisionWitnessSamplingDetailValidate.php index 365c6b0e1..55b8f8ef7 100644 --- a/app/adminapi/validate/supervision_work/SupervisionWitnessSamplingDetailValidate.php +++ b/app/adminapi/validate/supervision_work/SupervisionWitnessSamplingDetailValidate.php @@ -152,14 +152,6 @@ class SupervisionWitnessSamplingDetailValidate extends BaseValidate return true; } - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != '' && !is_array($value)){ - return '附件格式错误'; - } - return true; - } - public function checkProblem($value): bool|string { if(!isset($value) || $value == '') return true; diff --git a/app/adminapi/validate/supervision_work/SupervisionWitnessSamplingValidate.php b/app/adminapi/validate/supervision_work/SupervisionWitnessSamplingValidate.php index 896f7cc5d..342d8cd91 100644 --- a/app/adminapi/validate/supervision_work/SupervisionWitnessSamplingValidate.php +++ b/app/adminapi/validate/supervision_work/SupervisionWitnessSamplingValidate.php @@ -42,6 +42,8 @@ class SupervisionWitnessSamplingValidate extends BaseValidate 'sampling_date' => 'require|dateFormat:Y-m-d', 'sampler' => 'require', 'annex' => 'checkAnnex', + 'create_user' => 'require', + 'create_time' => 'require|dateFormat:Y-m-d H:i:s', 'sampling_detail' => 'checkSamplingDetail' ]; @@ -59,6 +61,7 @@ class SupervisionWitnessSamplingValidate extends BaseValidate 'witness' => '见证人', 'sampler' => '取样人', 'create_user' => '创建人', + 'create_time' => '创建时间', ]; @@ -134,14 +137,6 @@ class SupervisionWitnessSamplingValidate extends BaseValidate return true; } - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != '' && !is_array($value)){ - return '附件格式错误'; - } - return true; - } - public function checkSamplingDetail($value,$rule,$params): bool|string { if(!isset($value) || $value == '') return true; diff --git a/app/adminapi/validate/supervision_work/SupervisionWorkContactValidate.php b/app/adminapi/validate/supervision_work/SupervisionWorkContactValidate.php index dfea1703a..445a1fe0d 100644 --- a/app/adminapi/validate/supervision_work/SupervisionWorkContactValidate.php +++ b/app/adminapi/validate/supervision_work/SupervisionWorkContactValidate.php @@ -122,14 +122,6 @@ class SupervisionWorkContactValidate extends BaseValidate return true; } - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != '' && !is_array($value)){ - return '附件格式错误'; - } - return true; - } - public function checkProblem($value): bool|string { if(!isset($value) || $value == '') return true; diff --git a/app/common/model/supervision_connect/SupervisionCompanyCheck.php b/app/common/model/supervision_connect/SupervisionCompanyCheck.php index 5a627ed67..a8341c282 100644 --- a/app/common/model/supervision_connect/SupervisionCompanyCheck.php +++ b/app/common/model/supervision_connect/SupervisionCompanyCheck.php @@ -30,10 +30,6 @@ class SupervisionCompanyCheck extends BaseModel protected $name = 'supervision_company_check'; protected $deleteTime = 'delete_time'; - public function getAnnexAttr($value){ - return !empty($value) ? json_decode($value,true) : ''; - } - public function getDateAttr($value): string { return !empty($value) ? date('Y-m-d',$value) : ''; diff --git a/app/common/model/supervision_connect/SupervisionProjectCaseReview.php b/app/common/model/supervision_connect/SupervisionProjectCaseReview.php index c6951f4ad..03c238fbd 100644 --- a/app/common/model/supervision_connect/SupervisionProjectCaseReview.php +++ b/app/common/model/supervision_connect/SupervisionProjectCaseReview.php @@ -30,10 +30,6 @@ class SupervisionProjectCaseReview extends BaseModel use SoftDelete; protected $name = 'supervision_project_case_review'; protected $deleteTime = 'delete_time'; - - public function getAnnexAttr($value){ - return !empty($value) ? json_decode($value,true) : ''; - } public function getReviewTypeTextAttr($value,$data){ $dict = DictData::where('type_value','supervision_planning_approval_type')->column('name','value'); diff --git a/app/common/model/supervision_connect/SupervisionProjectInfoReport.php b/app/common/model/supervision_connect/SupervisionProjectInfoReport.php index 3bf00a132..d61257801 100644 --- a/app/common/model/supervision_connect/SupervisionProjectInfoReport.php +++ b/app/common/model/supervision_connect/SupervisionProjectInfoReport.php @@ -31,10 +31,6 @@ class SupervisionProjectInfoReport extends BaseModel protected $name = 'supervision_project_info_report'; protected $deleteTime = 'delete_time'; - public function getAnnexAttr($value){ - return !empty($value) ? json_decode($value,true) : ''; - } - public function getInfoCateAttr($value){ return !empty($value) ? json_decode($value,true) : ''; } diff --git a/app/common/model/supervision_connect/SupervisionProjectMilestones.php b/app/common/model/supervision_connect/SupervisionProjectMilestones.php index 078bd2fa8..62ffff0c4 100644 --- a/app/common/model/supervision_connect/SupervisionProjectMilestones.php +++ b/app/common/model/supervision_connect/SupervisionProjectMilestones.php @@ -29,8 +29,4 @@ class SupervisionProjectMilestones extends BaseModel use SoftDelete; protected $name = 'supervision_project_milestones'; protected $deleteTime = 'delete_time'; - - public function getAnnexAttr($value){ - return !empty($value) ? json_decode($value,true) : ''; - } } \ No newline at end of file diff --git a/app/common/model/supervision_connect/SupervisionProjectMonthlyReport.php b/app/common/model/supervision_connect/SupervisionProjectMonthlyReport.php index 0b86f37f9..9eecfdedf 100644 --- a/app/common/model/supervision_connect/SupervisionProjectMonthlyReport.php +++ b/app/common/model/supervision_connect/SupervisionProjectMonthlyReport.php @@ -31,10 +31,6 @@ class SupervisionProjectMonthlyReport extends BaseModel protected $name = 'supervision_project_monthly_report'; protected $deleteTime = 'delete_time'; - public function getAnnexAttr($value){ - return !empty($value) ? json_decode($value,true) : ''; - } - public function getDateAttr($value): string { return !empty($value) ? date('Y-m',$value) : ''; diff --git a/app/common/model/supervision_const_prepare/SupervisionCommencementReport.php b/app/common/model/supervision_const_prepare/SupervisionCommencementReport.php index 06b27f0cb..a2f030827 100644 --- a/app/common/model/supervision_const_prepare/SupervisionCommencementReport.php +++ b/app/common/model/supervision_const_prepare/SupervisionCommencementReport.php @@ -30,8 +30,4 @@ class SupervisionCommencementReport extends BaseModel protected $name = 'supervision_commencement_report'; protected $deleteTime = 'delete_time'; - public function getAnnexAttr($value) - { - return !empty($value) ? json_decode($value,true) : ''; - } } \ No newline at end of file diff --git a/app/common/model/supervision_const_prepare/SupervisionDesignDisclosure.php b/app/common/model/supervision_const_prepare/SupervisionDesignDisclosure.php index 1cc814be5..08d6aefb2 100644 --- a/app/common/model/supervision_const_prepare/SupervisionDesignDisclosure.php +++ b/app/common/model/supervision_const_prepare/SupervisionDesignDisclosure.php @@ -30,8 +30,4 @@ class SupervisionDesignDisclosure extends BaseModel protected $name = 'supervision_design_disclosure'; protected $deleteTime = 'delete_time'; - public function getAnnexAttr($value) - { - return !empty($value) ? json_decode($value,true) : ''; - } } \ No newline at end of file diff --git a/app/common/model/supervision_const_prepare/SupervisionFirstMeeting.php b/app/common/model/supervision_const_prepare/SupervisionFirstMeeting.php index bedc05ad8..027f5ff0a 100644 --- a/app/common/model/supervision_const_prepare/SupervisionFirstMeeting.php +++ b/app/common/model/supervision_const_prepare/SupervisionFirstMeeting.php @@ -30,8 +30,4 @@ class SupervisionFirstMeeting extends BaseModel protected $name = 'supervision_first_meeting'; protected $deleteTime = 'delete_time'; - public function getAnnexAttr($value) - { - return !empty($value) ? json_decode($value,true) : ''; - } } \ No newline at end of file diff --git a/app/common/model/supervision_const_prepare/SupervisionRules.php b/app/common/model/supervision_const_prepare/SupervisionRules.php index 7dd8549f2..44d517c63 100644 --- a/app/common/model/supervision_const_prepare/SupervisionRules.php +++ b/app/common/model/supervision_const_prepare/SupervisionRules.php @@ -29,9 +29,4 @@ class SupervisionRules extends BaseModel use SoftDelete; protected $name = 'supervision_rules'; protected $deleteTime = 'delete_time'; - - public function getAnnexAttr($value) - { - return !empty($value) ? json_decode($value,true) : ''; - } } \ No newline at end of file diff --git a/app/common/model/supervision_const_prepare/SupervisionRulesDisclosure.php b/app/common/model/supervision_const_prepare/SupervisionRulesDisclosure.php index 44f3de505..f5eaf9b73 100644 --- a/app/common/model/supervision_const_prepare/SupervisionRulesDisclosure.php +++ b/app/common/model/supervision_const_prepare/SupervisionRulesDisclosure.php @@ -29,9 +29,4 @@ class SupervisionRulesDisclosure extends BaseModel use SoftDelete; protected $name = 'supervision_rules_disclosure'; protected $deleteTime = 'delete_time'; - - public function getAnnexAttr($value) - { - return !empty($value) ? json_decode($value,true) : ''; - } } \ No newline at end of file diff --git a/app/common/model/supervision_dangerous/SupervisionDangerousEngineeringCase.php b/app/common/model/supervision_dangerous/SupervisionDangerousEngineeringCase.php index 47fe99511..cf985f34b 100644 --- a/app/common/model/supervision_dangerous/SupervisionDangerousEngineeringCase.php +++ b/app/common/model/supervision_dangerous/SupervisionDangerousEngineeringCase.php @@ -29,8 +29,4 @@ class SupervisionDangerousEngineeringCase extends BaseModel use SoftDelete; protected $name = 'supervision_dangerous_engineering_case'; protected $deleteTime = 'delete_time'; - - public function getAnnexAttr($value){ - return !empty($value) ? json_decode($value,true) : ''; - } } \ No newline at end of file diff --git a/app/common/model/supervision_dangerous/SupervisionLargeMechanicalEquipment.php b/app/common/model/supervision_dangerous/SupervisionLargeMechanicalEquipment.php index fe283cef0..d9f19db62 100644 --- a/app/common/model/supervision_dangerous/SupervisionLargeMechanicalEquipment.php +++ b/app/common/model/supervision_dangerous/SupervisionLargeMechanicalEquipment.php @@ -65,9 +65,4 @@ class SupervisionLargeMechanicalEquipment extends BaseModel $dict = DictData::where('type_value','first_audit_opinion')->column('name','value'); return !empty($data['first_audit_opinion']) ? $dict[$data['first_audit_opinion']] : ''; } - - public function getAnnexAttr($value) - { - return !empty($value) ? json_decode($value,true) : ''; - } } \ No newline at end of file diff --git a/app/common/model/supervision_dangerous/SupervisionSafetyWarningSign.php b/app/common/model/supervision_dangerous/SupervisionSafetyWarningSign.php index 8a5206562..61845c044 100644 --- a/app/common/model/supervision_dangerous/SupervisionSafetyWarningSign.php +++ b/app/common/model/supervision_dangerous/SupervisionSafetyWarningSign.php @@ -29,10 +29,6 @@ class SupervisionSafetyWarningSign extends BaseModel use SoftDelete; protected $name = 'supervision_safety_warning_sign'; protected $deleteTime = 'delete_time'; - - public function getAnnexAttr($value){ - return !empty($value) ? json_decode($value,true) : ''; - } public function getCheckDateAttr($value): string { diff --git a/app/common/model/supervision_ending/SupervisionProjectAcceptanceReport.php b/app/common/model/supervision_ending/SupervisionProjectAcceptanceReport.php index c9dc3438e..e614f0402 100644 --- a/app/common/model/supervision_ending/SupervisionProjectAcceptanceReport.php +++ b/app/common/model/supervision_ending/SupervisionProjectAcceptanceReport.php @@ -30,7 +30,4 @@ class SupervisionProjectAcceptanceReport extends BaseModel protected $name = 'supervision_project_acceptance_report'; protected $deleteTime = 'delete_time'; - public function getAnnexAttr($value){ - return !empty($value) ? json_decode($value,true) : ''; - } } \ No newline at end of file diff --git a/app/common/model/supervision_prepare/SupervisionConstructionPlanning.php b/app/common/model/supervision_prepare/SupervisionConstructionPlanning.php index c024ac361..39ec8b18e 100644 --- a/app/common/model/supervision_prepare/SupervisionConstructionPlanning.php +++ b/app/common/model/supervision_prepare/SupervisionConstructionPlanning.php @@ -29,9 +29,4 @@ class SupervisionConstructionPlanning extends BaseModel use SoftDelete; protected $name = 'supervision_construction_planning'; protected $deleteTime = 'delete_time'; - - public function getAnnexAttr($value) - { - return !empty($value) ? json_decode($value,true) : ''; - } } \ No newline at end of file diff --git a/app/common/model/supervision_prepare/SupervisionContractDisclosure.php b/app/common/model/supervision_prepare/SupervisionContractDisclosure.php index 0b5ff5767..7815135ab 100644 --- a/app/common/model/supervision_prepare/SupervisionContractDisclosure.php +++ b/app/common/model/supervision_prepare/SupervisionContractDisclosure.php @@ -29,9 +29,4 @@ class SupervisionContractDisclosure extends BaseModel use SoftDelete; protected $name = 'supervision_contract_disclosure'; protected $deleteTime = 'delete_time'; - - public function getAnnexAttr($value) - { - return !empty($value) ? json_decode($value,true) : ''; - } } \ No newline at end of file diff --git a/app/common/model/supervision_prepare/SupervisionPlanning.php b/app/common/model/supervision_prepare/SupervisionPlanning.php index bba8eba3b..b511853fc 100644 --- a/app/common/model/supervision_prepare/SupervisionPlanning.php +++ b/app/common/model/supervision_prepare/SupervisionPlanning.php @@ -35,9 +35,4 @@ class SupervisionPlanning extends BaseModel $dict = DictData::where('type_value','supervision_planning_approval_type')->column('name','value'); return !empty($data['approval_type']) ? $dict[$data['approval_type']] : ''; } - - public function getAnnexAttr($value) - { - return !empty($value) ? json_decode($value,true) : ''; - } } \ No newline at end of file diff --git a/app/common/model/supervision_project/SupervisionProject.php b/app/common/model/supervision_project/SupervisionProject.php index aabd16d81..2f82d551f 100644 --- a/app/common/model/supervision_project/SupervisionProject.php +++ b/app/common/model/supervision_project/SupervisionProject.php @@ -76,9 +76,9 @@ class SupervisionProject extends BaseModel return !empty($value) ? date('Y-m-d', $value) : ''; } - public function getAnnexAttr($value) + public function getInitiationDateAttr($value): string { - return !empty($value) ? json_decode($value,true) : ''; + return !empty($value) ? date('Y-m-d', $value) : ''; } } \ No newline at end of file diff --git a/app/common/model/supervision_qualification_review/SupervisionConstructionManagementPersonnel.php b/app/common/model/supervision_qualification_review/SupervisionConstructionManagementPersonnel.php index 78f6fcf59..47cdcdaa0 100644 --- a/app/common/model/supervision_qualification_review/SupervisionConstructionManagementPersonnel.php +++ b/app/common/model/supervision_qualification_review/SupervisionConstructionManagementPersonnel.php @@ -59,9 +59,4 @@ class SupervisionConstructionManagementPersonnel extends BaseModel $arr = [0=>'有效', 1=>'无效']; return $arr[$data['qualification_two_status']]; } - - public function getAnnexAttr($value) - { - return !empty($value) ? json_decode($value,true) : ''; - } } \ No newline at end of file diff --git a/app/common/model/supervision_qualification_review/SupervisionLargeEquipment.php b/app/common/model/supervision_qualification_review/SupervisionLargeEquipment.php index 7ec0ae8cf..a834880b7 100644 --- a/app/common/model/supervision_qualification_review/SupervisionLargeEquipment.php +++ b/app/common/model/supervision_qualification_review/SupervisionLargeEquipment.php @@ -59,9 +59,4 @@ class SupervisionLargeEquipment extends BaseModel $arr = [0=>'有效', 1=>'无效']; return $arr[$data['qualification_two_status']]; } - - public function getAnnexAttr($value) - { - return !empty($value) ? json_decode($value,true) : ''; - } } \ No newline at end of file diff --git a/app/common/model/supervision_qualification_review/SupervisionParticipatingUnitsQualifications.php b/app/common/model/supervision_qualification_review/SupervisionParticipatingUnitsQualifications.php index ab54a0c8d..f2097e338 100644 --- a/app/common/model/supervision_qualification_review/SupervisionParticipatingUnitsQualifications.php +++ b/app/common/model/supervision_qualification_review/SupervisionParticipatingUnitsQualifications.php @@ -44,9 +44,4 @@ class SupervisionParticipatingUnitsQualifications extends BaseModel $arr = [0=>'有效', 1=>'无效']; return $arr[$data['qualification_status']]; } - - public function getAnnexAttr($value) - { - return !empty($value) ? json_decode($value,true) : ''; - } } \ No newline at end of file diff --git a/app/common/model/supervision_work/SupervisionAccept.php b/app/common/model/supervision_work/SupervisionAccept.php index a6925de4e..abe51ad97 100644 --- a/app/common/model/supervision_work/SupervisionAccept.php +++ b/app/common/model/supervision_work/SupervisionAccept.php @@ -31,11 +31,6 @@ class SupervisionAccept extends BaseModel protected $name = 'supervision_accept'; protected $deleteTime = 'delete_time'; - public function getAnnexAttr($value) - { - return !empty($value) ? json_decode($value,true) : ''; - } - public function getCheckItemDetailIdsAttr($value) { return !empty($value) ? json_decode($value,true) : ''; diff --git a/app/common/model/supervision_work/SupervisionDiary.php b/app/common/model/supervision_work/SupervisionDiary.php index 870e42de8..0ed79c828 100644 --- a/app/common/model/supervision_work/SupervisionDiary.php +++ b/app/common/model/supervision_work/SupervisionDiary.php @@ -30,11 +30,6 @@ class SupervisionDiary extends BaseModel protected $name = 'supervision_diary'; protected $deleteTime = 'delete_time'; - public function getAnnexAttr($value) - { - return !empty($value) ? json_decode($value,true) : ''; - } - public function getDateAttr($value) { return !empty($value) ? date('Y-m-d', $value) : ''; diff --git a/app/common/model/supervision_work/SupervisionEntityParallelTesting.php b/app/common/model/supervision_work/SupervisionEntityParallelTesting.php index e65058381..013809420 100644 --- a/app/common/model/supervision_work/SupervisionEntityParallelTesting.php +++ b/app/common/model/supervision_work/SupervisionEntityParallelTesting.php @@ -30,11 +30,6 @@ class SupervisionEntityParallelTesting extends BaseModel protected $name = 'supervision_entity_parallel_testing'; protected $deleteTime = 'delete_time'; - public function getAnnexAttr($value) - { - return !empty($value) ? json_decode($value,true) : ''; - } - public function getResultTextAttr($value,$data){ $arr = [0=>'符合标准', 1=>'不符合标准']; return $arr[$data['result']]; diff --git a/app/common/model/supervision_work/SupervisionInspection.php b/app/common/model/supervision_work/SupervisionInspection.php index 3a01c20c0..1c2fa851b 100644 --- a/app/common/model/supervision_work/SupervisionInspection.php +++ b/app/common/model/supervision_work/SupervisionInspection.php @@ -31,11 +31,6 @@ class SupervisionInspection extends BaseModel protected $name = 'supervision_inspection'; protected $deleteTime = 'delete_time'; - public function getAnnexAttr($value) - { - return !empty($value) ? json_decode($value,true) : ''; - } - public function getCheckItemDetailIdsAttr($value) { return !empty($value) ? json_decode($value,true) : ''; diff --git a/app/common/model/supervision_work/SupervisionMaterialParallelTesting.php b/app/common/model/supervision_work/SupervisionMaterialParallelTesting.php index 89b8fbf02..054d3f994 100644 --- a/app/common/model/supervision_work/SupervisionMaterialParallelTesting.php +++ b/app/common/model/supervision_work/SupervisionMaterialParallelTesting.php @@ -34,8 +34,4 @@ class SupervisionMaterialParallelTesting extends BaseModel { return !empty($value) ? date('Y-m-d',$value) : ''; } - - public function getAnnexAttr($value){ - return !empty($value) ? json_decode($value,true) : ''; - } } \ No newline at end of file diff --git a/app/common/model/supervision_work/SupervisionMeetingMinutes.php b/app/common/model/supervision_work/SupervisionMeetingMinutes.php index 886eef92a..9314f6cd0 100644 --- a/app/common/model/supervision_work/SupervisionMeetingMinutes.php +++ b/app/common/model/supervision_work/SupervisionMeetingMinutes.php @@ -30,11 +30,6 @@ class SupervisionMeetingMinutes extends BaseModel protected $name = 'supervision_meeting_minutes'; protected $deleteTime = 'delete_time'; - public function getAnnexAttr($value) - { - return !empty($value) ? json_decode($value,true) : ''; - } - public function getTimeAttr($value) { return !empty($value) ? date('Y-m-d', $value) : ''; diff --git a/app/common/model/supervision_work/SupervisionNotice.php b/app/common/model/supervision_work/SupervisionNotice.php index 2822225e8..5019c8537 100644 --- a/app/common/model/supervision_work/SupervisionNotice.php +++ b/app/common/model/supervision_work/SupervisionNotice.php @@ -30,11 +30,6 @@ class SupervisionNotice extends BaseModel protected $name = 'supervision_notice'; protected $deleteTime = 'delete_time'; - public function getAnnexAttr($value) - { - return !empty($value) ? json_decode($value,true) : ''; - } - public function getRectificationReplyAnnexAttr($value) { return !empty($value) ? json_decode($value,true) : ''; diff --git a/app/common/model/supervision_work/SupervisionSideStation.php b/app/common/model/supervision_work/SupervisionSideStation.php index 9780e11a9..4a0653887 100644 --- a/app/common/model/supervision_work/SupervisionSideStation.php +++ b/app/common/model/supervision_work/SupervisionSideStation.php @@ -31,11 +31,6 @@ class SupervisionSideStation extends BaseModel protected $name = 'supervision_side_station'; protected $deleteTime = 'delete_time'; - public function getAnnexAttr($value) - { - return !empty($value) ? json_decode($value,true) : ''; - } - public function getCheckItemDetailIdsAttr($value) { return !empty($value) ? json_decode($value,true) : ''; diff --git a/app/common/model/supervision_work/SupervisionTestBlocksSpecimens.php b/app/common/model/supervision_work/SupervisionTestBlocksSpecimens.php index 523e48816..ad125e8e7 100644 --- a/app/common/model/supervision_work/SupervisionTestBlocksSpecimens.php +++ b/app/common/model/supervision_work/SupervisionTestBlocksSpecimens.php @@ -30,11 +30,6 @@ class SupervisionTestBlocksSpecimens extends BaseModel protected $name = 'supervision_test_blocks_specimens'; protected $deleteTime = 'delete_time'; - public function getAnnexAttr($value) - { - return !empty($value) ? json_decode($value,true) : ''; - } - public function getTestResultTextAttr($value,$data){ $arr = [0=>'符合标准', 1=>'不符合标准']; return $arr[$data['test_result']]; diff --git a/app/common/model/supervision_work/SupervisionWitnessSampling.php b/app/common/model/supervision_work/SupervisionWitnessSampling.php index e7969d23b..057634b41 100644 --- a/app/common/model/supervision_work/SupervisionWitnessSampling.php +++ b/app/common/model/supervision_work/SupervisionWitnessSampling.php @@ -34,8 +34,4 @@ class SupervisionWitnessSampling extends BaseModel { return !empty($value) ? date('Y-m-d',$value) : ''; } - - public function getAnnexAttr($value){ - return !empty($value) ? json_decode($value,true) : ''; - } } \ No newline at end of file diff --git a/app/common/model/supervision_work/SupervisionWorkContact.php b/app/common/model/supervision_work/SupervisionWorkContact.php index d4ca7714c..4cf4bd816 100644 --- a/app/common/model/supervision_work/SupervisionWorkContact.php +++ b/app/common/model/supervision_work/SupervisionWorkContact.php @@ -30,11 +30,6 @@ class SupervisionWorkContact extends BaseModel protected $name = 'supervision_work_contact'; protected $deleteTime = 'delete_time'; - public function getAnnexAttr($value) - { - return !empty($value) ? json_decode($value,true) : ''; - } - public function getInitiationDateAttr($value): string { return !empty($value) ? date('Y-m-d', $value) : '';