caozixuan před 4 roky
rodič
revize
0dcadd6a60

+ 3 - 0
teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/templete/execute/AsyncDataCalculateTempleteService.java

@@ -36,6 +36,8 @@ public class AsyncDataCalculateTempleteService extends AsyncCalculateTaskTemplet
     @Resource
     private TBExamService tbExamService;
     @Resource
+    private AnalyzeForReportService analyzeForReportService;
+    @Resource
     private CacheService cacheService;
 
 
@@ -57,6 +59,7 @@ public class AsyncDataCalculateTempleteService extends AsyncCalculateTaskTemplet
                 .eq(TBExamCourse::getExamId,examId)
                 .eq(TBExamCourse::getCourseCode,courseCode));
         PublishStatusEnum oldStatus =  tbExamCourse.getPublishStatus();
+        analyzeForReportService.realityForCalculate(examId, courseCode);
         String exception = null;
 
         try {

+ 1 - 1
teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/templete/service/impl/TaskCalculateServiceImpl.java

@@ -34,7 +34,7 @@ public class TaskCalculateServiceImpl implements TaskCalculateService {
     public Map<String, Object> dataCalculate(Map<String, Object> map) throws Exception {
         Long examId = SystemConstant.convertIdToLong(String.valueOf(map.get("examId")));
         String courseCode = String.valueOf(map.get("courseCode"));
-        BigDecimal coefficient = BigDecimal.valueOf(Long.parseLong(String.valueOf(map.get("coefficient"))));
+        BigDecimal coefficient = BigDecimal.valueOf(Double.parseDouble(String.valueOf(map.get("coefficient"))));
         List<TBPaper> tbPaperList = tbPaperService.list(new QueryWrapper<TBPaper>().lambda()
                 .eq(TBPaper::getExamId, examId).eq(TBPaper::getCourseCode, courseCode));
         for (TBPaper tbPaper : tbPaperList) {

+ 1 - 1
teachcloud-report/src/main/java/com/qmth/teachcloud/report/api/CourseController.java

@@ -221,7 +221,7 @@ public class CourseController {
             @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
             @ApiParam(value = "赋分系数", required = true) @RequestParam BigDecimal coefficient) {
 
-        analyzeForReportService.realityForCalculate(SystemConstant.convertIdToLong(examId), courseCode);
+
         Map<String, Object> map = tbTaskService.saveTask(TaskTypeEnum.DATA_CALCULATE);
         map.put("examId", examId);
         map.put("courseCode", courseCode);