From a7d0396a968e93a23240dc498bf1bc6325ab9ae7 Mon Sep 17 00:00:00 2001
From: zengchaoxin <zengchaoxin@gmail.com>
Date: Mon, 4 Nov 2019 16:52:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/models/CarT.php                     |  6 +-----
 frontend/controllers/FinanceController.php | 12 ++++++------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/common/models/CarT.php b/common/models/CarT.php
index c972f75..c4f9d57 100644
--- a/common/models/CarT.php
+++ b/common/models/CarT.php
@@ -175,11 +175,7 @@ class CarT extends \common\models\Base
         switch($this->location) {
             case 1:
                 $car=CarT::findOne(['id'=>$this->id]);
-                if($car->qiyong==2){
-                    $name = 'A库(永不启用)';
-                }else{
-                    $name = 'A库';
-                }
+                $name = 'A库';
                 break;
             case 2:
                 $carb=CarBT::findOne(['id'=>$this->id]);
diff --git a/frontend/controllers/FinanceController.php b/frontend/controllers/FinanceController.php
index d2bd428..606a512 100644
--- a/frontend/controllers/FinanceController.php
+++ b/frontend/controllers/FinanceController.php
@@ -3264,18 +3264,18 @@ class FinanceController extends \frontend\controllers\UserBaseController
 
         for ($i = 7; $i <= $rowCount; $i++) {
             $cell = $currentSheet->getCellByColumnAndRow(1, $i);
-            $insurer_no = $cell->getValue();//$data[$i][1];
+            $insurer_no = $cell->getFormattedValue();//$data[$i][1];
 //            var_dump($insurer_no);
             $cell = $currentSheet->getCellByColumnAndRow(2, $i);
-            $policy_man = $cell->getValue();//$data[$i][2];
+            $policy_man = $cell->getFormattedValue();//$data[$i][2];
             $cell = $currentSheet->getCellByColumnAndRow(3, $i);
-            $total_real = $cell->getValue();//$data[$i][3];
+            $total_real = $cell->getFormattedValue();//$data[$i][3];
             $cell = $currentSheet->getCellByColumnAndRow(4, $i);
-            $total_rate = $cell->getValue();//$data[$i][4];
+            $total_rate = $cell->getFormattedValue();//$data[$i][4];
             $cell = $currentSheet->getCellByColumnAndRow(5, $i);
-            $pay_total = $cell->getValue();//$data[$i][5];
+            $pay_total = $cell->getFormattedValue();//$data[$i][5];
             $cell = $currentSheet->getCellByColumnAndRow(6, $i);
-            $insurer_total = $cell->getValue();//$data[$i][6];
+            $insurer_total = $cell->getFormattedValue();//$data[$i][6];
             $cell = $currentSheet->getCellByColumnAndRow(7, $i);
             $insurer_date = $cell->getFormattedValue();
 //            var_dump($insurer_date);