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