完善功能

app/admin/controller/client/MessageController.php

@@ -6,6 +6,7 @@ use app\controller\Curd;
 use app\model\ClientMessage;
 use support\exception\BusinessException;
 use support\Request;
+use support\Response;
 
 class MessageController extends Curd
 {
@@ -14,9 +15,18 @@ class MessageController extends Curd
         $this->model = new ClientMessage();
     }
 
+    public function select(Request $request): Response
+    {
+        [$where, $format, $limit, $field, $order] = $this->selectInput($request);
+        $order = $request->get('order', 'desc');
+        $field = $field ?? 'client_message_addtimes';
+        $query = $this->doSelect($where, $field, $order);
+        return $this->doFormat($query, $format, $limit);
+    }
+
     protected function doSelect(array $where, string $field = null, string $order = 'desc')
     {
-        $model = $this->model->with('member');
+        $model = $this->model->with(['member', 'cert']);
         foreach ($where as $column => $value) {
             if (is_array($value)) {
                 if ($value[0] === 'like' || $value[0] === 'not like') {
@@ -59,11 +69,11 @@ class MessageController extends Curd
         if (!empty($data['client_message_datetimes'])) {
             $data['client_message_datetimes'] = date('Y-m-d H:i:s', strtotime($data['client_message_datetimes']));
         }
-        if (!empty($data['client_message_header_json']) && !is_json($data['client_message_header_json'])){
-            $data['client_message_header_json'] = json_encode(['header'=>$data['client_message_header_json']]);
+        if (!empty($data['client_message_header_json']) && !is_json($data['client_message_header_json'])) {
+            $data['client_message_header_json'] = json_encode(['header' => $data['client_message_header_json']]);
         }
-        if (!empty($data['client_message_body_json']) && !is_json($data['client_message_body_json'])){
-            $data['client_message_body_json'] = json_encode(['header'=>$data['client_message_body_json']]);
+        if (!empty($data['client_message_body_json']) && !is_json($data['client_message_body_json'])) {
+            $data['client_message_body_json'] = json_encode(['header' => $data['client_message_body_json']]);
         }
         return $data;
     }
@@ -81,11 +91,11 @@ class MessageController extends Curd
         if (!empty($data['client_message_datetimes'])) {
             $data['client_message_datetimes'] = date('Y-m-d H:i:s', strtotime($data['client_message_datetimes']));
         }
-        if (!empty($data['client_message_header_json']) && !is_json($data['client_message_header_json'])){
-            $data['client_message_header_json'] = json_encode(['header'=>$data['client_message_header_json']]);
+        if (!empty($data['client_message_header_json']) && !is_json($data['client_message_header_json'])) {
+            $data['client_message_header_json'] = json_encode(['header' => $data['client_message_header_json']]);
         }
-        if (!empty($data['client_message_body_json']) && !is_json($data['client_message_body_json'])){
-            $data['client_message_body_json'] = json_encode(['header'=>$data['client_message_body_json']]);
+        if (!empty($data['client_message_body_json']) && !is_json($data['client_message_body_json'])) {
+            $data['client_message_body_json'] = json_encode(['header' => $data['client_message_body_json']]);
         }
         unset($data[$primary_key]);
         return [$id, $data];

app/admin/controller/life/CollegeCoursesController.php

@@ -36,6 +36,8 @@ class CollegeCoursesController extends Curd
     {
         [$where, $format, $limit, $field, $order] = $this->selectInput($request);
         $where['courses_is_del'] = 0;
+        $order = $request->get('order', 'desc');
+        $field = $field ?? 'courses_addTime';
         $query = $this->doSelect($where, $field, $order);
         return $this->doFormat($query, $format, $limit);
     }

app/admin/controller/life/CollegeTeacherController.php

@@ -5,6 +5,7 @@ namespace app\admin\controller\life;
 use app\admin\validate\life\CollegeTeacherValidate;
 use app\controller\Curd;
 use app\model\CollegeTeacher as TeacherModel;
+use support\exception\BusinessException;
 use support\Request;
 use support\Response;
 
@@ -69,6 +70,22 @@ class CollegeTeacherController extends Curd
         return $data;
     }
 
+    protected function updateInput(Request $request): array
+    {
+        $primary_key = $this->model->getKeyName();
+        $id = $request->post($primary_key);
+        $data = $this->inputFilter($request->post());
+        $model = $this->model->find($id);
+        if (!$model) {
+            throw new BusinessException('记录不存在', 2);
+        }
+
+        $data['teacher_img'] = str_replace(getenv('STORAGE_DOMAIN'),'',$data['teacher_img']);
+
+        unset($data[$primary_key]);
+        return [$id, $data];
+    }
+
     /**
      * @Desc 删除教师
      * @Author Gorden

app/model/ClientMessage.php

@@ -27,4 +27,10 @@ class ClientMessage extends Model
         return $this->hasOne(Member::class, 'member_id', 'join_client_message_recv_member_id')
             ->select('member_id', 'member_mobile');
     }
+
+    public function cert()
+    {
+        return $this->hasOne(MemberCert::class, 'join_cert_member_id', 'join_client_message_recv_member_id')
+            ->select('join_cert_member_id', 'member_cert_name');
+    }
 }