添加机构级别

app/api/business/JianGuanBus.php

@@ -10,10 +10,12 @@ use app\common\lib\auth\JwtAuth;
 class JianGuanBus
 {
     private $rymc;
+    private $group_name;
     public function __construct()
     {
         $jwtAuth=JwtAuth::getInstance();            //实例化jwtAuth
         $this->rymc = $jwtAuth->getRymc();          //setRybh是在middleware/jwtAuth中完成的
+        $this->group_name = $jwtAuth->getGroupname();//获取机构级别
     }
 
     //查询任务列表数据
@@ -43,6 +45,7 @@ class JianGuanBus
     //创建任务
     public function createTask($data,$orgs_data)
     {
+        $data['releaser_group'] = $this->group_name;
         $data['creater'] = $this->rymc;
         //创建任务
         $task_id = (new Ccjc())->createTask($data);

app/api/business/ModelBus.php

@@ -64,6 +64,7 @@ class ModelBus
             'endtime_cydsb' => $data['endtime_cydsb'],
             'is_divide' => $data['is_divide'],
             'test_model_id' => $data['test_model_id'],
+            'industry' => (new TestModel())->getModelInfoByModelID($data['test_model_id'])['type_id'],
         ];
         $result = (new Ccjc())->updateInfoByTaskID($task_id, $tmp_data);
         return $result;

app/api/business/QianTouBus.php

@@ -12,6 +12,7 @@ use app\api\model\Jgry;
 use app\api\model\Orgs;
 use app\api\model\TestModel;
 use app\api\model\Undertake;
+use app\common\lib\Arr;
 use app\common\lib\auth\JwtAuth;
 
 class QianTouBus
@@ -22,6 +23,13 @@ class QianTouBus
         $jwtAuth=JwtAuth::getInstance();            //实例化jwtAuth
         $this->uid = $jwtAuth->getUid();          //setRybh是在middleware/jwtAuth中完成的
     }
+    //获取机构与地域信息
+    public function getUndertakeList($data)
+    {
+        $result = (new Undertake())->getItemByTaskId($data['task_id'],$data['pageNum'],$data['pageSize']);
+        $total = (new Undertake())->countItemByTaskId($data['task_id']);
+        return ['rows' => $result, 'total' => $total];
+    }
 
     //查询任务列表数据
     public function selectTaskList($data)
@@ -103,6 +111,12 @@ class QianTouBus
         return $data;
     }
 
+    //获取任务基本信息
+    public function getTaskBaseInfo($data)
+    {
+        $task_info = (new Ccjc())->getTaskInfoByTaskID($data['task_id'])->toArray();
+        return $task_info;
+    }
 
 
 }

app/api/controller/v1/JianGuan.php

@@ -9,6 +9,8 @@ namespace app\api\controller\v1;
 
 use app\api\business\JianGuanBus;
 use app\api\business\SuperviserTaskBus;
+use app\api\model\Jcdw;
+use app\api\model\Orgs;
 use app\api\validate\TaskValidate;
 use think\exception\ValidateException;
 
@@ -107,4 +109,12 @@ class JianGuan
         return showSuccess($result);
     }
 
+
+    //获取牵头单位名称和id
+    public function getJgQtName()
+    {
+        $result = (new Jcdw())->getDistinctUnit();
+        return showSuccess($result);
+    }
+
 }

app/api/controller/v1/QianTou.php

@@ -17,6 +17,16 @@ use think\exception\ValidateException;
 
 class QianTou
 {
+    public function getTaskBaseInfo()
+    {
+        $data = [
+            'task_id' => request()->param('task_id', '', 'int'),
+        ];
+        $result = (new QianTouBus())->getTaskBaseInfo($data);
+        return showSuccess($result);
+
+    }
+
 
     public function selectQtTaskList()
     {
@@ -98,4 +108,15 @@ class QianTou
         $result = (new ChengDanBus())->deleteUnderTaker($del_arr);
         return showSuccess($result);
     }
+
+    public function getUndertakeList()
+    {
+        $data = [
+            'task_id' => request()->param('task_id', '', 'int'),
+            'pageNum' => request()->param('pageNum', '1', 'int'),
+            'pageSize' => request()->param('pageSize', '', 'int'),
+        ];
+        $result = (new QianTouBus())->getUndertakeList($data);
+        return showSuccess($result);
+    }
 }

app/api/model/Jcdw.php

@@ -51,4 +51,10 @@ class Jcdw extends model{
         return $this->where($where)->select()->count();
     }
 
+    //获取唯一的牵头单位名称
+    public function getDistinctUnit()
+    {
+        return $this->distinct('true')->field('id,name,jgxz,ssqy,cpfw')->select();
+    }
+
 }

app/api/model/Orgs.php

@@ -43,4 +43,6 @@ class Orgs extends Model {
         return $result;
     }
 
+
+
 }

app/api/model/Undertake.php

@@ -21,6 +21,17 @@ class Undertake extends Model
         return $this->select($id_arr)->delete();
     }
 
+    public function getItemByTaskId($task_id,$pageNum,$pageSize)
+    {
+        return $this->where('task_id', '=', $task_id)->page((int)$pageNum,(int)$pageSize)->select();
+    }
+
+    public function countItemByTaskId($task_Id)
+    {
+        return $this->where('task_id', '=', $task_Id)->count();
+
+    }
+
     //获取抽样任务列表
     public function selectByTaskIdAndWhere($task_id, $where='',$pageNum=1,$pageSize=null)
     {

app/api/route/app.php

@@ -21,6 +21,7 @@ Route::group(function () {
     Route::post(":version.delTask",":version.JianGuan/deleteTaskItem");                       //删除任务                 #监管
     Route::post(":version.isPublicTask",":version.JianGuan/editTaskUpdateInfo");              //修改任务：发布/废止        #监管
     Route::post(":version.getJgCydList",":version.Cyd/getJgCydList");                         //监管端查看抽样单           #监管    #抽样单
+    Route::post(":version.getQtouList",":version.JianGuan/getJgQtName");                         //监管端获取牵头单位名称           #监管    #牵头 #名称
 
 
 
@@ -37,13 +38,15 @@ Route::group(function () {
 
 
     //牵头单位
+    Route::post(":version.getTestList",":version.QianTou/getTestUnitList");                    //获取检测单位，获取抽样单位       #牵头单位   #机构与地域  #选择机构
     Route::post(":version.qtRelease",":version.QianTou/qtRelease");                           //牵头单位发布任务            #修改的是整个任务的状态
     Route::post(":version.getTaskTest",":version.QianTou/selectQtTaskList");                  //获取牵头单位所属任务        #牵头
     Route::post(":version.getTaskDetail",":version.QianTou/getTaskInfo");                     //获取任务信息                 #牵头     #任务     #detail
-    Route::post(":version.getTestList",":version.QianTou/getTestUnitList");                    //获取检测单位，获取抽样单位       #牵头单位   #机构与地域  #选择机构
 
     Route::post(":version.AddUnderTask",":version.QianTou/createUnderTaker");                    //在牵头单位中 创建承担任务
     Route::post(":version.delUnderTask",":version.QianTou/deleteUnderTaskList");                //牵头单位中 删除创建的承担任务
+    Route::post(":version.getTaskBaseInfo",":version.QianTou/getTaskBaseInfo");                //牵头单位中 获取任务的基本信息
+    Route::post(":version.getUndertakeList",":version.QianTou/getUndertakeList");                //牵头单位中 获取机构与地域信息