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

fixed

Browse Source
This commit is contained in:
weiz 2024-01-27 17:21:24 +08:00
parent 87da163086
commit 256e0bd053
40 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/common/model/bid/BidBiddingDecision.php
View File

@ -60,7 +60,7 @@ class BidBiddingDecision extends BaseModel
public function getProjectAssuranceTextAttr($value,$data){ public function getProjectAssuranceTextAttr($value,$data){
$dictData = DictData::where('type_value','project_assurance')->column('name','value'); $dictData = DictData::where('type_value','project_assurance')->column('name','value');
return $dictData[$data['project_assurance']]; return !empty($data['project_assurance']) ? $dictData[$data['project_assurance']] : '';
} }
public function getIsMarginTextAttr($value,$data): string public function getIsMarginTextAttr($value,$data): string
@ -77,7 +77,7 @@ class BidBiddingDecision extends BaseModel
public function getAnnexAttr($value) public function getAnnexAttr($value)
{ {
return empty($value) ? null : json_decode($value,true); return !empty($value) ? json_decode($value,true) : '';
} }
} }

2
app/common/model/bid/BidResult.php
View File

@ -39,7 +39,7 @@ class BidResult extends BaseModel
public function getAnnexAttr($value) public function getAnnexAttr($value)
{ {
return empty($value) ? null : json_decode($value,true); return !empty($value) ? json_decode($value,true) : '';
} }
} }

2
app/common/model/build/BuildProcessSettings.php
View File

@ -32,6 +32,6 @@ class BuildProcessSettings extends BaseModel
public function getAnnexAttr($value) public function getAnnexAttr($value)
{ {
return json_decode($value,true); return !empty($value) ? json_decode($value,true) : '';
} }
} }

2
app/common/model/build/BuildReport.php
View File

@ -32,6 +32,6 @@ class BuildReport extends BaseModel
public function getSceneFileAttr($value) public function getSceneFileAttr($value)
{ {
return json_decode($value,true); return !empty($value) ? json_decode($value,true) : '';
} }
} }

4
app/common/model/custom/CustomFollow.php
View File

@ -38,7 +38,7 @@ class CustomFollow extends BaseModel
public function getAnnexAttr($value) public function getAnnexAttr($value)
{ {
return empty($value) ? null : json_decode($value,true); return !empty($value) ? json_decode($value,true) : '';
} }
public function getNextFollowDateAttr($value): string public function getNextFollowDateAttr($value): string
@ -48,6 +48,6 @@ class CustomFollow extends BaseModel
public function getTypesTextAttr($value,$data){ public function getTypesTextAttr($value,$data){
$dictData = DictData::where('type_value','custom_follow_type')->column('name','value'); $dictData = DictData::where('type_value','custom_follow_type')->column('name','value');
return $dictData[$data['types']]; return !empty($data['types']) ? $dictData[$data['types']] : '';
} }
} }

2
app/common/model/custom/CustomerDemand.php
View File

@ -44,6 +44,6 @@ class CustomerDemand extends BaseModel
public function getAnnexAttr($value) public function getAnnexAttr($value)
{ {
return empty($value) ? null : json_decode($value,true); return !empty($value) ? json_decode($value,true) : '';
} }
} }

2
app/common/model/custom/CustomerDemandSolution.php
View File

@ -32,7 +32,7 @@ class CustomerDemandSolution extends BaseModel
public function getAnnexAttr($value) public function getAnnexAttr($value)
{ {
return empty($value) ? null : json_decode($value,true); return !empty($value) ? json_decode($value,true) : '';
} }
public function getSubmissionTimeAttr($value): string public function getSubmissionTimeAttr($value): string

2
app/common/model/material/Material.php
View File

@ -32,6 +32,6 @@ class Material extends BaseModel
public function getAnnexAttr($value) public function getAnnexAttr($value)
{ {
return empty($value) ? null : json_decode($value,true); return !empty($value) ? json_decode($value,true) : '';
} }
} }

2
app/common/model/material/MaterialWarehouse.php
View File

