liugc 9 maanden geleden
bovenliggende
commit
57fdb83f04
1 gewijzigde bestanden met toevoegingen van 3 en 0 verwijderingen
  1. 3 0
      app/common/model/master_worker/SalaryItemPermanently.php

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

@@ -64,6 +64,7 @@ class SalaryItemPermanently extends BaseModel
                     $amount += (float)bcsub($item['work_amount'] ,$item['spare_total']);//(float)bcmul(, $ratio,2);
                     $amount += (float)bcsub($item['work_amount'] ,$item['spare_total']);//(float)bcmul(, $ratio,2);
                     $spare_total += $item['spare_total'];
                     $spare_total += $item['spare_total'];
                 }
                 }
+                $amount < 0 && $amount = 0.00;
                 $term_amount = (float)bcmul($amount, $ratio,2);
                 $term_amount = (float)bcmul($amount, $ratio,2);
 
 
                 $itemData = [
                 $itemData = [
@@ -107,6 +108,7 @@ class SalaryItemPermanently extends BaseModel
             foreach ($order_list as $item) {
             foreach ($order_list as $item) {
                 $amount += (float)bcsub($item['work_amount'] ,$item['spare_total']);//(float)bcmul(, $ratio,2);
                 $amount += (float)bcsub($item['work_amount'] ,$item['spare_total']);//(float)bcmul(, $ratio,2);
             }
             }
+            $amount < 0 && $amount = 0.00;
             $term_amount = (float)bcmul($amount, $ratio,2);
             $term_amount = (float)bcmul($amount, $ratio,2);
 
 
             $itemData = [
             $itemData = [
@@ -388,6 +390,7 @@ class SalaryItemPermanently extends BaseModel
                     $amount += (float)bcsub($item['work_amount'] ,$item['spare_total']);//(float)bcmul(, $ratio,2);
                     $amount += (float)bcsub($item['work_amount'] ,$item['spare_total']);//(float)bcmul(, $ratio,2);
                     $spare_total += $item['spare_total'];
                     $spare_total += $item['spare_total'];
                 }
                 }
+                $amount < 0 && $amount = 0.00;
                 $term_amount = (float)bcmul($amount, $ratio,2);
                 $term_amount = (float)bcmul($amount, $ratio,2);
 
 
                 $itemData = [
                 $itemData = [