对接签到数据和审核功能

TEAMModelOS.SDK/Models/Cosmos/Teacher/StudyRecord.cs

@@ -14,7 +14,7 @@ namespace TEAMModelOS.SDK.Models.Cosmos.Teacher
         public string sign { get; set; }
         public long signTime { get; set; }
         //0未审核 1 通过 2 未通过
-        public int status { get; set; }
+        public int status { get; set; } = 0;
         public long aTime { get; set; }
     }
 }

TEAMModelOS/ClientApp/src/view/train/TrainDetail.vue

@@ -1012,12 +1012,14 @@ export default {
                 this.$api.common.getGroupListByIds(params).then(
                     res => {
                         if (res && res.members) {
-                            this.checkData.forEach(item => {
-                                let teacher = res.members.find(t=>t.id === item.tId)
-                                if(teacher){
-                                    teacher.signTime = item.signTime
-                                    teacher.sign = item.sign
-                                    teacher.status = item.status
+                            res.members.forEach(teacher => {
+                                let data = this.checkData.find(t => t.tId === teacher.id)
+                                if (data) {
+                                    teacher.signTime = data.signTime
+                                    teacher.sign = data.sign
+                                    teacher.status = data.status
+                                }else{
+                                    teacher.status = 0
                                 }
                             })
                             this.tableData = res.members
@@ -1039,48 +1041,6 @@ export default {
                     }
                 )
             }
-            //由DB取得該校所有使用者並放入state.schoolUserList
-            // this.$store.dispatch('user/getSchoolTeacher').then(
-            //     async res => {
-            //         if (res.code == 0) {
-            //             this.$Message.error('無法取得使用者資料')
-            //         }
-            //         if (ids) {
-            //             this.tableData = []
-            //             ids.forEach(item => {
-            //                 let t = this.teachers.find(tItem => {
-            //                     return tItem.id == item
-            //                 })
-            //                 if (t) {
-            //                     delete t.status
-            //                     //处理教师研修数据
-            //                     let tData = this.trainInfo.teachers.find(td => {
-            //                         return td.id == item
-            //                     })
-            //                     if (tData) {
-            //                         tData.name = t.name
-            //                         Object.assign(t, tData)
-            //                     }
-            //                     t.status = t.status ? t.status : 0
-            //                     this.tableData.push(t)
-            //                 }
-            //             })
-            //             if (this.trainInfo.settings.includes('survey')) {
-            //                 this.getSurveyInfo()
-            //             }
-            //             if (this.trainInfo.settings.includes('exam')) {
-            //                 this.getExamInfo()
-            //             }
-            //             if (this.trainInfo.settings.includes('hw')) {
-            //                 this.getWorkInfo()
-            //             }
-
-            //         }
-            //     },
-            //     err => {
-            //         this.$Message.error('user/setSchoolTeacher API error!')
-            //     }
-            // )
         },
         //获取文件后缀和类型
         getExAndType(fileName) {

TEAMModelOS/Controllers/Common/StudyController.cs

@@ -439,7 +439,7 @@ namespace TEAMModelOS.Controllers.Common
                 {
                     var json = await JsonDocument.ParseAsync(response.ContentStream);
                     StudyRecord study = json.ToObject<StudyRecord>();
-                    if (study.id.Equals(tId.GetString()))
+                    if (study.tId.Equals(tId.GetString()))
                     {
                         study.status = type.GetInt32();
                         study.aTime = now;