commit

app/api/controller/water/WaterQueryController.php

@@ -117,11 +117,12 @@ class WaterQueryController
         $table = [];
         $zj = 0; //总价
         $zzl = 0; // 总重量
-        if ($data['is_gc'] > 0){
-            $where[] = ['is_gc', '=' ,1];
-        }else{
-            $where[] = ['is_gc', '=' ,0];
-        }
+        $where[] = [];
+//        if ($data['is_gc'] > 0){
+//            $where[] = ['is_gc', '=' ,1];
+//        }else{
+//            $where[] = ['is_gc', '=' ,0];
+//        }
         foreach ($calculation['roof_number'] as $k => $v){
             if ($k == '1*1'){
                 $details = WaterMaterialScience::where('cate_id', $data['roof'])->where($where)->where([['long', '=', 1], ['wide', '=', 1]])->find();
@@ -143,6 +144,7 @@ class WaterQueryController
                 $table[] = ['title' => '顶板','name' => $details['name'], 'specifications' => $details['long'].'*'.$details['wide'], 'number' => $v, 'unit_price' => $details['unit_price'], 'company' => $details['company'], 'ot_price' => $details['unit_price'] * $v, 'weight' => $details['weight'] * $v , 'type' => 1];
             }
         }
+
         // 底板
         $science = WaterMaterialScience::where('cate_id', $data['floor'])->order('wide DESC')->select()->toArray();
         if (count($science) == 1){
@@ -256,7 +258,7 @@ class WaterQueryController
             $table[] = ['title' => '扶梯' , 'name' => $details['name'], 'specifications' => '1', 'number' => $calculation['ladder'], 'unit_price' => $details['unit_price'], 'company' => $details['company'], 'ot_price' => $details['unit_price'] * $calculation['ladder'], 'weight' => $details['weight'] * $calculation['ladder'] , 'type' => 9];
         }
         foreach ($table as &$i){
-            $i['ot_price'] = number_format($i['ot_price'], 2);
+            $i['ot_price'] = round($i['ot_price'], 2);
         }
 
         return ['table' => $table, 'zj' => $zj, 'zzl' => $zzl];
@@ -467,13 +469,19 @@ class WaterQueryController
      */
     public function list()
     {
+        $data = UtilService::getMore(['is_gc' , 0]);
+        if ($data['is_gc'] > 0){
+            $where[] = ['is_gc', '=' ,1];
+        }else{
+            $where[] = ['is_gc', '=' ,0];
+        }
         $list = [];
         $list['warm'] = WaterCate::field('id,name')->where('type', 7)->select(); // 保温
         $list['channel'] =  WaterCate::field('id,name')->where('type', 8)->select(); // 槽钢
-        $list['roof'] =  WaterCate::field('id,name')->where('type', 1)->select();// 顶板
-        $list['side_plate'] =  WaterCate::field('id,name')->where('type', 2)->select();// 侧板
+        $list['roof'] =  WaterCate::field('id,name')->where('type', 1)->where($where)->select();// 顶板
+        $list['side_plate'] =  WaterCate::field('id,name')->where('type', 2)->where($where)->select();// 侧板
         $list['lacing'] =  WaterCate::field('id,name')->where('type', 3)->select();// 拉筋
-        $list['floor'] =  WaterCate::field('id,name')->where('type', 4)->select(); // 底板
+        $list['floor'] =  WaterCate::field('id,name')->where('type', 4)->where($where)->select(); // 底板
         $list['column'] =  WaterCate::field('id,name')->where('type', 5)->select(); // 立柱
         $list['fula'] =  WaterCate::field('id,name')->where('type', 6)->select(); // 辅拉