更新controller文件位置

app/api/business/TaskInformationBus.php

@@ -22,10 +22,14 @@ class TaskInformationBus
     {
         //任务信息
         $task_info = (new Ccjc())->getTaskInfoByTaskID($task_id);
+
         $task_releaser_info = (new Jgry())->getJgryInfoByRymc($task_info['releaser']);
+
         //获取uid下创建的所有模型信息
         if (isset($task_info['test_model_id'])) {
             $task_product_info = (new TestModel())->getProductInfo($task_info['test_model_id']);
+
+
             $task_pesticides_info = (new TestModel())->getPesticidesInfo($task_info['test_model_id']);
             $task_model_info=(new TestModel())->getModelInfoByModelID($task_info['test_model_id']);
 
@@ -46,6 +50,8 @@ class TaskInformationBus
         return $result;
     }
 
+
+
     //获取抽样任务列表
     public function getSampleTaskList($task_id,$pageNum=1,$pageSize=null)
     {

app/api/business/UndertakerTaskBus.php

@@ -66,7 +66,7 @@ class UndertakerTaskBus
     public function selectUndertakerTaskList($task_class,$pageNum,$pageSize,$data)
     {
         $where=[
-            ['bear_id', '=', $this->uid],
+            ['bear_id|check_id|report_id', '=', $this->uid],
         ];
         if ($data['year']!='') array_push($where, ['year', '=', $data['year']]);
         //任务状态：0：未发布，1：执行中，2：已结束未完成，3：已结束已完成

app/api/controller/v1/Chandi.php

@@ -1,216 +0,0 @@
-<?php
-namespace app\api\controller\v1;
-use app\api\model\Qy_basic;
-use app\api\model\Sym;
-use OpenApi\Annotations as OA;
-use app\BaseController;
-use thans\jwt\facade\JWTAuth;
-use think\facade\Request as re;
-use think\Request;
-use thans\jwt\JWT;
-use app\api\model\Chandi as ChandiModel;
-use app\validate\Chandi as ChandiValidate;
-use think\exception\ValidateException;
-//use rsa\Rsa;
-class Chandi extends BaseController{
-    use ResponseJson;
-    protected $request;
-    protected $middleware = [
-        'jwt' 	=> ['except' 	=> ['qycount'] ],
-        'check' => ['except' =>[]]
-//        'AddPlaceInfo','AddPlaceInfo','DoEditPlaceInfo','DelPlaceInfo','PlaceInfo'
-    ];
-    public function __construct(Request $request)
-    {
-        $this->request = $request;
-    }
-
-    /*产地增加*/
-    public function AddPlaceInfo()
-    {
-        //加密
-//        require_once(dirname(__FILE__)."/Rsa.php");
-//        $rsa = new Rsa();
-
-        $data = $this->request->post();
-        $qydm=$data['qydm'];
-//        $chandi=$data['chandi'];
-//        $lng=$data['lng'];
-//        $lat=$data['lat'];
-//        $yt=$data['yt'];
-//        if(isset($data['jldw'])){
-//            try{
-//                validate(ChandiValidate::class)->check(
-//                    [
-//                        'qydm'=>$qydm,
-//                        'chandi'=>$chandi,
-//                        'lng' =>$lng,
-//                        'lat'=>$lat,
-//                        'yt'=>$yt ,
-//                        'tiliang'=>$data['tiliang'],
-//                        'jldw'=>$data['jldw'],
-//                    ]
-//                );
-//            }catch (ValidateException $e){
-//                return ($e->getError());
-//            }
-//        }
-
-        $qy=Qy_basic::Where('qydm','=',$qydm)->find();
-        if($qy){
-            $jd=ChandiModel::field('cdbh')->where('qydm','=',$qydm)->order('cdbh desc')->find();//按照产地查找产地表中的所有信息，
-            if(!$jd['cdbh']&&$jd['cdbh']==''){
-                $data['cdbh']='000';
-            }else{
-                $x='1'.$jd['cdbh'];
-                $y=intval($x)+1;//十进制取整
-                $data["cdbh"]=substr($y,1);//给产地编号赋值
-            }
-            //新增记录
-            $result = ChandiModel::create($data);
-//            $publicEncrypt = $rsa->publicEncrypt(json_encode($result)); //公钥加密
-            if($result) {
-                return $this->jsonSuccessData($result);
-            }else {
-                return $this->jsonData(-1,"产地上传失败");
-            }
-        }
-        else{
-            return $this->jsonData(-2,"企业未注册");
-        }
-
-    }
-
-
-    /*执行产地信息修改*/
-    public function DoEditPlaceInfo(){
-        //加密
-//        require_once(dirname(__FILE__)."/Rsa.php");
-//        $rsa = new Rsa();
-
-        //从提交表单中排除关联字段cpmc字段
-        $data = $this->request->post();
-        //设置更新条件
-        $condition = ['bh'=>$data['bh']];
-        $result = ChandiModel::update($data,$condition);
-
-//        $publicEncrypt = $rsa->publicEncrypt(json_encode($result)); //公钥加密
-
-        if($result) {
-            return $this->jsonSuccessData($result);
-        }else {
-            return $this->jsonData(-1,"更新失败");
-        }
-
-    }
-
-
-    /*产地删除*/
-    public function DelPlaceInfo()
-    {
-        //加密
-//        require_once(dirname(__FILE__)."/Rsa.php");
-//        $rsa = new Rsa();
-
-        $data = $this->request->post();
-        $map['bh']= $data['bh'];
-        //删除产地信息
-        $result = ChandiModel::where($map)->delete();
-
-//        $publicEncrypt = $rsa->publicEncrypt(json_encode($result)); //公钥加密
-        if($result) {
-            return $this->jsonSuccessData($result);
-        }else {
-            return $this->jsonData(-1,"产地信息删除失败");
-        }
-    }
-
-
-    /*产地信息查询*/
-    public function PlaceInfo(){
-        //加密
-//        require_once(dirname(__FILE__)."/Rsa.php");
-//        $rsa = new Rsa();
-
-        $data = $this->request->post();
-        $page = $data['page']; //分页的页码
-        $query = $data['query']; //前台传过来的查询
-        $pageSize=$data['pageSize'];
-        $qydm=$data['qydm'];
-
-        if($query) {
-            $result['rows']= ChandiModel::
-            where([
-                ['chandi', 'like', '%' . $query . '%'],
-                ['t_chandi.qydm', '=', $qydm]
-            ])
-                ->field("t_chandi.*,t_qy_basic.qymc")
-                ->leftjoin('t_qy_basic','t_chandi.qydm=t_qy_basic.qydm')
-                ->page($page,$pageSize)
-                ->select();
-            $result['total']=ChandiModel::
-            where([
-                ['chandi', 'like', '%' . $query . '%'],
-                ['t_chandi.qydm', '=', $qydm]
-            ])
-                -> leftjoin('t_qy_basic','t_chandi.qydm=t_qy_basic.qydm')->count();
-
-            $result['page']=$page;
-
-        }
-        else{
-            $result['rows']= ChandiModel::
-            where(
-
-                't_chandi.qydm', '=', $qydm
-            )
-                ->field("t_chandi.*,t_qy_basic.qymc")
-                ->leftjoin('t_qy_basic','t_chandi.qydm=t_qy_basic.qydm')
-                ->page($page,$pageSize)
-                ->select();
-            $result['total']=ChandiModel::
-            where('t_chandi.qydm', '=', $qydm)
-                ->leftjoin('t_qy_basic','t_chandi.qydm=t_qy_basic.qydm')->count();
-
-            $result['page']=$page;
-        }
-//        $publicEncrypt = $rsa->publicEncrypt(json_encode($result)); //公钥加密
-
-        if($result['rows']){
-            return $this->jsonSuccessData($result);
-        }
-        else{
-            return $this->jsonData('-1',"查询错误");
-        }
-    }
-
-
-    public function qycount()
-    {
-        $sum=0;
-        $count1 =Qy_basic::where(
-            'qylx','=','药材'
-        )->field('qydm')->select();
-//        dump(count($count1));die();
-
-//        $sym =Sym::where('date','>','2021-06-01')->count('bh');
-//
-//        return $this->jsonSuccessData(
-//            $count1
-//        );
-
-
-        for ($i = 0;$i<count($count1);$i++){
-
-            $sym =Sym::where('qydm',$count1[$i]['qydm'])->count('bh');
-            $sum=$sum+$sym;
-        }
-        return $this->jsonSuccessData(
-            $sum
-        );
-//
-    }
-
-
-
-}

app/api/controller/v1/TaskInformation.php → app/api/controller/v1/ChengDan.php

@@ -3,11 +3,29 @@
 namespace app\api\controller\v1;
 
 use app\api\business\TaskInformationBus;
+use app\api\business\UndertakerTaskBus;
 
-class TaskInformation
+class ChengDan
 {
 
-    //获取任务详情
+    //获取承担的任务列表
+    public function selectUndertakerTaskList()
+    {
+        $task_class = request()->param('task_class','例行监测','trim');
+        $pageNum = request()->param('pageNum',1,'int');
+        $pageSize = request()->param('pageSize',10,'int');
+        $data=[
+            'year'=>request()->param('year','','trim'),//年度
+            'ispublic'=>request()->param('ispublic','','trim'),//任务状态：0：未发布，1：执行中，2：已结束未完成，3：已结束已完成
+            'starttime' => request()->param('starttime','','trim'),//任务开始时间
+            'endtime' => request()->param('endtime','','trim'),//任务结束时间
+            'task_name' => request()->param('task_name','','trim'),//任务名称
+        ];
+        $result = (new UndertakerTaskBus())->selectUndertakerTaskList($task_class,$pageNum,$pageSize,$data);
+        return showSuccess($result);
+    }
+
+    //获取任务信息（执行检测）
     public function getTaskDetail()
     {
         $data = [
@@ -55,5 +73,4 @@ class TaskInformation
         $result = (new TaskInformationBus())->getReportTaskList($data['task_id'], $data['pageNum'], $data['pageSize']);
         return showSuccess($result);
     }
-
 }

app/api/controller/v1/Cyd.php

@@ -60,4 +60,121 @@ class Cyd
     }
 
 
+    public function selectSampleList()
+    {
+        $data=[
+            'pageNum' => request()->param('pageNum',1,'int'),//页码
+            'pageSize' => request()->param('pageSize',10,'int'),//每页显示数量
+            'task_id' => request()->param('task_id',null,'int'),//任务id
+            'undertake_id' => request()->param('undertake_id', null, 'int'),//当前任务对应的承担信息，在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'),//抽样场所
+        ];
+
+        $result = (new SampleBus())->selectSampleList($data);
+        return showSuccess($result);
+    }
+
+    public function getSampleObj()
+    {
+        $data =[
+            'task_id' => request()->param('task_id', '', 'int'),
+            'undertake_id'=>request()->param('undertake_id','','int')
+        ];
+        $task_id = request()->param('task_id','','int');
+        $under_task_id = request()->param('undertake_id', '', 'int');
+
+        if ($data['task_id'] == '' || $data['undertake_id'] == '') {
+            return showError(config('status.none_valid_data'));
+        }
+
+        $result = (new SampleBus())->getSampleObj($data);
+        return showSuccess($result);
+    }
+
+    public function createSampleId()
+    {
+        $task_id = request()->param('task_id', '', 'int');
+        $result = (new SampleBus())->createSampleId($task_id);
+        return showSuccess($result);
+    }
+
+    public function createSample()
+    {
+
+        //受检单位信息
+        $unit_test = [
+            'unit_test_name' => request()->param('unit_test.unit_name','','trim'),//单位名称
+            'address' => request()->param('unit_test.address'),//通讯地址
+            'represent_name' => request()->param('unit_test.represent_name','','trim'),//法定代表人
+            'user_name' => request()->param('unit_test.user_name','','trim'),//*受检人
+            'phone' => request()->param('unit_test.phone','','trim'),//电话
+            'fax' => request()->param('unit_test.fax','','trim'),//传真
+        ];
+
+        //生产单位信息
+        $unit_production = [
+            'unit_production_name' =>request()->param('unit_production.production_name','','trim'),//单位名称
+            'address' =>request()->param('unit_production.address','','trim'),//通讯地址
+            'postcode' =>request()->param('unit_production.postcode','','trim'),//邮编
+            'user_name' =>request()->param('unit_production.user_name','','trim'),//联系人
+            'phone' =>request()->param('unit_production.phone','','trim'),//电话
+            'fax' =>request()->param('unit_production.fax','','trim'),//传真
+            'production_class' =>request()->param('unit_production.production_class','','trim'),//生产方式
+        ];
+
+        //抽样单位信息
+        $unit_sample = [
+            'unit_sample_name' => request()->param('unit_sample.unit_name','','trim'),//单位名称
+            'unit_user' => request()->param('unit_sample.unit_user','','trim'),//联系人
+            'address' => request()->param('unit_sample.address','','trim'),//通讯地址
+            'postcode' => request()->param('unit_sample.postcode','','trim'),//邮编
+            'phone' => request()->param('unit_sample.phone','','trim'),//联系电话
+            'fax' => request()->param('unit_sample.fax','','trim'),//传真
+            'email' => request()->param('unit_sample.email','','trim'),//Email
+        ];
+
+        //抽样单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 未赋值
+
+//            'units_id' => request()->param('units_id','','trim'),//受检单位id---在business中赋值
+//            'product_unit' => request()->param('product_unit','','trim'),//生产单位id---在business中赋值
+//            'sample_unit' => request()->param('sample_unit','','trim'),//抽样单位id---在business中赋值
+
+            'sample_name' => request()->param('cyd_data.sample_name','','trim'),//样品名称
+            'brand' => request()->param('cyd_data.brand','','trim'),//商标
+            'ispack' => request()->param('cyd_data.ispack','','trim'),//包装
+            'type' => request()->param('cyd_data.type','','trim'),//型号规格
+            'standard' => request()->param('cyd_data.standard','','trim'),//执行标准
+            'production_date' => request()->param('cyd_data.production_date','','trim'),//生产日期或批号
+            'place' => request()->param('cyd_data.place','','trim'),//	产地
+            'certicfie' => request()->param('cyd_data.certicfie','','trim'),//*产品认证情况
+            'certifie_num' => request()->param('cyd_data.certifie_num','','trim'),//证书编号
+            'sample_num' => request()->param('cyd_data.sample_num','','trim'),//*抽样数量
+            'sample_num_unit' => request()->param('cyd_data.sample_num_unit','','trim'),//*抽样数量单位
+            'sample_base' => request()->param('cyd_data.sample_base','','trim'),//抽样基数
+            'sample_base_unit' => request()->param('cyd_data.sample_base_unit','','trim'),//抽样基数单位
+            'sample_ground' => request()->param('cyd_data.sample_ground','','trim'),//*抽样场所
+            'base' => request()->param('cyd_data.base', '', 'trim'),//检测任务依据
+            'sample_date'=>request()->param('cyd_data.sample_date','','trim'),//抽样时间
+            'file_name' => request()->param('cyd_data.file_name','','trim'),//文件名
+            'file_url' => request()->param('cyd_data.file_url','','trim'),//文件链接
+        ];
+
+        $result = (new SampleBus())->createSample($unit_test, $unit_production, $unit_sample, $cyd_data);
+        return showSuccess($result);
+    }
+
+
 }

app/api/controller/v1/Model.php

@@ -10,6 +10,8 @@ namespace app\api\controller\v1;
 
 //监测模型
 use app\api\business\ModelBus;
+use app\api\business\PesticidesBus;
+use app\api\business\ProductBus;
 use app\api\validate\ModelValidate;
 use think\exception\ValidateException;
 
@@ -115,4 +117,22 @@ class Model
         return showSuccess($result);
     }
 
