liugc vor 1 Jahr
Ursprung
Commit
bc81f36f46

+ 2 - 2
app/adminapi/lists/master_worker/EngineerBillLists.php

@@ -58,7 +58,7 @@ class EngineerBillLists extends BaseAdminDataLists implements ListsSearchInterfa
         $deadline_time = strtotime($this->params['deadline_time'])+86400;
         $settlement_type = $this->params['settlement_type'];
         return Db::name('master_worker')->alias('a')->field([
-            'a.id','a.real_name','a.nickname','a.worker_number','e.account_holder','e.bank_name','e.opening_branch','e.account as bank_account',
+            'a.id','a.real_name','a.nickname','a.worker_number','a.user_money','e.account_holder','e.bank_name','e.opening_branch','e.account as bank_account',
             Db::raw("sum(b.amount_change) as left_amount")
         ])
             ->leftJoin('master_settlement_details b', 'a.id = b.master_worker_id AND b.status = 1')
@@ -104,7 +104,7 @@ class EngineerBillLists extends BaseAdminDataLists implements ListsSearchInterfa
         $deadline_time = strtotime($this->params['deadline_time'])+86400;
         $settlement_type = $this->params['settlement_type'];
         return Db::name('master_worker')->alias('a')->field([
-                'a.id','a.real_name','a.nickname','a.worker_number','e.account_holder','e.bank_name','e.opening_branch','e.account as bank_account',
+                'a.id','a.real_name','a.nickname','a.worker_number','a.user_money','e.account_holder','e.bank_name','e.opening_branch','e.account as bank_account',
                 Db::raw("sum(amount_change) as left_amount")
             ])
             ->leftJoin('master_settlement_details b', 'a.id = b.master_worker_id AND b.status = 1')

+ 1 - 1
app/adminapi/logic/financial/MasterSettlementDetailsLogic.php

@@ -199,7 +199,7 @@ class MasterSettlementDetailsLogic extends BaseLogic
         // 生成 可发 数据表格
         Db::name('engineer_settlement')->insertAll($insertXlsData);
 
-        Log::write('insertXlsData', 'info',$insertXlsData);
+        Log::info('insertXlsData:'.json_encode($insertXlsData));
         return $insertXlsData;
     }