检测下发

application/api/controller/worker/Jiance.php

@@ -42,18 +42,57 @@ class Jiance extends Apiw
         $info = Db::name('jiance')->field('id,bianhao,status,project_ids')->where('id',$id)->find();
 
         //所有项目
-        $lists = Db::name('jiance_project')->field('id,pid,title,type,info')
+        $project = Db::name('jiance_project')->field('id,pid,title,type,info,weigh')
             ->where('company_id',$this->auth->company_id)
             ->where('deletetime',NULL)
             ->where('id','IN',$info['project_ids'])
-            ->order('weigh asc')->select();
+            ->order('pid asc,type asc,weigh asc,id asc')->select();
+
+        //所有记录
+        $joblog = Db::name('jiance_joblog')->field('project_id,count(id) as jilunum')->where('jiance_id',$id)->group('project_id')->select();
+        $joblog = array_column($joblog,'jilunum','project_id');
+
+        //循环处理
+        $top = [];
+        foreach($project as $key => $val){
+            //组合记录数
+            $project[$key]['jilunum'] = isset($joblog[$val['id']]) ? $joblog[$val['id']] : 0;
+
+            //拿出来一级
+            if($val['pid'] == 0){
+                $top[] = $val;
+                unset($project[$key]);
+            }
+        }
+
+//        dump($top);
+//        dump($project);
+
+        //数据结构排序，二级结构，不需要tree
+        foreach($top as $tk => $tv){
+            foreach($project as $key => $val){
+                if($val['pid'] == $tv['id']){
+                    if($val['type'] == 1){
+                        $tv['child_type1'][] = $val;
+                    }else{
+                        $tv['child_type2'][] = $val;
+                    }
+                }
+            }
+            $top[$tk] = $tv;
+        }
+//        dump($top);
 
 
+        $this->success(1,$top);
     }
 
     //提交
     public function submit(){
+        $id = input('id',0);
+        Db::name('jiance')->where('id',$id)->where('company_id',$this->auth->company_id)->update(['status'=>1]);
 
+        $this->success();
     }
 
     //记录列表
@@ -61,7 +100,7 @@ class Jiance extends Apiw
         $jiance_id   = input('jiance_id',0);
         $project_id  = input('project_id',0);
 
-        $jiance = Db::name('jiance')->field('id,bianhao,status,project_ids')->where('id',$jiance_id)->find();
+        $jiance = Db::name('jiance')->where('id',$jiance_id)->value('status');
 
         $list = Db::name('jiance_joblog')->alias('joblog')
             ->field('joblog.*,project.title as project_title')
@@ -71,11 +110,11 @@ class Jiance extends Apiw
             ->select();
 
         $rs = [
-            '',
-            '',
+            'jiance_status' => $jiance,
+            'list'   => $list,
         ];
 
-        $this->success(1,$list);
+        $this->success(1,$rs);
     }
 
     //新增记录
@@ -159,7 +198,8 @@ class Jiance extends Apiw
 
     //检测位置历史记录
     public function history_list(){
-
+        $lists = Db::name('worker_weizhi_history')->where('worker_id',$this->auth->id)->order('id desc')->column('weizhi');
+        $this->success(1,$lists);
     }