+    //获取检测对象列表
+    public function selectProductList()
+    {
+        $type_id = request()->param('type_id', 1, 'int');
+        $result = (new ProductBus())->selectProductList($type_id);
+        return showSuccess($result);
+    }
+
+    ////获取检测项目列表
+    public function selectPesticidesList()
+    {
+        //todo validate
+        $pageNum = request()->param('pageNum', 1, 'int');
+        $pageSize = request()->param('pageSize', 10, 'int');
+        $key_word = request()->param('keyword', '', 'trim');
+        $result = (new PesticidesBus())->selectPesticidesList($pageNum,$pageSize,$key_word);
+        return showSuccess($result);
+    }
 }

app/api/controller/v1/Pesticides.php

@@ -1,25 +0,0 @@
-<?php
-/**
- *
- *User:Administrator
- *Date:2021/10/11
- */
-
-namespace app\api\controller\v1;
-
-use app\api\business\PesticidesBus;
-
-class Pesticides
-{
-    public function selectPesticidesList()
-    {
-        //todo validate
-        $pageNum = request()->param('pageNum', 1, 'int');
-        $pageSize = request()->param('pageSize', 10, 'int');
-        $key_word = request()->param('keyword', '', 'trim');
-        $result = (new PesticidesBus())->selectPesticidesList($pageNum,$pageSize,$key_word);
-        return showSuccess($result);
-    }
-
-
-}

