1

app/api/business/JcdBus.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace app\api\business;
+
+use app\api\model\Cyd;
+
+class JcdBus
+{
+
+    public function getJcdList($data)
+    {
+
+
+        $jcd_info = (new Cyd())->getCydListByUndertakeId($data['undertake_id'], $data['pageNum'], $data['pageSize']);
+
+        return $jcd_info;
+
+    }
+}

app/api/business/LoginBus.php

@@ -8,6 +8,7 @@
 namespace app\api\business;
 
 use app\api\model\Jcdw;
+use app\api\model\Jgry;
 use app\common\lib\auth\JwtAuth;
 use app\common\model\mysql\Ry;
 use app\api\exception\ApiException;
@@ -18,22 +19,22 @@ class LoginBus
     public function login($username,$password)
     {
         //从人员表中查询数据
-        $ry_info=(new Ry())->getUserInfoByRybh($username);
+        $jgry_info=(new Jgry())->getUserInfoByRybh($username);
         //从检测单位表中查询数据
         $jcdw_info=(new Jcdw())->getInfoByLoginName($username);
         //用户名都不存在则抛出异常
-        if (!$ry_info && !$jcdw_info) {
+        if (!$jgry_info && !$jcdw_info) {
             throw new ApiException(config('status.err_user_not_exist'));
         }
         //在ry表中查询到数据，则验证用户名和密码
-        if (isset($ry_info['rybh']) && $ry_info['kl']==$password) {
+        if (isset($jgry_info['rybh']) && $jgry_info['kl']==$password) {
             $data=[
-                'id' => $ry_info['id'],
-                'groupname'=>$ry_info['groupname'],
-                'rymc'=>$ry_info['rymc'],
+                'id' => $jgry_info['id'],
+                'groupname'=>$jgry_info['groupname'],
+                'rymc'=>$jgry_info['rymc'],
                 'name'=>'',
-                'rybh'=>$ry_info['rybh'],
-                'qydm'=>$ry_info['qydm'],
+                'rybh'=>$jgry_info['rybh'],
+                'qydm'=>$jgry_info['qydm'],
             ];
         }
         //在jcdw表中查询到数据，则验证用户名和密码

app/api/business/OrganizerTaskBus.php

@@ -57,11 +57,11 @@ class OrganizerTaskBus
     public function getTaskInfo($task_id,$pageNum=1,$pageSize=null)
     {
         $uid=$this->uid;
-        //判断 在orgs表中的当前任务的id所对应的unit_id是否等于uid
-        $unit_id = (new Orgs())->getUnitIdByTaskID($task_id)['unit_id'];
-        if ($unit_id != $uid) {
-            throw new ApiException(config('status.err_task_auth'));
-        }
+//        //判断 在orgs表中的当前任务的id所对应的unit_id是否等于uid
+//        $unit_id = (new Orgs())->getUnitIdByTaskID($task_id)['unit_id'];
+//        if ($unit_id != $uid) {
+//            throw new ApiException(config('status.err_task_auth'));
+//        }
         //任务信息
         $task_info = (new Ccjc())->getTaskInfoByTaskID($task_id);
         $task_releaser_info = (new Jgry())->getJgryInfoByRymc($task_info['releaser']);
@@ -76,17 +76,17 @@ class OrganizerTaskBus
             $task_pesticides_info='';
             $task_model_info='';
         }
-        //牵头的任务列表的信息
-        $unitTaskList_info=(new Undertake())->selectUndertakeInfoByTaskIdAndUnitId($task_id,$uid,'','',$pageNum,$pageSize);
-        $unitTaskList_total = (new Undertake())->countUndertakeInfoByTaskIdAndUnitId($task_id, $uid);
+        //牵头的任务列表的信息(抽样)
+        $unitTaskList_info=(new Undertake())->selectTaskListByTaskIdAndUid($task_id,$uid,'','',$pageNum,$pageSize);
+        $unitTaskList_total = (new Undertake())->countTaskListByTaskIdAndUid($task_id, $uid);
 
-        //承担的任务列表的信息
-        $underTaskList_info=(new Undertake())->selectUndertakeInfoByTaskIdAndUnitId($task_id,'',$uid,'',$pageNum,$pageSize);
-        $underTaskList_total = (new Undertake())->countUndertakeInfoByTaskIdAndUnitId($task_id, '',$uid);
+        //承担的任务列表的信息(检测)
+        $underTaskList_info=(new Undertake())->selectTaskListByTaskIdAndUid($task_id,'',$uid,'',$pageNum,$pageSize);
+        $underTaskList_total = (new Undertake())->countTaskListByTaskIdAndUid($task_id, '',$uid);
 
-        //报告上传的任务列表信息
-        $reportTaskList_info=(new Undertake())->selectUndertakeInfoByTaskIdAndUnitId($task_id,'','',$uid,$pageNum,$pageSize);
-        $reportTaskList_total = (new Undertake())->countUndertakeInfoByTaskIdAndUnitId($task_id, '','',$uid);
+        //报告上传的任务列表信息(报告上传)
+        $reportTaskList_info=(new Undertake())->selectTaskListByTaskIdAndUid($task_id,'','',$uid,$pageNum,$pageSize);
+        $reportTaskList_total = (new Undertake())->countTaskListByTaskIdAndUid($task_id, '','',$uid);
 
         $data=[
             'taskInfo'=>$task_info,

app/api/business/SampleBus.php

@@ -41,18 +41,20 @@ class SampleBus
             ['cyd.task_id', '=', $data['task_id']],//这里绑定成cyd.task_id进行查询
             ['uid', '=', $uid]
         ];
-        if ($data['sample_name']!='') $where[]=['sample_name', 'LIKE', '%'.$data['sample_name'].'%'];//样品名称
-        if ($data['sample_id']!='') $where[]=['sample_id', 'LIKE', '%'.$data['sample_id'].'%'];//样品编码
-        if ($data['sample_ground']!='') $where[]=['sample_ground', 'LIKE', '%'.$data['sample_ground'].'%'];//抽样场所
 
-
-        //bear-抽样单位，report-报告单位，check-检测单位
-
-        if($data['unit_test_name']!='') $where[]=['unit_test_name','LIKE','%'.$data['unit_test_name'].'%'];//受检单位名称
-        if($data['unit_sample_name']!='') $where[]=['unit_sample_name','LIKE','%'.$data['unit_sample_name'].'%'];//抽样单位名称
-        if($data['unit_production_name']!='') $where[]=['unit_production_name','LIKE','%'.$data['unit_production_name'].'%'];//生产单位名称
-
-        if($data['sample_data']!='') $where[]=['sample_date','=',$data['sample_data']];//抽样日期
+        //注释掉的是搜索功能
+//        if ($data['sample_name']!='') $where[]=['sample_name', 'LIKE', '%'.$data['sample_name'].'%'];//样品名称
+//        if ($data['sample_id']!='') $where[]=['sample_id', 'LIKE', '%'.$data['sample_id'].'%'];//样品编码
+//        if ($data['sample_ground']!='') $where[]=['sample_ground', 'LIKE', '%'.$data['sample_ground'].'%'];//抽样场所
+//        if ($data['undertake_id']!='') $where[] = ['undertake_id', '=', $data['undertake_id']];
+//
+//        //bear-抽样单位，report-报告单位，check-检测单位
+//
+//        if($data['unit_test_name']!='') $where[]=['unit_test_name','LIKE','%'.$data['unit_test_name'].'%'];//受检单位名称
+//        if($data['unit_sample_name']!='') $where[]=['unit_sample_name','LIKE','%'.$data['unit_sample_name'].'%'];//抽样单位名称
+//        if($data['unit_production_name']!='') $where[]=['unit_production_name','LIKE','%'.$data['unit_production_name'].'%'];//生产单位名称
+//
+//        if($data['sample_data']!='') $where[]=['sample_date','=',$data['sample_data']];//抽样日期
 
 
         $result = (new Cyd())->selectSampleListByTaskIdAndUid($where, $data['pageNum'], $data['pageSize']);
@@ -60,7 +62,7 @@ class SampleBus
         return ['rows'=>$result,'total'=>$count];
     }
 
-    public function getSampleObj($task_id,$under_task_id)
+    public function getSampleObj($task_id)
     {
         $model_id = (new Ccjc())->getTaskInfoByTaskID($task_id)['test_model_id'];
         $data = (new TestModel())->getProductInfo($model_id);

app/api/business/UndertakerTaskBus.php

@@ -62,14 +62,6 @@ class UndertakerTaskBus
         return true;
     }
 
-    public function selectUnterTakerListByTaskID($task_id,$pageNum=1,$pageSize=10)
-    {
-        $bear = $this->uid;
-        $result = (new Undertake())->selectUndertakeInfoByTaskIdAndUnitId($task_id,'',$bear,'',$pageNum=1,$pageSize=null);
-        $count = (new Undertake())->countUndertakeInfoByTaskIdAndUnitId($task_id,'',$bear);
-        return ['rows'=>$result, 'total' => $count,];
-    }
-
     //查询任务列表数据
     public function selectUndertakerTaskList($task_class,$pageNum,$pageSize,$data)
     {

app/api/controller/v1/Jcd.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace app\api\controller\v1;
+
+use app\api\business\CydBus;
+use app\api\business\JcdBus;
+
+class Jcd
+{
+
+    //获取检测单列表
+    public function getJcdList()
+    {
+        $data = [
+            'pageNum' => request()->param('pageNum', 1, 'int'),
+            'pageSize' => request()->param('pageSize', null, 'int'),
+            'undertake_id' => request()->param('undertake_id', '', 'int'),//当前的选中项的undertake_id,在数据库cyd中的undertake_id，undertake的id
+        ];
+
+        $result = (new JcdBus())->getJcdList($data);
+        return showSuccess($result);
+    }
+
+    //填报检测单
+    public function saveJcdInfo()
+    {
+        $data = [
+
+        ];
+
+    }
+}

app/api/controller/v1/Pesticides.php

@@ -22,24 +22,4 @@ class Pesticides
     }
 
 
-    public function getPesticidesList(){
-        $data = $this->request->post();
-        $pageNum=$data['pageNum'];
-        $pageSize=$data['pageSize'];
-        if(isset($data['keyword'])){
-            $res['rows'] = Db::name("pesticides")->where('name','like','%'.$data['keyword'].'%')->page($pageNum,$pageSize)->select();
-            $res['total'] = Db::name("pesticides")->where('name','like','%'.$data['keyword'].'%')->count();
-
-        }else{
-            $res['rows'] = Db::name("pesticides")->page($pageNum,$pageSize)->select();
-            $res['total'] = Db::name("pesticides")->count();
-
-        }
-        return $this->jsonSuccessData($res);
-
-    }
-
-
-
-
 }

app/api/controller/v1/Sample.php

@@ -18,14 +18,16 @@ class Sample
             'pageNum' => request()->param('pageNum',1,'trim'),//页码
             'pageSize' => request()->param('pageSize',10,'trim'),//每页显示数量
             'task_id' => request()->param('task_id','','trim'),//任务id
-
-            'sample_name' => request()->param('sample_name','','trim'),//样品名称
-            'sample_id' => request()->param('sample_id','','trim'),//样品编码
-            'unit_test_name' => request()->param('unit_test_name','','trim'),//受检单位
-            'unit_sample_name' => request()->param('unit_sample_name','','trim'),//抽样单位
-            'unit_production_name' => request()->param('unit_production_name', '', 'trim'),//生产单位
-            'sample_data' => request()->param('sample_data','','trim'),//抽样日期
-            'sample_ground' => request()->param('sample_ground','','trim'),//抽样场所
+            'undertake_id' => request()->param('undertake_id', '', 'trim'),//当前任务对应的承担信息，在undertake表中的id
+
+//注释掉的是原来的搜索功能
+//            'sample_name' => request()->param('sample_name','','trim'),//样品名称
+//            'sample_id' => request()->param('sample_id','','trim'),//样品编码
+//            'unit_test_name' => request()->param('unit_test_name','','trim'),//受检单位
+//            'unit_sample_name' => request()->param('unit_sample_name','','trim'),//抽样单位
+//            'unit_production_name' => request()->param('unit_production_name', '', 'trim'),//生产单位
+//            'sample_data' => request()->param('sample_data','','trim'),//抽样日期
+//            'sample_ground' => request()->param('sample_ground','','trim'),//抽样场所
         ];
 
 
