From cb1fc1e0d99dfca1c889621a247aaa248ad4b874 Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Sat, 18 Nov 2023 17:13:18 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/CropYieldController.php | 48 ++++++++++----------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/app/Http/Controllers/CropYieldController.php b/app/Http/Controllers/CropYieldController.php
index 8e3b2ae..1e78032 100644
--- a/app/Http/Controllers/CropYieldController.php
+++ b/app/Http/Controllers/CropYieldController.php
@@ -160,29 +160,31 @@ class CropYieldController extends Controller
         ];
         if ($crop?->is_end) {
             $staticCropIds[] = $crop->id;
-            if ($crop->extends) {
-                $i = 0;
-                if(is_array($crop->extends)){
-                    $extends = $crop->extends;
-                }else{
-                    $extends = json_decode($crop->extends, true);
-                }
-                foreach ($extends as $item) {
-                    $i++;
-                    $_key = 'extend_'.$i;
-                    $staticsData[$_key] = [
-                        'name' => $item['name'],
-                        'unit' => $item['unit'],
-                        'list' => [
-                            '第1季度' => null,
-                            '第2季度' => null,
-                            '第3季度' => null,
-                            '第4季度' => null,
-                        ],
-                    ];
-                    $extendsQ .= ", sum((extends->> '".$item['name']."')::NUMERIC) as extend_".$i.'_total ';
-                }
-            }
+            
+            //注释掉扩展字段统计情况
+            // if ($crop->extends) {
+            //     $i = 0;
+            //     if(is_array($crop->extends)){
+            //         $extends = $crop->extends;
+            //     }else{
+            //         $extends = json_decode($crop->extends, true);
+            //     }
+            //     foreach ($extends as $item) {
+            //         $i++;
+            //         $_key = 'extend_'.$i;
+            //         $staticsData[$_key] = [
+            //             'name' => $item['name'],
+            //             'unit' => $item['unit'],
+            //             'list' => [
+            //                 '第1季度' => null,
+            //                 '第2季度' => null,
+            //                 '第3季度' => null,
+            //                 '第4季度' => null,
+            //             ],
+            //         ];
+            //         $extendsQ .= ", sum((extends->> '".$item['name']."')::NUMERIC) as extend_".$i.'_total ';
+            //     }
+            // }
         } else {
             $cropQ = Crop::query();
             if ($crop) {

From bf6f152fbc9a6d5bb813cf5c3fb9741f638b2885 Mon Sep 17 00:00:00 2001
From: Jing Li <lym125@gmail.com>
Date: Tue, 28 Nov 2023 11:46:38 +0800
Subject: [PATCH 2/2] Update

---
 app/Http/Requestes/DeviceRequest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Requestes/DeviceRequest.php b/app/Http/Requestes/DeviceRequest.php
index e871d86..93b287e 100644
--- a/app/Http/Requestes/DeviceRequest.php
+++ b/app/Http/Requestes/DeviceRequest.php
@@ -23,7 +23,7 @@ class DeviceRequest extends FormRequest
             'sn' => 'required|string|max:64',
             'monitoring_point' => 'required|string|max:100',
             'supplier_key' => 'required',
-            'extends' => 'required_if:type,1',
+            // 'extends' => 'required_if:type,1',
             // 'extends.ip' => 'required_if:type,1|string',
             // 'extends.port' => 'required_if:type,1|string',
             // 'extends.rtsp_url' => 'required_if:type,1|string',