@ -32,7 +32,7 @@ class MaterialWarehouse extends BaseModel
public function getAnnexAttr($value) public function getAnnexAttr($value)
{ {
return empty($value) ? null : json_decode($value,true); return !empty($value) ? json_decode($value,true) : '';
} }
public function getIsMrpTextAttr($value,$data): string public function getIsMrpTextAttr($value,$data): string

2
app/common/model/project/Competitor.php
View File

@ -32,6 +32,6 @@ class Competitor extends BaseModel
public function getAnnexAttr($value) public function getAnnexAttr($value)
{ {
return empty($value) ? null : json_decode($value,true); return !empty($value) ? json_decode($value,true) : '';
} }
} }

2
app/common/model/project/Project.php
View File

@ -124,6 +124,6 @@ class Project extends BaseModel
public function getAnnexAttr($value) public function getAnnexAttr($value)
{ {
return empty($value) ? null : json_decode($value,true); return !empty($value) ? json_decode($value,true) : '';
} }
} }

2
app/common/model/project/ProjectAttendanceRecord.php
View File

@ -32,7 +32,7 @@ class ProjectAttendanceRecord extends BaseModel
public function getFileAttr($value) public function getFileAttr($value)
{ {
return json_decode($value,true); return !empty($value) ? json_decode($value,true) : '';
} }
public function getAttendanceDateAttr($value): string public function getAttendanceDateAttr($value): string
{ {

4
app/common/model/project/ProjectEstimate.php
View File

@ -34,7 +34,7 @@ class ProjectEstimate extends BaseModel
public function getEstimateSourceTextAttr($value,$data) public function getEstimateSourceTextAttr($value,$data)
{ {
$dictData = DictData::where('type_value','estimate_source')->column('name','value'); $dictData = DictData::where('type_value','estimate_source')->column('name','value');
return $dictData[$data['estimate_source']]; return !empty($data['estimate_source']) ? $dictData[$data['estimate_source']] : '';
} }
public function getInvoiceTypeTextAttr($value,$data) public function getInvoiceTypeTextAttr($value,$data)
{ {
@ -45,7 +45,7 @@ class ProjectEstimate extends BaseModel
public function getAnnexAttr($value) public function getAnnexAttr($value)
{ {
return empty($value) ? null : json_decode($value,true); return !empty($value) ? json_decode($value,true) : '';
} }
public function getQuotationDateAttr($value): string public function getQuotationDateAttr($value): string

2
app/common/model/project/ProjectInsuranceManagement.php
View File

@ -32,7 +32,7 @@ class ProjectInsuranceManagement extends BaseModel
public function getAnnexAttr($value) public function getAnnexAttr($value)
{ {
return json_decode($value,true); return !empty($value) ? json_decode($value,true) : '';
} }
public function getInsuranceDateAttr($value): string public function getInsuranceDateAttr($value): string

10
app/common/model/project/ProjectManagerAppointment.php
View File

@ -32,21 +32,21 @@ class ProjectManagerAppointment extends BaseModel
public function getProjectApprovalDateAttr($value) public function getProjectApprovalDateAttr($value)
{ {
return date('Y-m-d',$value); return !empty($value) ? date('Y-m-d',$value) : '';
} }
public function getStartDateAttr($value) public function getStartDateAttr($value)
{ {
return date('Y-m-d',$value); return !empty($value) ? date('Y-m-d',$value) : '';
} }
public function getDeliveryDateAttr($value) public function getDeliveryDateAttr($value)
{ {
return date('Y-m-d',$value); return !empty($value) ? date('Y-m-d',$value) : '';
} }
public function getannexAttr($value) public function getAnnexAttr($value)
{ {
return json_decode($value,true); return !empty($value) ? json_decode($value,true) : '';
} }
} }

4
app/common/model/project/ProjectMilestones.php
View File

@ -33,12 +33,12 @@ class ProjectMilestones extends BaseModel
public function getProjectMilestonesDateAttr($value): string public function getProjectMilestonesDateAttr($value): string
{ {
return date('Y-m-d',$value); return !empty($value) ? date('Y-m-d',$value) : '';
} }
public function getProjectMilestonesTextAttr($value,$data) public function getProjectMilestonesTextAttr($value,$data)
{ {
$dictDate = DictData::where('type_value','project_milestones')->column('name','value'); $dictDate = DictData::where('type_value','project_milestones')->column('name','value');
return $dictDate[$data['project_milestones']]; return !empty($data['project_milestones']) ? $dictDate[$data['project_milestones']] : '';
} }
} }