@@ -36,13 +38,13 @@ class Sample
     public function getSampleObj()
     {
         $task_id = request()->param('task_id','','int');
-        $under_task_id = request()->param('under_id', '', 'int');
+        $under_task_id = request()->param('undertake_id', '', 'int');
 
         if ($task_id == '' || $under_task_id == '') {
             return showError(config('status.none_valid_data'));
         }
 
-        $result = (new SampleBus())->getSampleObj($task_id,$under_task_id);
+        $result = (new SampleBus())->getSampleObj($task_id);
         return showSuccess($result);
     }
 
@@ -90,6 +92,7 @@ class Sample
 
         //抽样单cyd信息
         $cyd_data = [
+            'undertake_id' => request()->param('cyd_data.undertake_id', '', 'trim'),//抽样单对应的undertake表单的id
             'sample_id' => request()->param('cyd_data.sample_id','','trim'),//抽样单的id///todo
             'task_id' => request()->param('cyd_data.task_id','','trim'),//关联任务id todo
             'test_id' => request()->param('test_id','','trim'),//检测单位id----todo 未赋值

app/api/model/Cyd.php

@@ -27,15 +27,23 @@ class Cyd extends Model
         return $this->belongsTo('unitSample', 'sample_unit', 'id');
     }
 
-    function Undertake()
+    function undertake()
     {
         return $this->belongsTo('underTake', 'undertake_id', 'id');
     }
 