app/api/controller/v1/Product.old.php

@@ -1,189 +0,0 @@
-<?php
-namespace app\api\controller\v1;
-use OpenApi\Annotations as OA;
-use app\BaseController;
-use thans\jwt\facade\JWTAuth;
-use think\exception\ValidateException;
-use think\facade\Request as re;
-use think\Request;
-use thans\jwt\JWT;
-use app\api\model\Chandi as ChandiModel;
-use app\api\model\Qy_basic;
-use app\api\model\Zd_cpmc;
-use app\api\model\Nszy as NszyModel;
-use think\File;
-use app\validate\Product as ProductValidate;
-use rsa\Rsa;
-
-class Product extends BaseController{
-    use ResponseJson;
-    protected $request;
-    protected $middleware = [
-        'jwt' 	=> ['except' 	=> [] ],
-//        'login','AddProductInfo','DelProductInfo','DoEditProductInfo','QueryProductInfo'
-    ];
-    public function __construct(Request $request)
-    {
-        $this->request = $request;
-    }
-
-
-    /*产品增加*/
-    public function AddProductInfo() {
-//        加密
-//        require_once(dirname(__FILE__)."/Rsa.php");
-//        $rsa = new Rsa();
-
-        $data = $this->request->post();
-        $qydm=$data['qydm'];
-//        $cpmc=$data['cpmc'];
-//        try{
-//            validate(ProductValidate::class)->check(
-//                [
-//                    'qydm'=>$qydm,
-//                    'cpmc'=>$cpmc,
-//                    'ms' =>$data['ms'],
-//                    'cpgg'=>$data['cpgg'],
-//                    'bzq'=>$data['bzq'] ,
-//                ]
-//            );
-//        }catch (ValidateException $e){
-//            return ($e->getError());
-//        }
-        $qy=Qy_basic::Where('qydm','=',$qydm)->find();
-        if($qy){
-            $jd=Zd_cpmc::field('cpbh')->where('qydm','=',$qydm)->select();
-            //dump($jd);die;
-            $wz=count($jd) - 1;//产品数量-1
-            // dump($wz);die;
-            if(count($jd)){
-                $x="1".$jd[$wz]['cpbh'];//对应最后一条cpbh
-                $y=intval($x)+1;
-                $data["cpbh"]=substr($y,1);
-            }else{
-                $data["cpbh"]='001';
-            }
-
-            //dump($data);die;
-            //新增记录
-            $result = Zd_cpmc::create($data);
-
-//            $publicEncrypt = $rsa->publicEncrypt(json_encode($result)); //公钥加密
-
-            if($result) {
-                return $this->jsonData(0,"添加成功");
-            }else {
-                return $this->jsonData(-1,"添加错误");
-            }
-        }
-        else{
-            return $this->jsonData(-2,"企业未注册");
-        }
-
-
-    }
-
-
-    /*产品删除*/
-    public function DelProductInfo(){
-        //加密
-//        require_once(dirname(__FILE__)."/Rsa.php");
-//        $rsa = new Rsa();
-
-        $data = $this->request->post();
-        $Zd_cpmc = new Zd_cpmc();
-        $bh = $data['bh'];
-        $del=$Zd_cpmc->delproduct($bh);
-
-//        $publicEncrypt = $rsa->publicEncrypt(json_encode($data)); //公钥加密
-        if ($del == '1') {
-            return $this->jsonData(
-                0,
-                "删除成功"
-            );
-        } else {
-            return $this->jsonData(-1, "删除失败");
-        }
-
-    }
-
-
-    /*执行产品修改*/
-    public function DoEditProductInfo() {
-        $data = $this->request->post();
-        //设置更新条件
-        $condition = ['bh'=>$data['bh']];
-
-        //更新当前记录
-        $result = Zd_cpmc::update($data,$condition);
-
-        if ($result) {
-            return $this->jsonData(0,"修改成功");
-
-        } else {
-            return $this->jsonData(-1, "修改失败");
-        }
-    }
-
-
-    /*产品查询*/
-    public function QueryProductInfo(){
-   
-
-        $data = $this->request->post();
-        $pageNum=$data['pageNum'];
-        $pageSize=$data['pageSize'];
-        $query=$data['query'];
-        $qydm=$data['qydm'];
-        if($query){
-            $result['rows']=Zd_cpmc::where([
-                ['cpmc', 'like', '%'.$query .'%'],
-                ['t_zd_cpmc.qydm', '=', $qydm]
-            ])
-                ->field("t_zd_cpmc.*,t_qy_basic.qymc")
-                ->leftjoin('t_qy_basic',' t_zd_cpmc.qydm=t_qy_basic.qydm')
-                ->page($pageNum,$pageSize)
-                ->select();
-            $result['pages']=$pageNum;
-            $result['total']=Zd_cpmc::where(
-                [
-                    ['cpmc', 'like', '%'.$query .'%'],
-                    ['t_zd_cpmc.qydm', '=', $qydm]
-                ]
-            )
-                ->select()
-                ->count('bh');
-        }
-        else{
-            $result['rows']=Zd_cpmc::where([
-                ['t_zd_cpmc.qydm', '=', $qydm]
-            ])
-                ->field("t_zd_cpmc.*,t_qy_basic.qymc")
-                ->leftjoin('t_qy_basic',' t_zd_cpmc.qydm=t_qy_basic.qydm')
-                ->page($pageNum,$pageSize)
-                ->select();
-            $result['pages']=$pageNum;
-            $result['total']=Zd_cpmc::where(
-                [
-                    ['cpmc', 'like', '%'.$query .'%'],
-                    ['t_zd_cpmc.qydm', '=', $qydm]
-                ]
-            )
-                ->select()
-                ->count('bh');
-        }
-
-  
-
-        if($result){
-            return $this->jsonSuccessData($result);
-        }
-        else{
-            return $this->jsonData('-1',"查询错误");
-        }
-    }
-
-
-
-
-}