10
app/common/model/project/ProjectPlan.php
View File

@ -32,21 +32,21 @@ class ProjectPlan extends BaseModel
public function getStartTimeAttr($value) public function getStartTimeAttr($value)
{ {
return date('Y-m-d',$value); return !empty($value) ? date('Y-m-d',$value) : '';
} }
public function getDeliverTimeAttr($value) public function getDeliverTimeAttr($value)
{ {
return date('Y-m-d',$value); return !empty($value) ? date('Y-m-d',$value) : '';
} }
public function getDeclareTimeAttr($value) public function getDeclareTimeAttr($value)
{ {
return date('Y-m-d',$value); return !empty($value) ? date('Y-m-d',$value) : '';
} }
public function getannexAttr($value) public function getAnnexAttr($value)
{ {
return json_decode($value,true); return !empty($value) ? json_decode($value,true) : '';
} }
} }

4
app/common/model/project/ProjectSalaryPayment.php
View File

@ -33,7 +33,7 @@ class ProjectSalaryPayment extends BaseModel
public function getAnnexAttr($value) public function getAnnexAttr($value)
{ {
return json_decode($value,true); return !empty($value) ? json_decode($value,true) : '';
} }
public function getApplyDateAttr($value): string public function getApplyDateAttr($value): string
@ -44,6 +44,6 @@ class ProjectSalaryPayment extends BaseModel
public function getPaymentTypeAttr($value,$data): string public function getPaymentTypeAttr($value,$data): string
{ {
$dictData = DictData::where('type_value','salary_payment_type')->column('name','value'); $dictData = DictData::where('type_value','salary_payment_type')->column('name','value');
return $dictData[$data['payment_type']]; return !empty($data['payment_type']) ? $dictData[$data['payment_type']] : '';
} }
} }

2
app/common/model/project/ProjectSettlement.php
View File

@ -32,7 +32,7 @@ class ProjectSettlement extends BaseModel
public function getAnnexAttr($value) public function getAnnexAttr($value)
{ {
return json_decode($value,true); return !empty($value) ? json_decode($value,true) : '';
} }
public function getSettlementDateAttr($value): string public function getSettlementDateAttr($value): string

2
app/common/model/project/ProjectSubcontractSettlement.php
View File

@ -32,7 +32,7 @@ class ProjectSubcontractSettlement extends BaseModel
public function getAnnexAttr($value) public function getAnnexAttr($value)
{ {
return json_decode($value,true); return !empty($value) ? json_decode($value,true) : '';
} }
public function getSettlementDateAttr($value): string public function getSettlementDateAttr($value): string

2
app/common/model/quality/QualityAccept.php
View File

@ -32,7 +32,7 @@ class QualityAccept extends BaseModel
public function getFileAttr($value) public function getFileAttr($value)
{ {
return json_decode($value,true); return !empty($value) ? json_decode($value,true) : '';
} }
public function getAcceptDateAttr($value): string public function getAcceptDateAttr($value): string

2
app/common/model/quality/QualityAccident.php
View File

@ -32,7 +32,7 @@ class QualityAccident extends BaseModel
public function getFileAttr($value) public function getFileAttr($value)
{ {
return json_decode($value,true); return !empty($value) ? json_decode($value,true) : '';
} }
public function getHappenDateAttr($value): string public function getHappenDateAttr($value): string

2
app/common/model/quality/QualityDetection.php
View File

