From bc0ea46c1720627a4de62ebb6c3f25cb0c001386 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BD=AD=E6=A1=83?= <1098598843@qq.com>
Date: Fri, 10 Feb 2023 10:04:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/Census.php | 59 +++++++++++++++++++++++------------
 1 file changed, 39 insertions(+), 20 deletions(-)

diff --git a/app/api/controller/Census.php b/app/api/controller/Census.php
index da442d1..d88ccfc 100644
--- a/app/api/controller/Census.php
+++ b/app/api/controller/Census.php
@@ -105,6 +105,11 @@ class Census extends BaseController
             ->where($where)
             ->join(['fa_szxc_information_planting'=>'p'], 'u.user_id = p.user_id and p.nature_of_land=217')->sum('p.land_area');
         //养殖
+        $sum_yz = Db::table('fa_szxc_information_useraddress')
+            ->alias('u')
+            ->where($where)
+            ->join(['fa_szxc_information_planting'=>'p'], 'u.user_id = p.user_id and p.nature_of_land=216')->sum('p.land_area');
+        //养殖面积
         $sum_216 = Db::table('fa_szxc_information_useraddress')
             ->alias('u')
             ->where($where)
@@ -149,22 +154,38 @@ class Census extends BaseController
         $zhouqi = Db::table('cms_agriculture_products_traceability')
                 ->withAttr('content', function ($value, $data) {
                     if ($data['content'] != '') {
-                        return json_decode($data['content'],1);
+                        $cont = json_decode($data['content'],1);
+                        foreach ($cont as $k => $v){
+                            $cont[$k]['cjl'] = '昨日成交量提示15%';
+                        }
+                        return $cont;
                     }else{
                         return '';
                     }
+
                 })
                 ->where('status',1)->field('content')->select();
 
-        $result = [
-            ['name' => '总人口','value'=>$num],
-            ['name' => '农产品种类','value'=>$cms_agriculture_products],
-            ['name' => '加工和品牌企业数量','value'=>$num_1],
-            ['name' => '种植面积','value'=>$zz_mianji],
-            ['name' => '养殖面积','value'=>$sum_216],
-            ['name' => '荒地面积','value'=>$waste_land_area],
-            ['name' => '企业农产品销量','value'=>$num_2],
-            ['name' => '企业采购的农产品','value'=>$num_3],
+        $return['index'] = [
+                ['name' => '总人口','value'=>$num.'人'],
+                ['name' => '农产品种类','value'=>$cms_agriculture_products.'种'],
+                ['name' => '品牌企业','value'=>$num_1.'家'],
+                ['name' => '种植面积','value'=>$zz_mianji],
+                ['name' => '养殖面积','value'=>$sum_216],
+                ['name' => '荒地面积','value'=>$waste_land_area],
+            ];
+        $return['xingzhi'] = [
+            ['name' => '农田水利','value'=>$sum_218],
+            ['name' => '坑塘','value'=>$sum_217],
+            ['name' => '养殖','value'=>$sum_yz],
+            ['name' => '牧草地','value'=>$sum_215],
+            ['name' => '林地','value'=>$sum_214],
+            ['name' => '耕地','value'=>$sum_70],
+            ['name' => '园地','value'=>$sum_69],
+        ];
+        $return['qita'] = [
+            ['name' => '农产品销量','value'=>$num_2.'单'],
+            ['name' => '农产采购量','value'=>$num_3.'单'],
             ['name' => '已录入商户','value'=>$num_4],
             ['name' => '大于60岁人数','value'=>$old_num],
             ['name' => '儿童人数','value'=>$children_num],
@@ -174,18 +195,16 @@ class Census extends BaseController
             ['name' => '汉族','value'=>$nation_h_num],
             ['name' => '残疾人数','value'=>$whether_disabled_num],
             ['name' => '参保人数','value'=>$insurance_type_num],
-            ['name' => '土地总面积','value'=>$land_area_num],
-            ['name' => '农田水利','value'=>$sum_218],
-            ['name' => '坑塘','value'=>$sum_217],
-            ['name' => '牧草地','value'=>$sum_215],
-            ['name' => '林地','value'=>$sum_214],
-            ['name' => '耕地','value'=>$sum_70],
-            ['name' => '园地','value'=>$sum_69],
-            ['name' => '蔬菜基地数量','value'=>$cms_manufacturer],
-            ['name' => '农贸市场数量','value'=>$cms_farm_product_market],
+            ['name' => '蔬菜基地数量','value'=>$cms_manufacturer.'个'],
+            ['name' => '农贸市场数量','value'=>$cms_farm_product_market.'个'],
+        ];
+        $return['zhouqi'] = [
             ['name' => '农产品周期','value'=>$zhouqi],
         ];
-        $this->apiSuccess('获取成功', $result);
+        $return['juli'] = [
+            ['name' => '运输距离','value'=>'20km'],
+        ];
+        $this->apiSuccess('获取成功', $return);
     }