app/api/controller/v1/Product.php

@@ -1,21 +0,0 @@
-<?php
-/**
- *
- *User:Administrator
- *Date:2021/10/11
- */
-
-namespace app\api\controller\v1;
-
-use app\api\business\ProductBus;
-
-class Product
-{
-    public function selectProductList()
-    {
-        $type_id = request()->param('type_id', 1, 'int');
-        $result = (new ProductBus())->selectProductList($type_id);
-        return showSuccess($result);
-    }
-
-}

app/api/controller/v1/Production.php

@@ -1,140 +0,0 @@
-<?php
-namespace app\api\controller\v1;
-use OpenApi\Annotations as OA;
-use app\BaseController;
-use thans\jwt\facade\JWTAuth;
-use think\exception\ValidateException;
-use think\facade\Request as re;
-use think\Request;
-use thans\jwt\JWT;
-use app\api\model\Chandi as ChandiModel;
-use app\api\model\Qy_basic;
-use app\api\model\Zd_cpmc;
-use app\api\model\Nszy as NszyModel;
-use think\File;
-use app\validate\Production as ProductValidate;
-use app\api\model\Chanpin;
-use rsa\Rsa;
-
-class Production extends BaseController{
-    use ResponseJson;
-    protected $request;
-    protected $middleware = [
-        'jwt' 	=> ['except' 	=> []],
-//        'login','AddProductionInfo','DelProductionInfo','DoEditProductionInfo','QueryProductionInfo'
-    ];
-    public function __construct(Request $request)
-    {
-        $this->request = $request;
-    }
-
-
-    /*产品生产增加*/
-    public function AddProductionInfo(){
-        $data = $this->request->post();
-        $qydm=$data['qydm'];
-        $rq=$data['rq'];
-
-        $jd=Chanpin::where([['qydm','=',$qydm], ['rq','=',$rq]])->field('pch')->order('pch','desc')->select();
-        $pcqz = substr($rq,2,2).substr($rq,5,2).substr($rq,8,2);
-        if(count($jd)){
-            $data["pch"]=$jd[0]['pch']+1;
-        }else{
-            $data["pch"]=$pcqz.'01';
-        }
-        $result=Chanpin::create($data);
-        if($result){
-            return $this->jsonData(0,"信息添加成功");
-        }else{
-            return $this->jsonData(-1,"信息添加失败");
-        }
-    }
-
-
-    /*产品生产删除*/
-    public function DelProductionInfo(){
-        $data = $this->request->post();
-        $result = Chanpin::where('bh',$data['bh'])->delete();
-        if($result){
-            return $this->jsonData(0,"信息删除成功");
-        }else{
-            return $this->jsonData(-1,"信息删除失败");
-        }
-    }
-
-
-    /*产品生产修改*/
-    public function DoEditProductionInfo(){
-        $data = $this->request->post();
-        //设置更新条件
-        $condition = ['bh'=>$data['bh']];
-
-        //更新当前记录
-        $result = Chanpin::update($data,$condition);
-
-        if ($result) {
-            return $this->jsonData(0, "信息修改成功");
-        } else {
-            return $this->jsonData(-1, "信息修改失败");
-        }
-    }
-
-
-    /*生产产品查询*/
-    public function QueryProductionInfo(){
-
-        $data = $this->request->post();
-        $pageNum=$data['pageNum'];
-        $pageSize=$data['pageSize'];
-        $query=$data['query'];
-        $qydm=$data['qydm'];
-
-        if($query){
-            $result['rows']=Chanpin::where([
-                ['cpmc', 'like', '%'.$query .'%'],
-                ['t_chanpin.qydm', '=', $qydm]
-            ])
-                ->field("t_chanpin.*,t_qy_basic.qymc,t_zd_cpmc.cpgg,t_zd_cpmc.cpmc")
-                ->join('t_zd_cpmc','t_chanpin.cpbh=t_zd_cpmc.cpbh and t_chanpin.qydm=t_zd_cpmc.qydm')
-                ->join('t_qy_basic','t_chanpin.qydm=t_qy_basic.qydm')
-                ->page($pageNum,$pageSize)
-                ->select();
-            $result['pages']=$pageNum;
-            $result['total']=Chanpin::where([
-                ['cpmc', 'like', '%'.$query .'%'],
-                ['t_chanpin.qydm', '=', $qydm]
-            ])
-                ->join('t_zd_cpmc','t_chanpin.cpbh=t_zd_cpmc.cpbh and t_chanpin.qydm=t_zd_cpmc.qydm')
-                ->join('t_qy_basic','t_chanpin.qydm=t_qy_basic.qydm')
-                ->select()
-                ->count('bh');
-        }
-        else{
-            $result['rows']=$result['rows']=Chanpin::where([
-                ['t_chanpin.qydm', '=', $qydm]
-            ])
-                ->field("t_chanpin.*,t_qy_basic.qymc,t_zd_cpmc.cpgg,t_zd_cpmc.cpmc")
-                ->join('t_zd_cpmc','t_chanpin.cpbh=t_zd_cpmc.cpbh and t_chanpin.qydm=t_zd_cpmc.qydm')
-                ->join('t_qy_basic','t_chanpin.qydm=t_qy_basic.qydm')
-                ->page($pageNum,$pageSize)
-                ->select();
-            $result['pages']=$pageNum;
-            $result['total']=Chanpin::where([
-                ['t_chanpin.qydm', '=', $qydm]
-            ])
-                ->join('t_zd_cpmc','t_chanpin.cpbh=t_zd_cpmc.cpbh and t_chanpin.qydm=t_zd_cpmc.qydm')
-                ->join('t_qy_basic','t_chanpin.qydm=t_qy_basic.qydm')
-                ->select()
-                ->count('bh');
-        }
-
-        if($result){
-            return $this->jsonSuccessData($result);
-        }
-        else{
-            return $this->jsonData('-1',"查询错误");
-        }
-    }
-
-
-}