@ -32,7 +32,7 @@ class QualityDetection extends BaseModel
public function getFileAttr($value) public function getFileAttr($value)
{ {
return json_decode($value,true); return !empty($value) ? json_decode($value,true) : '';
} }
public function getScheduledStartTimeAttr($value): string public function getScheduledStartTimeAttr($value): string

4
app/common/model/quality/QualityDetectionTemp.php
View File

@ -33,11 +33,11 @@ class QualityDetectionTemp extends BaseModel
public function getFileAttr($value) public function getFileAttr($value)
{ {
return json_decode($value,true); return !empty($value) ? json_decode($value,true) : '';
} }
public function getNodeTextAttr($value,$data) { public function getNodeTextAttr($value,$data) {
$dictData = DictData::where('type_value','quality_detection_node')->column('name','value'); $dictData = DictData::where('type_value','quality_detection_node')->column('name','value');
return $dictData[$data['node']]; return !empty($data['node']) ? $dictData[$data['node']] : '';
} }
} }

2
app/common/model/quality/QualityEvent.php
View File

@ -32,7 +32,7 @@ class QualityEvent extends BaseModel
public function getFileAttr($value) public function getFileAttr($value)
{ {
return json_decode($value,true); return !empty($value) ? json_decode($value,true) : '';
} }
public function getHappenDateAttr($value): string public function getHappenDateAttr($value): string

2
app/common/model/quality/QualityMbo.php
View File

@ -32,6 +32,6 @@ class QualityMbo extends BaseModel
public function getFileAttr($value) public function getFileAttr($value)
{ {
return json_decode($value,true); return !empty($value) ? json_decode($value,true) : '';
} }
} }

2
app/common/model/quality/QualitySpecification.php
View File

@ -37,6 +37,6 @@ class QualitySpecification extends BaseModel
public function getFileAttr($value) public function getFileAttr($value)
{ {
return json_decode($value,true); return !empty($value) ? json_decode($value,true) : '';
} }
} }

2
app/common/model/quality/QualitySupervise.php
View File

@ -32,7 +32,7 @@ class QualitySupervise extends BaseModel
public function getFileAttr($value) public function getFileAttr($value)
{ {
return json_decode($value,true); return !empty($value) ? json_decode($value,true) : '';
} }
public function getHappenDateAttr($value): string public function getHappenDateAttr($value): string

2
app/common/model/safety/SafetyAccident.php
View File

@ -32,7 +32,7 @@ class SafetyAccident extends BaseModel
public function getFileAttr($value) public function getFileAttr($value)
{ {
return json_decode($value,true); return !empty($value) ? json_decode($value,true) : '';
} }
public function getHappenTimeAttr($value): string public function getHappenTimeAttr($value): string

2
app/common/model/safety/SafetyCheck.php
View File

@ -32,7 +32,7 @@ class SafetyCheck extends BaseModel
public function getFileAttr($value) public function getFileAttr($value)
{ {
return json_decode($value,true); return !empty($value) ? json_decode($value,true) : '';
} }
public function getCheckDateAttr($value): string public function getCheckDateAttr($value): string

2
app/common/model/safety/SafetyEmergencyPlan.php
View File

@ -32,7 +32,7 @@ class SafetyEmergencyPlan extends BaseModel
public function getFileAttr($value) public function getFileAttr($value)
{ {
return json_decode($value,true); return !empty($value) ? json_decode($value,true) : '';
} }
public function getHappenDateAttr($value): string public function getHappenDateAttr($value): string

2
app/common/model/safety/SafetyEvaluate.php
View File

@ -32,7 +32,7 @@ class SafetyEvaluate extends BaseModel
public function getFileAttr($value) public function getFileAttr($value)
{ {
return json_decode($value,true); return !empty($value) ? json_decode($value,true) : '';
} }
public function getHappenDateAttr($value): string public function getHappenDateAttr($value): string

2
app/common/model/safety/SafetyEvent.php
View File

@ -32,7 +32,7 @@ class SafetyEvent extends BaseModel
public function getFileAttr($value) public function getFileAttr($value)
{ {
return json_decode($value,true); return !empty($value) ? json_decode($value,true) : '';
} }
public function getHappenTimeAttr($value): string public function getHappenTimeAttr($value): string

