caozixuan преди 4 години
родител
ревизия
c7c31bebe1

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

@@ -1,6 +1,5 @@
 package com.qmth.teachcloud.report.business.templete.execute;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qmth.teachcloud.common.contant.SpringContextHolder;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.TBTask;
@@ -22,7 +21,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.io.IOException;
 import java.util.Map;
 import java.util.Objects;
 

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

@@ -218,20 +218,22 @@ public class CourseController {
     public Result surveyAspointsSave(
             @ApiParam(value = "考试id", required = true) @RequestParam String examId,
             @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
-            @ApiParam(value = "赋分系数", required = true) @RequestParam BigDecimal coefficient) {
-
-        Map<String, Object> map = tbTaskService.saveTask(TaskTypeEnum.DATA_CALCULATE);
-        map.put("examId", examId);
-        map.put("courseCode", courseCode);
-        map.put("coefficient", coefficient);
-        TBExamCourseService tbExamCourseService = SpringContextHolder.getBean(TBExamCourseService.class);
-        TBExamCourse tbExamCourse = tbExamCourseService.getOne(new QueryWrapper<TBExamCourse>().lambda()
-                .eq(TBExamCourse::getExamId,examId)
-                .eq(TBExamCourse::getCourseCode,courseCode));
-
-        analyzeForReportService.realityForCalculate(SystemConstant.convertIdToLong(examId), courseCode);
-        map.put("tbExamCourse", tbExamCourse);
-        asyncDataCalculateTempleteService.calculateTask(map);
+            @ApiParam(value = "赋分系数", required = true) @RequestParam String coefficient) {
+
+        if (!coefficient.equals(SystemConstant.DEFAULT_SIGN)){
+            Map<String, Object> map = tbTaskService.saveTask(TaskTypeEnum.DATA_CALCULATE);
+            map.put("examId", examId);
+            map.put("courseCode", courseCode);
+            map.put("coefficient", coefficient);
+            TBExamCourseService tbExamCourseService = SpringContextHolder.getBean(TBExamCourseService.class);
+            TBExamCourse tbExamCourse = tbExamCourseService.getOne(new QueryWrapper<TBExamCourse>().lambda()
+                    .eq(TBExamCourse::getExamId,examId)
+                    .eq(TBExamCourse::getCourseCode,courseCode));
+
+            analyzeForReportService.realityForCalculate(SystemConstant.convertIdToLong(examId), courseCode);
+            map.put("tbExamCourse", tbExamCourse);
+            asyncDataCalculateTempleteService.calculateTask(map);
+        }
         return ResultUtil.ok();
     }