diff --git a/app/common/service/StudentHomeworkService.php b/app/common/service/StudentHomeworkService.php index 49f9b62..1d08ae8 100644 --- a/app/common/service/StudentHomeworkService.php +++ b/app/common/service/StudentHomeworkService.php @@ -30,8 +30,14 @@ class StudentHomeworkService $data = $request->post(); + $teacher_schedule_time = TeacherScheduleTime::where(['id' => $data['subject_homework_id']])->findOrEmpty(); + + print '
';
+            print_r($teacher_schedule_time->isEmpty());
+            die;
+
             $subject_homework = SubjectHomework::where(['id' => $data['subject_homework_id']])->findOrEmpty();
-            if($subject_homework->isEmpty()){
+            if ($subject_homework->isEmpty()) {
                 throw new Exception('未找到课程作业');
             }
 
diff --git a/plugin/admin/app/controller/SubjectHomeworkController.php b/plugin/admin/app/controller/SubjectHomeworkController.php
index 1d8dced..1007663 100644
--- a/plugin/admin/app/controller/SubjectHomeworkController.php
+++ b/plugin/admin/app/controller/SubjectHomeworkController.php
@@ -11,11 +11,11 @@ use support\exception\BusinessException;
 use think\Exception;
 
 /**
- * 课程作业 
+ * 课程作业
  */
 class SubjectHomeworkController extends Crud
 {
-    
+
     /**
      * @var SubjectHomework
      */
@@ -29,7 +29,7 @@ class SubjectHomeworkController extends Crud
     {
         $this->model = new SubjectHomework;
     }
-    
+
     /**
      * 浏览
      * @return Response
@@ -43,7 +43,7 @@ class SubjectHomeworkController extends Crud
     {
         try {
             $homework = \app\common\model\SubjectHomework::order('id desc');
-            if(1){
+            if (1) {
 
             }
             $limit = (int)$request->get('limit', 10);
@@ -59,7 +59,7 @@ class SubjectHomeworkController extends Crud
                 'data' => $list,
                 'count' => $total
             ]);
-        }catch (Exception $e){
+        } catch (Exception $e) {
 
             return json([
                 'code' => ResponseCode::WEB_API_FAIL,
@@ -87,13 +87,98 @@ class SubjectHomeworkController extends Crud
      * @param Request $request
      * @return Response
      * @throws BusinessException
-    */
+     */
     public function update(Request $request): Response
     {
         if ($request->method() === 'POST') {
-            return parent::update($request);
+            $data = $request->post();
+            $homework_file_url = [];
+            if (isset($data['homework_file_url'])) {
+                foreach ($data['homework_file_url'] as $key => $value) {
+                    $homework_file_url[] = [
+                        'url' => $value,
+                        'name' => $data['homework_file_url_name'][$key]
+                    ];
+                }
+            }
+
+            $homework_version_file_url = [];
+            if (isset($data['homework_version_file_url'])) {
+                foreach ($data['homework_version_file_url'] as $key => $value) {
+                    $homework_version_file_url[] = [
+                        'url' => $value,
+                        'name' => $data['homework_version_file_url_name'][$key]
+                    ];
+                }
+            }
+            $last_homework_feedback_url = [];
+
+
+            if (isset($data['last_homework_feedback_url'])) {
+                foreach ($data['last_homework_feedback_url'] as $key => $value) {
+                    $last_homework_feedback_url[] = [
+                        'url' => $value,
+                        'name' => $data['last_homework_feedback_url_name'][$key]
+                    ];
+                }
+            }
+            $subject_report_url = [];
+            if (isset($data['subject_report_url'])) {
+                foreach ($data['subject_report_url'] as $key => $value) {
+                    $subject_report_url[] = [
+                        'url' => $value,
+                        'name' => $data['subject_report_url_name'][$key]
+                    ];
+                }
+            }
+            $subject_file_url = [];
+            if (isset($data['subject_file_url'])) {
+                foreach ($data['subject_file_url'] as $key => $value) {
+                    $subject_file_url[] = [
+                        'url' => $value,
+                        'name' => $data['subject_file_url_name'][$key]
+                    ];
+                }
+            }
+
+            $subject_homework = \app\common\model\SubjectHomework::where(['id' => $data['id']])->findOrEmpty();
+            $subject_homework->save([
+                'homework_web_url' => $data['homework_web_url'],
+                'homework_file_url' => empty($homework_file_url) ? '' : json_encode($homework_file_url, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES),
+                'homework_version_file_url' => empty($homework_version_file_url) ? '' : json_encode($homework_version_file_url, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES),
+                'last_homework_feedback_url' => empty($last_homework_feedback_url) ? '' : json_encode($last_homework_feedback_url, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES),
+                'subject_report_url' => empty($subject_report_url) ? '' : json_encode($subject_report_url, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES),
+                'subject_file_url' => empty($subject_file_url) ? '' : json_encode($subject_file_url, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES),
+            ]);
+
+            return json([
+                'code' => ResponseCode::WEB_API_SUCCESS,
+                'msg' => 'success'
+            ]);
+//            return parent::update($request);
         }
-        return view('subject-homework/update');
+
+        //课程作业详情
+        $subject_homework = \app\common\model\SubjectHomework::where('id', $request->get('id'))->with(['teacher', 'subject'])->findOrEmpty()->toArray();
+
+        if ($subject_homework['homework_file_url']) {
+            $subject_homework['homework_file_url'] = json_decode($subject_homework['homework_file_url'], true);
+        }
+        if ($subject_homework['homework_version_file_url']) {
+            $subject_homework['homework_version_file_url'] = json_decode($subject_homework['homework_version_file_url'], true);
+        }
+        if ($subject_homework['last_homework_feedback_url']) {
+            $subject_homework['last_homework_feedback_url'] = json_decode($subject_homework['last_homework_feedback_url'], true);
+        }
+        if ($subject_homework['subject_report_url']) {
+            $subject_homework['subject_report_url'] = json_decode($subject_homework['subject_report_url'], true);
+        }
+        if ($subject_homework['subject_file_url']) {
+            $subject_homework['subject_file_url'] = json_decode($subject_homework['subject_file_url'], true);
+        }
+
+
+        return view('subject-homework/update', ['subject_homework' => $subject_homework]);
     }
 
 }
diff --git a/plugin/admin/app/view/student/index.html b/plugin/admin/app/view/student/index.html
index ea15cd8..caf7402 100644
--- a/plugin/admin/app/view/student/index.html
+++ b/plugin/admin/app/view/student/index.html
@@ -83,6 +83,10 @@
                 title: "密码盐", align: "center",
                 field: "salt",
                 hide: true
+            }, {
+                title: "Openid", align: "center",
+                field: "openid",
+                width: 250
             }, {
                 title: "昵称", align: "center",
                 field: "nickname",
diff --git a/plugin/admin/app/view/subject-homework/index.html b/plugin/admin/app/view/subject-homework/index.html
index d41cbfd..58cba5f 100644
--- a/plugin/admin/app/view/subject-homework/index.html
+++ b/plugin/admin/app/view/subject-homework/index.html
@@ -121,7 +121,7 @@
 
 
 
-        
-        
-        
-        
-        
+
+
+
+
+
+
 
-    
+
 
 
diff --git a/plugin/admin/app/view/teacher/free_time_setting.html b/plugin/admin/app/view/teacher/free_time_setting.html
index 2e41ab8..b4b8030 100644
--- a/plugin/admin/app/view/teacher/free_time_setting.html
+++ b/plugin/admin/app/view/teacher/free_time_setting.html
@@ -61,7 +61,7 @@
                 排课时间
                 

                     {if (empty($teacher_schedule_time))}
-                    

+