2
app/common/model/safety/SafetyHazard.php
View File

@ -32,6 +32,6 @@ class SafetyHazard extends BaseModel
public function getFileAttr($value) public function getFileAttr($value)
{ {
return json_decode($value,true); return !empty($value) ? json_decode($value,true) : '';
} }
} }

2
app/common/model/safety/SafetyProductMonth.php
View File

@ -32,6 +32,6 @@ class SafetyProductMonth extends BaseModel
public function getFileAttr($value) public function getFileAttr($value)
{ {
return json_decode($value,true); return !empty($value) ? json_decode($value,true) : '';
} }
} }

2
app/common/model/safety/SafetyRehearsal.php
View File

@ -32,7 +32,7 @@ class SafetyRehearsal extends BaseModel
public function getFileAttr($value) public function getFileAttr($value)
{ {
return json_decode($value,true); return !empty($value) ? json_decode($value,true) : '';
} }
public function getHappenDateAttr($value): string public function getHappenDateAttr($value): string

2
app/common/model/safety/SafetyStandard.php
View File

@ -32,6 +32,6 @@ class SafetyStandard extends BaseModel
public function getFileAttr($value) public function getFileAttr($value)
{ {
return json_decode($value,true); return !empty($value) ? json_decode($value,true) : '';
} }
} }

2
app/common/model/safety/SafetySupervise.php
View File

@ -32,7 +32,7 @@ class SafetySupervise extends BaseModel
public function getFileAttr($value) public function getFileAttr($value)
{ {
return json_decode($value,true); return !empty($value) ? json_decode($value,true) : '';
} }
public function getHappenTimeAttr($value): string public function getHappenTimeAttr($value): string

2
app/common/model/safety/SafetyTarget.php
View File

@ -32,6 +32,6 @@ class SafetyTarget extends BaseModel
public function getFileAttr($value) public function getFileAttr($value)
{ {
return json_decode($value,true); return !empty($value) ? json_decode($value,true) : '';
} }
} }

10
app/common/model/supplier/Supplier.php
View File

@ -33,12 +33,12 @@ class Supplier extends BaseModel
public function getAnnexAttr($value) public function getAnnexAttr($value)
{ {
return empty($value) ? null : json_decode($value,true); return !empty($value) ? json_decode($value,true) : '';
} }
public function getSupplierPhotosAttr($value) public function getSupplierPhotosAttr($value)
{ {
return empty($value) ? null : json_decode($value,true); return !empty($value) ? json_decode($value,true) : '';
} }
public function getBirthdayAttr($value): string public function getBirthdayAttr($value): string
@ -56,19 +56,19 @@ class Supplier extends BaseModel
public function getSupplierGroupTextAttr($value,$data): string public function getSupplierGroupTextAttr($value,$data): string
{ {
$dict = DictData::where('type_value','supplier_group')->column('name','value'); $dict = DictData::where('type_value','supplier_group')->column('name','value');
return $dict[$data['supplier_group']]; return !empty($data['supplier_group']) ? $dict[$data['supplier_group']] : '';
} }
public function getSupplierCategoryTextAttr($value,$data): string public function getSupplierCategoryTextAttr($value,$data): string
{ {
$dict = DictData::where('type_value','supplier_category')->column('name','value'); $dict = DictData::where('type_value','supplier_category')->column('name','value');
return $dict[$data['supplier_category']]; return !empty($data['supplier_category']) ? $dict[$data['supplier_category']] : '';
} }
public function getSupplierGradeTextAttr($value,$data): string public function getSupplierGradeTextAttr($value,$data): string
{ {
$dict = DictData::where('type_value','supplier_grade')->column('name','value'); $dict = DictData::where('type_value','supplier_grade')->column('name','value');
return $dict[$data['supplier_grade']]; return !empty($data['supplier_grade']) ? $dict[$data['supplier_grade']] : '';
} }
} }