liugc преди 10 месеца
родител
ревизия
8e5aa9735c

+ 1 - 1
app/common/model/external/ExternalPlatform.php

@@ -27,7 +27,7 @@ class ExternalPlatform extends BaseModel
 
 
     public static function getPlatformConfig($platform_id,$config_value=null){
-        $config_data = json_decode(ExternalPlatform::where('id', $platform_id)->value('config_data')??[],  true);
+        $config_data = json_decode(ExternalPlatform::where('id', $platform_id)->value('config_data')??"{}",  true);
         if(empty($config_value)){
             return $config_data;
         }

+ 1 - 1
app/common/model/master_worker/EngineerSettlementPermanently.php

@@ -40,7 +40,7 @@ class EngineerSettlementPermanently extends BaseModel
 
     public function salaryItemPermanently()
     {
-        return $this->hasMany(SalaryItemPermanently::class, 'permanently_settlement_id', 'id');
+        return $this->hasMany(SalaryItemPermanently::class, 'permanently_settlement_id', 'id')->append(['term_text']);
     }
 
 }

+ 9 - 0
app/common/model/master_worker/SalaryItemPermanently.php

@@ -16,6 +16,7 @@ namespace app\common\model\master_worker;
 
 
 use app\common\model\BaseModel;
+use app\common\model\dict\DictData;
 use app\common\model\works\ReturnWork;
 use app\common\model\works\ServiceWork;
 use think\facade\Log;
@@ -31,6 +32,14 @@ class SalaryItemPermanently extends BaseModel
     
     protected $name = 'salary_item_permanently';
 
+
+    public function getTermTextAttr($value,$data):string
+    {
+        $dictData = DictData::whereIn('type_value', 'salary_item')->column('name','value');
+        return $dictData[$data['term']] ?? '';
+    }
+
+
     // 接单服务费
     public function salary_item_1($permanently_settlement_id,$master_worker_id,$params,$extra = [])
     {