app/api/controller/v1/QianTou.php

@@ -11,6 +11,7 @@ namespace app\api\controller\v1;
 
 use app\api\business\OrganizerTaskBus;
 use app\api\business\TestUnitBus;
+use app\api\business\UndertakerTaskBus;
 use app\api\validate\TaskValidate;
 use think\exception\ValidateException;
 
@@ -90,4 +91,26 @@ class QianTou
         $result = (new TestUnitBus())->selectTestUnit($data);
         return showSuccess($result);
     }
+
+    public function createUnderTaker()
+    {
+        $data = [
+            'task_id' => request()->param('task_id','','int'),
+            'bear_id' => request()->param('bear_id','','int'),//抽样机构
+            'check_id' => request()->param('check_id','','int'),//检测机构
+            'report_id' => request()->param('report_id','','int'),//报告上传单位
+            'address' => request()->param('address','','trim'),//抽样地址
+            'upload_time' => request()->param('uploadtime'),//报告上传时间
+            'sample_number' => request()->param('sample_number'),//样本数量
+        ];
+        $result = (new UndertakerTaskBus())->createUnderTakerInfo($data);
+        return showSuccess($result);
+    }
+
+    public function deleteUnderTaskList()
+    {
+        $del_arr = request()->param('delarr', '', 'trim');
+        $result = (new UndertakerTaskBus())->deleteUnderTaker($del_arr);
+        return showSuccess($result);
+    }
 }

app/api/controller/v1/Sample.php

@@ -12,120 +12,6 @@ use app\api\business\SampleBus;
 class Sample
 {
 
-    public function selectSampleList()
-    {
-        $data=[
-            'pageNum' => request()->param('pageNum',1,'int'),//页码
-            'pageSize' => request()->param('pageSize',10,'int'),//每页显示数量
-            'task_id' => request()->param('task_id',null,'int'),//任务id
-            'undertake_id' => request()->param('undertake_id', null, 'int'),//当前任务对应的承担信息，在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'),//抽样场所
-        ];
-
-        $result = (new SampleBus())->selectSampleList($data);
-        return showSuccess($result);
-    }
-
-    public function getSampleObj()
-    {
-        $data =[
-            'task_id' => request()->param('task_id', '', 'int'),
-            'undertake_id'=>request()->param('undertake_id','','int')
-        ];
-        $task_id = request()->param('task_id','','int');
-        $under_task_id = request()->param('undertake_id', '', 'int');
-
-        if ($data['task_id'] == '' || $data['undertake_id'] == '') {
-            return showError(config('status.none_valid_data'));
-        }
-
-        $result = (new SampleBus())->getSampleObj($data);
-        return showSuccess($result);
-    }
-
-    public function createSampleId()
-    {
-        $task_id = request()->param('task_id', '', 'int');
-        $result = (new SampleBus())->createSampleId($task_id);
-        return showSuccess($result);
-    }
-
-    public function createSample()
-    {
-
-        //受检单位信息
-        $unit_test = [
-            'unit_test_name' => request()->param('unit_test.unit_name','','trim'),//单位名称
-            'address' => request()->param('unit_test.address'),//通讯地址
-            'represent_name' => request()->param('unit_test.represent_name','','trim'),//法定代表人
-            'user_name' => request()->param('unit_test.user_name','','trim'),//*受检人
-            'phone' => request()->param('unit_test.phone','','trim'),//电话
-            'fax' => request()->param('unit_test.fax','','trim'),//传真
-        ];
-
-        //生产单位信息
-        $unit_production = [
-            'unit_production_name' =>request()->param('unit_production.production_name','','trim'),//单位名称
-            'address' =>request()->param('unit_production.address','','trim'),//通讯地址
-            'postcode' =>request()->param('unit_production.postcode','','trim'),//邮编
-            'user_name' =>request()->param('unit_production.user_name','','trim'),//联系人
-            'phone' =>request()->param('unit_production.phone','','trim'),//电话
-            'fax' =>request()->param('unit_production.fax','','trim'),//传真
-            'production_class' =>request()->param('unit_production.production_class','','trim'),//生产方式
-        ];
-
-        //抽样单位信息
-        $unit_sample = [
-            'unit_sample_name' => request()->param('unit_sample.unit_name','','trim'),//单位名称
-            'unit_user' => request()->param('unit_sample.unit_user','','trim'),//联系人
-            'address' => request()->param('unit_sample.address','','trim'),//通讯地址
-            'postcode' => request()->param('unit_sample.postcode','','trim'),//邮编
-            'phone' => request()->param('unit_sample.phone','','trim'),//联系电话
-            'fax' => request()->param('unit_sample.fax','','trim'),//传真
-            'email' => request()->param('unit_sample.email','','trim'),//Email
-        ];
-
-        //抽样单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 未赋值
-
-//            'units_id' => request()->param('units_id','','trim'),//受检单位id---在business中赋值
-//            'product_unit' => request()->param('product_unit','','trim'),//生产单位id---在business中赋值
-//            'sample_unit' => request()->param('sample_unit','','trim'),//抽样单位id---在business中赋值
-
-            'sample_name' => request()->param('cyd_data.sample_name','','trim'),//样品名称
-            'brand' => request()->param('cyd_data.brand','','trim'),//商标
-            'ispack' => request()->param('cyd_data.ispack','','trim'),//包装
-            'type' => request()->param('cyd_data.type','','trim'),//型号规格
-            'standard' => request()->param('cyd_data.standard','','trim'),//执行标准
-            'production_date' => request()->param('cyd_data.production_date','','trim'),//生产日期或批号
-            'place' => request()->param('cyd_data.place','','trim'),//	产地
-            'certicfie' => request()->param('cyd_data.certicfie','','trim'),//*产品认证情况
-            'certifie_num' => request()->param('cyd_data.certifie_num','','trim'),//证书编号
-            'sample_num' => request()->param('cyd_data.sample_num','','trim'),//*抽样数量
-            'sample_num_unit' => request()->param('cyd_data.sample_num_unit','','trim'),//*抽样数量单位
-            'sample_base' => request()->param('cyd_data.sample_base','','trim'),//抽样基数
-            'sample_base_unit' => request()->param('cyd_data.sample_base_unit','','trim'),//抽样基数单位
-            'sample_ground' => request()->param('cyd_data.sample_ground','','trim'),//*抽样场所
-            'base' => request()->param('cyd_data.base', '', 'trim'),//检测任务依据
-            'sample_date'=>request()->param('cyd_data.sample_date','','trim'),//抽样时间
-            'file_name' => request()->param('cyd_data.file_name','','trim'),//文件名
-            'file_url' => request()->param('cyd_data.file_url','','trim'),//文件链接
-        ];
-
-        $result = (new SampleBus())->createSample($unit_test, $unit_production, $unit_sample, $cyd_data);
-        return showSuccess($result);
-    }
 
 }

