Browse Source

监管端能查看下级单位发布的任务

gbsong 3 years ago
parent
commit
e4751d557f
2 changed files with 22 additions and 6 deletions
  1. 17 1
      app/api/business/JianGuanBus.php
  2. 5 5
      app/api/controller/v1/JianGuan.php

+ 17 - 1
app/api/business/JianGuanBus.php

@@ -11,18 +11,33 @@ class JianGuanBus
 {
     private $rymc;
     private $group_name;
+    private $qydm;
     public function __construct()
     {
         $jwtAuth=JwtAuth::getInstance();            //实例化jwtAuth
         $this->rymc = $jwtAuth->getRymc();          //setRybh是在middleware/jwtAuth中完成的
         $this->group_name = $jwtAuth->getGroupname();//获取机构级别
+        $this->qydm = $jwtAuth->getQydm();//获取企业代码(其实是地区编号)
     }
 
     //查询任务列表数据
     public function selectTask($data)
     {
+        $qydm_tmp='';
+        $qydm_len = strlen($this->qydm);
+        for ($i = 0; $i < $qydm_len; $i++) {
+            $qydm_tmp .= $this->qydm[$i];
+
+            if ($this->qydm[$i] == 0 &&$this->qydm[$i-1]==0) {
+                $qydm_find=substr($qydm_tmp,0,$i-1);
+                break;
+            }
+        }
+
         //如果需要查询的字段不为空就push一个查询条件
-        $where=[];//初始化$where
+        $where=[
+            ['qydm', 'LIKE', $qydm_find.'%']
+        ];//初始化$where
         //任务年度
         if ($data['year']!='') array_push($where, ['year', '=', $data['year']]);
         //任务状态:0:未发布,1:执行中,2:已结束未完成,3:已结束已完成
@@ -46,6 +61,7 @@ class JianGuanBus
     public function createTask($data,$orgs_data)
     {
         $data['releaser_group'] = $this->group_name;
+        $data['qydm'] = $this->qydm;
         $data['creater'] = $this->rymc;
         //创建任务
         $task_id = (new Ccjc())->createTask($data);

+ 5 - 5
app/api/controller/v1/JianGuan.php

@@ -32,11 +32,11 @@ class JianGuan
             'endtime' => request()->param('endtime','','trim'),//任务结束时间
             'task_name' => request()->param('task_name','','trim'),//任务名称
         ];
-        try {
-            validate(TaskValidate::class)->scene('selectJgTaskList')->check($data);
-        } catch (ValidateException $exception) {
-            return showError($exception->getError());
-        }
+//        try {
+//            validate(TaskValidate::class)->scene('selectJgTaskList')->check($data);
+//        } catch (ValidateException $exception) {
+//            return showError($exception->getError());
+//        }
 
         $res= (new JianGuanBus())->selectTask($data);
         return showSuccess($res);