فهرست منبع

feat:乐团改造

Joburgess 4 سال پیش
والد
کامیت
ed0a08b263
1فایلهای تغییر یافته به همراه9 افزوده شده و 1 حذف شده
  1. 9 1
      mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentManageServiceImpl.java

+ 9 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentManageServiceImpl.java

@@ -6,6 +6,7 @@ import java.util.stream.Collectors;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.*;
+import com.ym.mec.biz.dal.enums.CourseStatusEnum;
 import com.ym.mec.biz.dal.enums.SporadicChargeTypeEnum;
 import com.ym.mec.biz.service.SysConfigService;
 import org.apache.commons.lang3.StringUtils;
@@ -103,6 +104,8 @@ public class StudentManageServiceImpl implements StudentManageService {
     private SysConfigService sysConfigService;
     @Autowired
     private CourseScheduleStudentPaymentDao courseScheduleStudentPaymentDao;
+    @Autowired
+    private CourseScheduleDao courseScheduleDao;
 
     @Override
     public PageInfo<StudentManageListDto> findStudentsByOrganId(StudentManageQueryInfo queryInfo) {
@@ -625,6 +628,7 @@ public class StudentManageServiceImpl implements StudentManageService {
 
     @Override
     public Map<String, Integer> sumStudentAttendance(Integer courseScheduleId) {
+        CourseSchedule courseSchedule = courseScheduleDao.get(courseScheduleId.longValue());
         Map<String, Integer> sum = new HashMap<>(5);
         Integer studentNum = scheduleStudentPaymentDao.countStudentNum(courseScheduleId);
         sum.put("studentNum", studentNum);
@@ -635,7 +639,11 @@ public class StudentManageServiceImpl implements StudentManageService {
         studentNum = studentNum == null ? 0 : studentNum;
         signInNum = signInNum == null ? 0 : signInNum;
         leaveNum = leaveNum == null ? 0 : leaveNum;
-        sum.put("truantNum", studentNum - signInNum - leaveNum);
+        if(Objects.nonNull(courseSchedule)&& !CourseStatusEnum.NOT_START.equals(courseSchedule.getStatus())){
+            sum.put("truantNum", studentNum - signInNum - leaveNum);
+        }else{
+            sum.put("truantNum", 0);
+        }
         sum.put("homeworkNum", studentManageDao.countHomeworkNum(courseScheduleId));
         sum.put("repliedNum", studentManageDao.countRepliedNum(courseScheduleId));
         return sum;