app/api/controller/v1/Traceability.php

@@ -1,252 +0,0 @@
-<?php
-namespace app\api\controller\v1;
-use app\api\model\Chanpin;
-use app\api\model\Chandi;
-use app\api\model\Qy_basic;
-use app\api\model\Zd_cpmc;
-use app\api\model\Sym;
-use app\api\model\Nszy;
-use app\api\model\Trpsy;
-use OpenApi\Annotations as OA;
-use app\BaseController;
-use thans\jwt\facade\JWTAuth;
-//use think\Db;
-use think\facade\Request as re;
-use think\Request;
-use thans\jwt\JWT;
-use app\validate\Chandi as ChandiValidate;
-use think\exception\ValidateException;
-use rsa\Rsa;
-//use think\Facade\Db;
-
-class Traceability extends BaseController
-{
-    use ResponseJson;
-    protected $request;
-    protected $middleware = [
-        'jwt' => ['except' => []],
-//        'SelectProductionInfo','TraceabilityPrint','TraceabilityPrint2','ShowInformation'
-    ];
-
-    public function __construct(Request $request)
-    {
-        $this->request = $request;
-    }
-
-
-    //溯源码打印界面，选择产品批次号接口
-    public function SelectProductionInfo(){
-
-        $data = $this->request->post();
-        $query=$data['query'];
-        $qydm=$data['qydm'];
-
-        if($query){
-            $result['rows']=Chanpin::
-                where([
-                    ['t_chanpin.qydm', '=', $qydm],
-                    ['t_zd_cpmc.cpmc', 'like', '%'.$query .'%']
-                ])
-                ->field("t_chanpin.*,t_qy_basic.qymc,t_zd_cpmc.cpgg,t_zd_cpmc.cpmc")
-                ->leftJoin('t_qy_basic','t_chanpin.qydm=t_qy_basic.qydm')
-                ->leftJoin('t_zd_cpmc','t_chanpin.cpbh=t_zd_cpmc.cpbh and t_chanpin.qydm=t_zd_cpmc.qydm')
-                ->select();
-            $result['total']=Chanpin::
-            where([
-                ['t_chanpin.qydm', '=', $qydm],
-                ['t_zd_cpmc.cpmc', 'like', '%'.$query .'%']
-            ])
-                ->field("t_chanpin.*,t_qy_basic.qymc,t_zd_cpmc.cpgg,t_zd_cpmc.cpmc")
-                ->leftJoin('t_qy_basic','t_chanpin.qydm=t_qy_basic.qydm')
-                ->leftJoin('t_zd_cpmc','t_chanpin.cpbh=t_zd_cpmc.cpbh and t_chanpin.qydm=t_zd_cpmc.qydm')
-                ->count();
-        }
-
-        else{
-            $result['rows']=Db::name('chanpin')
-                ->where('t_chanpin.qydm', '=', $qydm)
-                ->field("t_chanpin.*,t_qy_basic.qymc,t_zd_cpmc.cpgg,t_zd_cpmc.cpmc")
-                ->leftJoin('t_zd_cpmc','t_chanpin.cpbh=t_zd_cpmc.cpbh and t_chanpin.qydm=t_zd_cpmc.qydm')
-                ->leftJoin('t_qy_basic','t_chanpin.qydm=t_qy_basic.qydm')
-                ->select();
-            $result['total']=Db::name('chanpin')->where('t_chanpin.qydm', '=', $qydm)->count();
-        }
-
-//        $publicEncrypt = $rsa->publicEncrypt(json_encode($result)); //公钥加密
-
-            if($result){
-                return $this->jsonSuccessData($result);
-            }
-            else{
-                return $this->jsonData(-1,"无查询结果");
-            }
-    }
-
-
-
-    /*溯源码打印功能,先输入信息，后打码*/
-    public function TraceabilityPrint(){
-        //加密
-//        require_once(dirname(__FILE__)."/Rsa.php");
-//        $rsa = new Rsa();
-
-        $data = $this->request->post();
-        $nums = $data['nums'];
-        $cpmc = $data['cpmc'];
-        $pch = $data['pch'];
-        $qydm= $data['qydm'];
-
-        $bh = Qy_basic::where('t_qy_basic.qydm','=',$qydm)->field('t_qy_basic.bh,t_qy_basic.qymc,t_qy_basic.fzrtel')->find();
-        $result = Chanpin::where([
-            ['t_chanpin.qydm', '=', $qydm],
-            ['t_chanpin.pch', '=',$pch]
-        ])
-            ->field('t_chanpin.chandi,t_chanpin.rq')
-            ->find();
-        $chandi = $result['chandi'];
-        $ret = Chandi::where([
-            ['t_chandi.qydm', '=', $qydm],
-            ['t_chandi.chandi', '=',$chandi]
-        ])
-            ->field('t_chandi.*')
-            ->find();
-        $rets = Zd_cpmc::where([
-            ['t_zd_cpmc.qydm', '=', $qydm],
-            ['t_zd_cpmc.cpmc', '=',$cpmc]
-        ])
-            ->find();
-
-
-        for($i=0;$i<$nums;$i++){
-
-            $numbers=rand(10000,19999);
-            $symMes['qydm'] = $qydm;
-            $symMes['cpbh'] = $rets['cpbh'];
-            $symMes['cdbh'] = $ret['cdbh'];
-            $symMes['pch'] = $pch;
-            $symMes['date'] = date("Y-m-d");
-            $symMes['sym']=$bh['bh'].reter(substr($data['pch'],0,2)).
-                reter(substr($data['pch'],2,2)).
-                reter(substr($data['pch'],4,2)).
-                substr($data['pch'],6,2).substr($numbers,0,5);
-            $Infomation[$i]['sym'] = $symMes['sym'];
-            $symres = Sym::create($symMes);
-        }
-
-//        dump($symres);die();
-        /*以上部分完成溯源码的生成*/
-        /*下面开始完成根据$symres['bh']查找该条溯源码的信息*/
-
-        $infomations = array();
-        for($i=0;$i<$nums;$i++) {
-            $infomations[$i]['qymc'] = $bh['qymc'];
-            $infomations[$i]['fzrtel'] = $bh['fzrtel'];
-            $infomations[$i]['sym'] = $Infomation[$i]['sym'];
-            $infomations[$i]['date'] = $result['rq'];
-            $infomations[$i]['cpmc'] = $cpmc;
-            $infomations[$i]['chandi'] = $ret['chandi'];
-            $infomations[$i]['cpgg'] = $rets['cpgg'];
-            $infomations[$i]['url'] = 'http://www.aielab.net/ah/S?'.$Infomation[$i]['sym'];
-        }
-
-//        $infomations['qymc'] = $bh['qymc'];
-//        $infomations['fzrtel'] = $bh['fzrtel'];
-//        $infomations['sym'] = $symres['sym'];
-//        $infomations['date'] = $result['rq'];
-//        $infomations['cpmc'] = $cpmc;
-
-//        $publicEncrypt = $rsa->publicEncrypt(json_encode($infomations)); //公钥加密
-
-        if($infomations){
-            return $this->jsonSuccessData($infomations);
-        }else{
-            return $this->jsonData(-1,'无查询结果');
-        }
-
-    }
-
-
-
-    /*溯源码打印功能,先生成溯源码，后补充信息*/
-    public function TraceabilityPrint2(){
-
-        $data = $this->request->post();
-        $qydm = $data['qydm'];
-
-        $bh = Qy_basic::where('qydm','=',$qydm)->field('bh')->find();
-        $randomnums = generate_word();
-        $numbers=rand(10000,19999);
-        $symMes['sym']=$bh['bh'].$randomnums.substr($numbers,0,5);
-        $symMes['date'] = date("Y-m-d");
-        $symMes['qydm'] = $qydm;
-        $symres = Sym::create($symMes);
-
-//        $publicEncrypt = $rsa->publicEncrypt(json_encode($symres)); //公钥加密
-
-        if($symres){
-            return $this->jsonSuccessData($symres);
-        }else{
-            return $this->jsonData(-1,'无查询结果');
-        }
-    }
-
-
-
-    /*扫码显示界面的信息*/
-    public function ShowInformation(){
-        //加密
-//        require_once(dirname(__FILE__)."/Rsa.php");
-//        $rsa = new Rsa();
-
-        $data = $this->request->post();
-        $qydm = $data['qydm'];
-
-        $symresult  =  Sym::where('t_sym.sym','=',$data['sym'])->field("t_sym.pch,t_sym.cdbh,t_sym.cpbh,t_sym.qydm")->find();
-//        dump($symresult);die();
-        $information  =  Qy_basic::where('t_qy_basic.qydm','=',$qydm)->field("t_qy_basic.dwjj,t_qy_basic.qymc,t_qy_basic.fzrtel")->find();
-        $productresult  =  Zd_cpmc::where([
-            ['t_zd_cpmc.cpbh','=',$symresult['cpbh']],
-            ['t_zd_cpmc.qydm','=',$qydm]
-        ])
-            ->field("t_zd_cpmc.cpmc,t_zd_cpmc.picname,t_zd_cpmc.bzq,t_zd_cpmc.ms,t_zd_cpmc.cpgg")
-            ->find();
-        $chanpinresult  = Chanpin::where([
-            ['t_chanpin.pch','=',$symresult['pch']],
-            ['t_chanpin.qydm','=',$qydm]
-        ])
-            ->field("t_chanpin.rq,t_chanpin.chandi")
-            ->find();
-        $nszyresult  = Nszy::where([
-            ['t_nszy.cdbh','=',$symresult['cdbh']],
-            ['t_nszy.qydm','=',$qydm]
-        ])
-            ->field("t_nszy.nszy,t_nszy.trpmc,t_nszy.zyl,t_nszy.zyldw,t_nszy.rq,t_nszy.zyr")
-            ->select();
-        $trpresult  = Trpsy::where([
-            ['t_trpsy.cdbh','=',$symresult['cdbh']],
-            ['t_trpsy.qydm','=',$qydm]
-        ])
-            ->field("t_trpsy.trpm,t_trpsy.trpgg,t_trpsy.cgrq,t_trpsy.cgr")
-            ->select();
-
-        $information['cpmc'] = $productresult['cpmc'];
-        $information['bzq'] = $productresult['bzq'];
-        $information['ms'] = $productresult['ms'];
-        $information['cpgg'] = $productresult['cpgg'];
-        $information['picname'] = "http://qklapi.ahaia.net/Uploads/".$qydm."/".$productresult['picname'];
-        $information['rq'] = $chanpinresult['rq'];
-        $information['chandi'] = $chanpinresult['chandi'];
-        $information['nszy'] = $nszyresult;
-        $information['trpsy'] = $trpresult;
-
-//        $publicEncrypt = $rsa->publicEncrypt(json_encode($information)); //公钥加密
-
-        if($symresult['pch']&&$symresult['cpbh']!=null) {
-            return $this->jsonSuccessData($information);
-        }else if($symresult==null) {
-            return $this->jsonData(-1, "该溯源码不存在");
-        }
-
-    }
-
-}

