班级量化考核调整

src/main/java/com/xjrsoft/module/student/service/impl/BaseStudentAssessmentInspectionServiceImpl.java

@@ -77,6 +77,7 @@ import java.io.ByteArrayOutputStream;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.temporal.TemporalAdjusters;
 import java.util.ArrayList;
@@ -440,7 +441,14 @@ public class BaseStudentAssessmentInspectionServiceImpl extends MPJBaseServiceIm
             TeaEvaluateClassDto evaluateClassDto = new TeaEvaluateClassDto();
             evaluateClassDto.setEvaluateType(EvaluateTypeEnum.TEACHER_EVALUATE_CLASS.getCode());
             evaluateClassDto.setYear(dto.getYear());
+            LocalDate now = LocalDate.now();
+            if(dto.getYear() == null){
+                evaluateClassDto.setYear(now.getYear());
+            }
             evaluateClassDto.setMonth(dto.getMonth());
+            if(dto.getMonth() == null){
+                evaluateClassDto.setMonth(now.getMonthValue());
+            }
             List<TeaEvaluateClassListVo> teaEvaluateClassList = evaluateResultMapper.getTeaEvaluateClassList(evaluateClassDto);
             Map<Long, List<TeaEvaluateClassListVo>> classEvaluateMap = teaEvaluateClassList.stream().collect(Collectors.groupingBy(TeaEvaluateClassListVo::getEvaluatedObjectId));
             String jskhFormula = quotaFormulaRuleService.getFormulaByQuota("teacher_assessment");