wangliang 1 год назад
Родитель
Сommit
52e58186b8

+ 11 - 3
distributed-print/src/main/java/com/qmth/distributed/print/api/TCFinalScoreController.java

@@ -11,9 +11,7 @@ import com.qmth.distributed.print.business.bean.result.EditResult;
 import com.qmth.distributed.print.business.bean.result.report.PaperStructResult;
 import com.qmth.distributed.print.business.entity.TCFinalScore;
 import com.qmth.distributed.print.business.entity.TCPaperStruct;
-import com.qmth.distributed.print.business.service.PrintCommonService;
-import com.qmth.distributed.print.business.service.TCFinalScoreService;
-import com.qmth.distributed.print.business.service.TCPaperStructService;
+import com.qmth.distributed.print.business.service.*;
 import com.qmth.teachcloud.common.annotation.OperationLogDetail;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.MarkQuestion;
@@ -72,6 +70,12 @@ public class TCFinalScoreController {
     @Resource
     RedisUtil redisUtil;
 
+    @Resource
+    TRBasicInfoService trBasicInfoService;
+
+    @Resource
+    TRExamStudentService trExamStudentService;
+
     @ApiOperation(value = "导入期末成绩-模板下载")
     @RequestMapping(value = "/final_score/template_download", method = RequestMethod.POST)
     @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EXPORT)
@@ -190,6 +194,8 @@ public class TCFinalScoreController {
 
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         tcFinalScoreDb.updateInfo(tcFinalScore, sysUser.getId());
+        trExamStudentService.remove(tcFinalScoreDb.getExamId(), tcFinalScoreDb.getCourseCode(), tcFinalScoreDb.getPaperNumber());
+        trBasicInfoService.remove(tcFinalScoreDb.getExamId(), tcFinalScoreDb.getCourseCode(), tcFinalScoreDb.getPaperNumber());
         return ResultUtil.ok(tcFinalScoreService.updateById(tcFinalScoreDb));
     }
 
@@ -238,6 +244,8 @@ public class TCFinalScoreController {
         } else {
             tcPaperStruct.updateInfo(JacksonUtil.parseJson(paperStructParams.getPaperStruct()), sysUser.getId());
         }
+        trExamStudentService.remove(paperStructParams.getExamId(), paperStructParams.getCourseCode(), paperStructParams.getPaperNumber());
+        trBasicInfoService.remove(paperStructParams.getExamId(), paperStructParams.getCourseCode(), paperStructParams.getPaperNumber());
         return ResultUtil.ok(tcPaperStructService.saveOrUpdate(tcPaperStruct));
     }
 

+ 9 - 3
distributed-print/src/main/java/com/qmth/distributed/print/api/TCUsualScoreController.java

@@ -8,9 +8,7 @@ import com.qmth.distributed.print.business.bean.excel.ExcelField;
 import com.qmth.distributed.print.business.bean.result.EditResult;
 import com.qmth.distributed.print.business.bean.result.ScoreResult;
 import com.qmth.distributed.print.business.entity.TCUsualScore;
-import com.qmth.distributed.print.business.service.CourseWeightService;
-import com.qmth.distributed.print.business.service.PrintCommonService;
-import com.qmth.distributed.print.business.service.TCUsualScoreService;
+import com.qmth.distributed.print.business.service.*;
 import com.qmth.teachcloud.common.annotation.OperationLogDetail;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
@@ -61,6 +59,12 @@ public class TCUsualScoreController {
     @Resource
     CourseWeightService courseWeightService;
 
+    @Resource
+    TRBasicInfoService trBasicInfoService;
+
+    @Resource
+    TRExamStudentService trExamStudentService;
+
     @ApiOperation(value = "成绩管理列表")
     @RequestMapping(value = "/score/list", method = RequestMethod.POST)
     @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.SEARCH)
@@ -147,6 +151,8 @@ public class TCUsualScoreController {
 
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         tcUsualScoreDb.updateInfo(tcUsualScore, sysUser.getId());
+        trExamStudentService.remove(tcUsualScoreDb.getExamId(), tcUsualScoreDb.getCourseCode(), tcUsualScoreDb.getPaperNumber());
+        trBasicInfoService.remove(tcUsualScoreDb.getExamId(), tcUsualScoreDb.getCourseCode(), tcUsualScoreDb.getPaperNumber());
         return ResultUtil.ok(tcUsualScoreService.updateById(tcUsualScoreDb));
     }