app/api/controller/v1/Undertaker.php

@@ -1,52 +0,0 @@
-<?php
-/**
- *
- *User:Administrator
- *Date:2021/10/12
- */
-
-namespace app\api\controller\v1;
-
-//承担单位
-use app\api\business\UndertakerTaskBus;
-
-class Undertaker
-{
-    public function createUnderTaker()
-    {
-        $data = [
-            'task_id' => request()->param('task_id','','int'),
-            'bear_id' => request()->param('bear_id','','int'),//抽样机构
-            'check_id' => request()->param('check_id','','int'),//检测机构
-            'report_id' => request()->param('report_id','','int'),//报告上传单位
-            'address' => request()->param('address','','trim'),//抽样地址
-            'upload_time' => request()->param('uploadtime'),//报告上传时间
-            'sample_number' => request()->param('sample_number'),//样本数量
-        ];
-        $result = (new UndertakerTaskBus())->createUnderTakerInfo($data);
-        return showSuccess($result);
-    }
-
-    public function deleteUnderTaskList()
-    {
-        $del_arr = request()->param('delarr', '', 'trim');
-        $result = (new UndertakerTaskBus())->deleteUnderTaker($del_arr);
-        return showSuccess($result);
-    }
-
-    public function selectUndertakerTaskList()
-    {
-        $task_class = request()->param('task_class','例行监测','trim');
-        $pageNum = request()->param('pageNum',1,'int');
-        $pageSize = request()->param('pageSize',10,'int');
-        $data=[
-            'year'=>request()->param('year','','trim'),//年度
-            'ispublic'=>request()->param('ispublic','','trim'),//任务状态：0：未发布，1：执行中，2：已结束未完成，3：已结束已完成
-            'starttime' => request()->param('starttime','','trim'),//任务开始时间
-            'endtime' => request()->param('endtime','','trim'),//任务结束时间
-            'task_name' => request()->param('task_name','','trim'),//任务名称
-        ];
-        $result = (new UndertakerTaskBus())->selectUndertakerTaskList($task_class,$pageNum,$pageSize,$data);
-        return showSuccess($result);
-    }
-}

