[完善] 阅卷提交完善

src/app/examiner/review-files/review-files.component.ts

@@ -76,7 +76,7 @@ export class ReviewFilesComponent implements OnInit {
         })
       }) 
     }
-    this.handleResults() //计算答案正确错误
+    type? this.handleResults() : null //计算答案正确错误
   }
 
   //处理数据 计算答案正确错误
@@ -182,7 +182,6 @@ export class ReviewFilesComponent implements OnInit {
       });
       //forEach
     });
-    console.log(this.selectPaper)
   }
 
   //修改结果
@@ -229,15 +228,56 @@ export class ReviewFilesComponent implements OnInit {
 
   //提交阅卷结果
   submitResult () {
-    const config = new MatSnackBarConfig();
-    config.verticalPosition = 'top';
-    config.duration = 5000
-    this.snackBar.open('阅卷结果提交成功','确定',config);
+    let bodyData = { 
+      isMarked: true,
+      totalScore: 0,
+      examinationDataInfo: [],
+     }
+    let paramsData = JSON.parse(JSON.stringify( this.paperCompanyData )) //考卷
+    paramsData.forEach(element => {
+      //计算总分
+      bodyData.totalScore = bodyData.totalScore+element.adjoinTotalPoints+element.basicInfoTotalPoints+element.facilityTotalPoints+element.functionalDivisionTotalPoints+element.importLocationTotalPoints
+      element.planList.forEach(item => {
+        bodyData.totalScore = bodyData.totalScore + item.score || 0
+      });
+      //计算总分
+      element.adjoinScore = element.adjoinTotalPoints //四周毗邻
+      delete element.adjoinTotalPoints
+      delete element.adjoinItemScore
+      element.basicInfoScore = element.basicInfoTotalPoints //基本信息
+      delete element.basicInfoTotalPoints
+      delete element.basicInfoItemScore
+      element.facilityScore = element.facilityTotalPoints //消防设施
+      delete element.facilityTotalPoints
+      delete element.facilityItemScore
+      element.functionalDivisionScore = element.functionalDivisionTotalPoints //功能分区
+      delete element.functionalDivisionTotalPoints
+      delete element.functionalDivisionItemSocre
+      element.importLocationScore = element.importLocationTotalPoints //重点部位
+      delete element.importLocationTotalPoints
+      delete element.importLocationItemScore
+      delete element.planList
+      delete element.planScore
+      delete element.score
+      element.adjoinData = JSON.stringify(element.adjoinData)
+      element.basicInfoData = JSON.stringify(element.basicInfoData)
+      element.facilityData = JSON.stringify(element.facilityData)
+      element.functionalDivisionData = JSON.stringify(element.functionalDivisionData)
+      element.importLocationData = JSON.stringify(element.importLocationData)
+    });
+    bodyData.examinationDataInfo = paramsData
+    console.log(bodyData)
+    this.http.put(`/api/Examinations/${this.paperData.id}`,bodyData).subscribe(data=>{
+      console.log(data)
+      const config = new MatSnackBarConfig();
+      config.verticalPosition = 'top';
+      config.duration = 5000
+      this.snackBar.open('阅卷结果提交成功','确定',config);
+    })
   }
 
   //作战部署 阅卷
   readExam(item){
-    console.log(item)
     sessionStorage.setItem('companyName',this.selectPaper.companyInfo.name)
     sessionStorage.setItem('planId',item.paperPlanInfo.planComponentId)
     sessionStorage.setItem('buildingTypeId',this.selectPaper.companyInfo.buildingTypes[0].id)