我的-学习工作

application/api_broker/controller/UploadWorkLearning.php

@@ -63,4 +63,43 @@ class UploadWorkLearning extends Basic
         }
         return $this->response($code, $msg, $img_name);
     }
+
+    /**
+     * 我的-0素质测评 1方法分析 2价值观考核
+     *
+     * @param $params
+     * @param $type
+     * @return mixed
+     */
+    public function getWorkLearningList()
+    {
+        $page_no = empty($this->params['page_no']) ? 1 : $this->params['page_no'];
+        $page_size = empty($this->params['page_size']) ? 10 : $this->params['page_size'];
+
+        // 经纪人筛选
+        if (!empty($this->params['agent_id'])) {
+            $where['agent_id'] = $this->params['agent_id'];
+        }
+        $where['agent_id'] = 1;
+        $where['type'] = $this->params['type'];//0素质测评 1方法分析 2价值观考核
+        $where['is_del'] = 0;
+        try {
+            $work = new RWorkLearningModel();
+            $list = $work->getList($page_no, $page_size, 'id desc', 'create_time,img_url', $where);
+
+            foreach ($list as $k=>$v) {
+                $list[$k]['img_url'] = 'static/week_work_img/'.$v['img_url'];
+                $list[$k]['create_time'] = date('Y-m-d', strtotime($v['create_time']));
+            }
+
+            $result['data'] = $list;
+            $result['code'] = 200;
+            $result['msg']  = '';
+        } catch (\Exception $e) {
+            $result['code'] = 101;
+            $result['msg']  = '内部错误:'.$e->getMessage();
+        }
+
+        return $this->response($result['code'], $result['msg'], $result['data']);
+    }
 }
\ No newline at end of file

application/api_broker/controller/WorkLearningMy.php

-<?php
-
-
-namespace app\api_broker\controller;
-
-
-use app\api_broker\extend\Basic;
-use app\model\RWorkLearningModel;
-
-class WorkLearningMy extends Basic
-{
-    /**
-     * 我的-0素质测评 1方法分析 2价值观考核
-     *
-     * @param $params
-     * @param $type
-     * @return mixed
-     */
-    public function getWorkLearningList($params, $type)
-    {
-        $page_no = empty($this->params['page_no']) ? 1 : $this->params['page_no'];
-        $page_size = empty($this->params['page_size']) ? 10 : $this->params['page_size'];
-
-        // 时间筛选
-        if (!empty($params['start_date']) && !empty($params['end_date'])) {
-            $where['a.create_time'] = ['between', [$params['start_date'] . ' 00:00:00', $params['end_date'] . ' 23:59:59']];
-        }
-
-        // 部门筛选
-        if (!empty($params['district_id'])) {
-            $where['b.district_id'] = $params['district_id'];
-        }
-
-        // 门店筛选
-        if (!empty($params['store_id'])) {
-            $where['b.store_id'] = $params['store_id'];
-        }
-
-        // 经纪人筛选
-        if (!empty($params['agent_id'])) {
-            $where['b.id'] = $params['agent_id'];
-        }
-
-        // 日报周报筛选 10业务员 20店长  30总监
-        if (!empty($params['site_id'])) {
-            $where['b.site_id'] = $params['site_id'];
-        }
-
-        $where['a.type'] = $type;//0素质测评 1方法分析 2价值观考核
-        $where['a.is_del'] = 0;
-        try {
-            $work = new RWorkLearningModel();
-            $field = 'a.create_time,a.img_url,b.agent_name';
-            $list = $work->getWordAgentList($page_no, $page_size, 'id desc', $field, $where);
-            $result['data']['list'] = $list;
-            $result['data']['total'] = $work->getWorkAgentListTotal($where);
-            $result['code'] = 200;
-            $result['msg']  = '';
-        } catch (\Exception $e) {
-            $result['code'] = 101;
-            $result['msg']  = '内部错误:'.$e->getMessage();
-        }
-
-        return $result;
-    }
-}
\ No newline at end of file

application/route.php

@@ -1048,7 +1048,7 @@ Route::group('broker', [
     'getApplyForFeeStore' => ['api_broker/StoreFee/getApplyForFeeStore', ['method' => 'GET']],//获取门店地址
     'deviceList'          => ['api_broker/Broker/deviceList', ['method' => 'GET']],//设备列表
     'uploadWorkLearning'  => ['api_broker/UploadWorkLearning/workLearningImage', ['method' => 'POST']],//保存0素质测评 1方法分析 2价值观考核图片
-    'getWorkLearningList' => ['api_broker/WorkLearningMy/getWorkLearningList', ['method' => 'GET']],//保存0素质测评 1方法分析 2价值观考核图片
+    'getWorkLearningList' => ['api_broker/UploadWorkLearning/getWorkLearningList', ['method' => 'GET']],//保存0素质测评 1方法分析 2价值观考核图片
 
     'subletList'          => ['api_broker/Sublet/subletList', ['method' => 'GET']],//委托转铺列表