Browse Source

add - 长期工程师结算

liugc 1 year ago
parent
commit
074103f997

+ 1 - 1
app/adminapi/lists/master_worker/EngineerSettlementPermanentlyLists.php

@@ -46,7 +46,7 @@ class EngineerSettlementPermanentlyLists extends BaseAdminDataLists implements L
     public function queryWhere(){
         $where = [];
         if(isset($this->params['settlement_time']) && empty($this->params['settlement_time'])){
-            //$where[] = ['settlement_time', '=', ''];
+            $where[] = ['settlement_time', '=', ''];
         }
 
         /*if(isset($this->params['']) && $this->params['audit_state']!=''){

+ 10 - 1
app/adminapi/logic/master_worker/EngineerSettlementPermanentlyLogic.php

@@ -118,7 +118,16 @@ class EngineerSettlementPermanentlyLogic extends BaseLogic
      */
     public static function detail($params): array
     {
-        return EngineerSettlementPermanently::findOrEmpty($params['id'])->toArray();
+         function getAllSalary($salaryItemPermanently): float {
+            $all_salary = 0.00;
+            foreach ($salaryItemPermanently as $item) {
+                $all_salary += $item['term_amount'];
+            }
+            return $all_salary;
+        }
+        $item = EngineerSettlementPermanently::with(['bankAccount','workerInfo','salaryItemPermanently'])->findOrEmpty($params['id'])->toArray();
+        $item['all_salary'] = getAllSalary($item['salaryItemPermanently']);
+        return $item;
     }
 
     /**