fix : 修改招生报名回答细节

app/admin/controller/Enrol/EnrolAq.php

@@ -37,6 +37,11 @@ class EnrolAq extends BaseController
                 'enrol_aq_status',
                 'enrol_aq_answer_status'
             ])
+            ->append(['enrol_aq_answer_status_bool'])
+            ->withAttr('enrol_aq_answer_status_bool', function ($value,$data) {
+                if($data['enrol_aq_answer_status'] == 1) return true;
+                if($data['enrol_aq_answer_status'] == 2) return false;
+            })
             ->order('enrol_aq_sort', 'asc');
 
         return msg("获取招生问答列表成功!", $query);
@@ -53,10 +58,17 @@ class EnrolAq extends BaseController
             $params = $request->param();
             $this->validate($params, []);
 
-            $params['enrol_aq_answer_status'] = 2;
+            
-
             $model = ModelEnrolAq::where('enrol_aq_guid', $params['enrol_aq_guid'])->find();
             if (!$model) throwErrorMsg("该招生问答不存在", 1);
+
+            if(isset($params['enrol_aq_answer']) && $params['enrol_aq_answer']){
+                if($model->enrol_aq_answer_status == 1){
+                    $params['enrol_aq_status'] = 2;
+                    $params['enrol_aq_answer_status'] = 2;
+                }
+            }
+
             $model->allowField([
                 'enrol_aq_update_user_guid',
                 'enrol_aq_question',

app/api/controller/Enrol/EnrolAq.php

@@ -37,8 +37,8 @@ class EnrolAq extends BaseController
                 'enrol_aq_status',
                 'enrol_aq_answer_status'
             ])
-            ->where('enrol_aq_status', 2)
+            ->where('enrol_aq_status',2)
-            ->where('enrol_aq_answer_status', 2)
+            ->where('enrol_aq_answer_status',2)
             ->order('enrol_aq_sort', 'asc');
 
 
@@ -52,28 +52,21 @@ class EnrolAq extends BaseController
      */
     public function addEnrolAq(Request $request): array
     {
-        Db::startTrans();
+        $params = $request->param();
-        try {
+        $this->validate($params, [
-            $params = $request->param();
+            'enrol_aq_question|问题' => 'require',
-            $this->validate($params, [
+        ]);
-                'enrol_aq_question|问题' => 'require',
-            ]);
 
-            ModelEnrolAq::create($params, [
+        $model = ModelEnrolAq::create($params, [
-                'enrol_aq_guid',
+            'enrol_aq_guid',
-                'enrol_aq_create_user_guid',
+            'enrol_aq_create_user_guid',
-                'enrol_aq_update_user_guid',
+            'enrol_aq_update_user_guid',
-                'enrol_aq_question',
+            'enrol_aq_question',
-                'enrol_aq_sort',
+            'enrol_aq_sort',
-                'enrol_aq_status',
+            'enrol_aq_status',
-                'enrol_aq_answer_status'
+            'enrol_aq_answer_status'
-            ]);
+        ]);
-
+        return msg('添加成功!');
-            Db::commit();
-            return msg('添加成功!');
-        } catch (\Throwable $th) {
-            Db::rollback();
-            throw  $th;
-        }
     }
+
 }

app/common/model/Enrol/EnrolAq.php

@@ -69,7 +69,7 @@ class EnrolAq extends BaseModel
     {
         BaseModel::setUserGuid(false);
         Tool::initModelFieldValue($model, [
-            'enrol_aq_sort' => 0,
+            'enrol_aq_sort' => 1,
             'enrol_aq_status' => 1,
             'enrol_aq_answer_status' => 1,
         ]);
@@ -126,4 +126,11 @@ class EnrolAq extends BaseModel
         $excel = (new Excel())->exporTsheet($data);
         $excel->save('招生问答.xlsx');
     }
+
+    
+    // public function getEnrolAqStatusBoolAttr($value)
+    // {
+    //     return $value == 1 ? false : true;
+    // }
+
 }