app/api/model/TestModel.php

@@ -41,12 +41,7 @@ class TestModel extends Model
         return $pesticides;
     }
 
-    /**
-     * @param $uid
-     * @param int $pageNum
-     * @param int $pageSize
-     * @param array $where:type_id为int
-     */
+
     public function getListByUserId($uid,$pageNum=1,$pageSize=10,$where=[])
     {
         return $this->where('user_id','=',(int)$uid)->where($where)->page($pageNum,$pageSize)->select();

app/api/route/app.php

@@ -28,8 +28,8 @@ Route::group(function () {
     Route::post(":version.delModel",":version.Model/deleteModelInfo");                           //删除模型
     Route::post(":version.getModeldetail",":version.Model/getModelInfo");                       //获取某个模型的详情信息
     Route::post(":version.DoEditModelInfo",":version.Model/updateModelInfo");                   //修改模型详情
-    Route::post(":version.getPesticidesList",":version.Pesticides/selectPesticidesList");        //获取检测项目列表         #模型中 #修改检测项目 #获取检测项目
-    Route::post(":version.getProductList",":version.Product/selectProductList");                 //获取检测对象列表         #模型中 #修改检测对象 #获取检测对象
+    Route::post(":version.getPesticidesList",":version.Model/selectPesticidesList");            //获取检测项目列表         #模型中 #修改检测项目 #获取检测项目
+    Route::post(":version.getProductList",":version.Model/selectProductList");                 //获取检测对象列表         #模型中 #修改检测对象 #获取检测对象
 
 
 
@@ -39,46 +39,29 @@ Route::group(function () {
     Route::post(":version.getTaskDetail",":version.QianTou/getTaskInfo");                     //获取任务信息                 #牵头     #任务     #detail
     Route::post(":version.getTestList",":version.QianTou/getTestUnitList");                    //获取检测单位，获取抽样单位       #牵头单位   #机构与地域  #选择机构
 
-
-    Route::post(":version.AddUnderTask",":version.Undertaker/createUnderTaker");                //在牵头单位中 创建承担任务
-    Route::post(":version.delUnderTask",":version.Undertaker/deleteUnderTaskList");      //牵头单位中 删除创建的承担任务
-
-    //牵头单位相关路由
-
-
-
-
-
-
-    Route::post(":version.getTaskcd",":version.Undertaker/selectUndertakerTaskList");      //承担单位获取承担单位任务列表
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+    Route::post(":version.AddUnderTask",":version.QianTou/createUnderTaker");                    //在牵头单位中 创建承担任务
+    Route::post(":version.delUnderTask",":version.QianTou/deleteUnderTaskList");                //牵头单位中 删除创建的承担任务
 
 
 
+    //承担单位 todo validate从下面开始validate没写
 
+    Route::post(":version.getTaskcd",":version.ChengDan/selectUndertakerTaskList");                 //获取承担的任务列表
+    Route::post(":version.getTaskInfo",":version.ChengDan/getTaskDetail");                          //获取任务信息（执行检测）
+    Route::post(":version.getSampleTaskList",":version.ChengDan/getSampleTaskList");         //获取抽样任务列表
+    Route::post(":version.getCheckTaskList",":version.ChengDan/getCheckTaskList");           //获取检测任务列表
+    Route::post(":version.getReportTaskList",":version.ChengDan/getReportTaskList");         //获取报告上传任务列表
 
+    //抽样单 相关路由
+    Route::post(":version.getTestObj",":version.Cyd/getSampleObj");        //填报抽样单-step1 获取信息
+    Route::post(":version.getSampleId",":version.Cyd/createSampleId");     //填报抽样单-step1 生成样品编码
+    Route::post(":version.saveSample",":version.Cyd/createSample");        //填报抽样单-step3 保存信息
 
+    Route::post(":version.getSampleList",":version.Cyd/selectSampleList");        // 查询抽样单详细信息列表
 
+    Route::post(":version.getCydList",":version.Cyd/getCydList");        //获取抽样单列表
+    Route::post(":version.getSampleDetail",":version.Cyd/getCydDetail");        //获取抽样单详情
+    Route::post(":version.upCydItem",":version.Cyd/upCydItem");        //上报抽样单
 
 
     //检测单 相关路由
@@ -89,54 +72,11 @@ Route::group(function () {
     Route::post(":version.getTestValue",":version.Jcd/createTestValue");        //生成检测报告
 
 
-
-
-
-
-
-    //抽样单 相关路由
-    Route::post(":version.getCydList",":version.Cyd/getCydList");        //获取抽样单列表
-    Route::post(":version.getSampleDetail",":version.Cyd/getCydDetail");        //获取抽样单详情
-    Route::post(":version.upCydItem",":version.Cyd/upCydItem");        //上报抽样单
-
-    //填报抽样单
-    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.getTaskDetail",":version.QianTou/getTaskInfo");        //获取任务信息--same牵头单位路由获取任务信息,写在下面了
-    Route::post(":version.getSampleList",":version.Sample/selectSampleList");        // 查询抽样单详细信息列表
-    //Route::post(":version.getUnderTask",":version.index/getUnderTask");      //获取承担单位--same牵头单位路由获取承担单位信息
-
-
-    //执行检测-承担单位中，执行检测获取任务信息
-    Route::post(":version.getTaskInfo",":version.TaskInformation/getTaskDetail");      //获取任务详情
-    Route::post(":version.getSampleTaskList",":version.TaskInformation/getSampleTaskList");//获取抽样任务列表
-    Route::post(":version.getCheckTaskList",":version.TaskInformation/getCheckTaskList");//获取检测任务列表
-    Route::post(":version.getReportTaskList",":version.TaskInformation/getReportTaskList");//获取报告上传任务列表
-
-
-
-
 })->allowCrossDomain()->middleware(JwtAuth::class);
 
 //通用库的controller路由
 Route::post(":version.ossUpload",":version.Upload/upload")->allowCrossDomain();       //上传文件到oss
 
-/**
- *
-POST（CREATE）：在服务器新建一个资源。
-DELETE（DELETE）：从服务器删除资源。
-PUT（UPDATE）：在服务器更新资源（客户端提供改变后的完整资源）。
-GET（SELECT）：从服务器取出资源（一项或多项）。
-PATCH（UPDATE）：在服务器更新资源（客户端提供改变的属性）。
- */
 //
 //Route::post(":version.loginOut",":version.Index/loginOut");        //登出
 //