+    public function getCydListByUndertakeId($undertake_id,$pageNum,$pageSize)
+    {
+        $data = $this->with('undertake')
+            ->where('undertake_id', '=', $undertake_id)
+            ->page($pageNum,$pageSize)
+            ->select();
+        return $data;
+    }
+
     public function getCydDetailBySampleID($sample_id)
     {
-        $cyd = (new Cyd());
-        $data = $cyd->with(['unitProduction', 'unitTest','unitSample'])
+        $data = $this->with(['unitProduction', 'unitTest','unitSample'])
             ->where('sample_id','=',$sample_id)
             ->select();
         return $data;

app/api/model/Jgry.php

@@ -11,6 +11,14 @@ use think\Model;
 
 class Jgry extends Model
 {
+    public function getUserInfoByRybh($rybh)
+    {
+        if (empty($rybh)) {
+            return false;
+        }
+        return $this->where('rybh','=', $rybh)->find();
+    }
+
     public function getJgryInfoByRymc($rymc)
     {
         if (empty($rymc)) {

app/api/model/Ry.php

@@ -1,26 +0,0 @@
-<?php
-namespace app\api\model;
-use think\Model;
-
-/**
- * Created by PhpStorm
- * Author: ihavoc
- * Date: 2020/11/22
- * Time: 16:24
- *
- */
-class Ry extends model{
-
-    protected $table = 't_ry';
-    //主键定义为rybh：人员编号
-    protected $pk = 'rybh';
-
-
-    public function getInfoByRybh($rybh)
-    {
-        if (empty($rybh)) {
-            return false;
-        }
-        return $this->where('rybh','=', $rybh)->find();
-    }
-}

app/api/model/Undertake.php

@@ -22,7 +22,7 @@ class Undertake extends Model
     }
 
 
-    public function selectUndertakeInfoByTaskIdAndUnitId($task_id,$unit_id='',$bear_id='',$report_id='',$pageNum=1,$pageSize=null)
+    public function selectTaskListByTaskIdAndUid($task_id,$unit_id='',$bear_id='',$report_id='',$pageNum=1,$pageSize=null)
     {
         $where=[
             ['task_id', '=', $task_id],
@@ -41,7 +41,7 @@ class Undertake extends Model
         return $this->where($where)->page($pageNum,$pageSize)->select();
     }
 
-    public function countUndertakeInfoByTaskIdAndUnitId($task_id,$unit_id='',$bear_id='',$report_id='')
+    public function countTaskListByTaskIdAndUid($task_id,$unit_id='',$bear_id='',$report_id='')
     {
         $where=[
             ['task_id', '=', $task_id],

app/api/route/app.php

@@ -20,8 +20,17 @@ Route::group(function () {
 
     //抽样单相关路由
     Route::post(":version.getCydList",":version.Cyd/getCydList");        //获取抽样单列表
-    Route::post(":version.updateCydStatus",":version.Cyd/updateCydStatus");        //修改抽样单上报状态
     Route::post(":version.getSampleDetail",":version.Cyd/getCydDetail");        //获取抽样单详情
+    Route::post(":version.updateCydStatus",":version.Cyd/updateCydStatus");        //修改抽样单上报状态
+    //填报抽样单
+    Route::post(":version.getTestObj",":version.Sample/getSampleObj");        //填报抽样单-step1 获取信息
+    Route::post(":version.saveSample",":version.Sample/createSample");        //填报抽样单-step2 保存信息
+    Route::post(":version.getSampleId",":version.Sample/createSampleId");        //抽样单中生成样品编码
+
+
+    //检测单相关路由
+    Route::post(":version.getJcdList",":version.Jcd/getJcdList");        //获取检测单列表
+    Route::post(":version.saveJcdList",":version.Jcd/saveJcdInfo");        //填报检测单列表
 
 
 
@@ -49,10 +58,6 @@ Route::group(function () {
     Route::post(":version.getSampleList",":version.Sample/selectSampleList");        // 查询抽样单详细信息列表
 //    Route::post(":version.getUnderTask",":version.index/getUnderTask");      //获取承担单位--same牵头单位路由获取承担单位信息
 
-    //填报抽样单
-    Route::post(":version.getTestObj",":version.Sample/getSampleObj");        //填报抽样单-step1 获取信息
-    Route::post(":version.saveSample",":version.Sample/createSample");        //填报抽样单-step2 保存信息
-    Route::post(":version.getSampleId",":version.Sample/createSampleId");        //抽样单中生成样品编码