Joburgess 5 years ago
parent
commit
91f9aaea07

+ 13 - 0
edu-user/edu-user-biz/src/main/java/com/keao/edu/user/dto/ExamOrganStatisticsDto.java

@@ -1,8 +1,10 @@
 package com.keao.edu.user.dto;
 
 import com.keao.edu.user.entity.ExamOrganizationRelation;
+import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -20,6 +22,9 @@ public class ExamOrganStatisticsDto extends ExamOrganizationRelation {
 
     private BigDecimal todayTotalPaymentAmount;
 
+    @ApiModelProperty(value = "报名开始时间")
+    private java.util.Date enrollStartTime;
+
     public List<ExamLifecycleLogDto> getExamLifecycleLogs() {
         return examLifecycleLogs;
     }
@@ -51,4 +56,12 @@ public class ExamOrganStatisticsDto extends ExamOrganizationRelation {
     public void setTodayTotalPaymentAmount(BigDecimal todayTotalPaymentAmount) {
         this.todayTotalPaymentAmount = todayTotalPaymentAmount;
     }
+
+    public Date getEnrollStartTime() {
+        return enrollStartTime;
+    }
+
+    public void setEnrollStartTime(Date enrollStartTime) {
+        this.enrollStartTime = enrollStartTime;
+    }
 }

+ 1 - 0
edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/impl/ExamOrganizationRelationServiceImpl.java

@@ -509,6 +509,7 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
 
 		LocalDate now = LocalDate.now();
 
+		examOrganStatistics.setEnrollStartTime(examinationBasic.getEnrollStartTime());
 		examOrganStatistics.setDayTransAmount(dayTransAmount);
 		examOrganStatistics.setSelfTodayPaymentAmount(examRegistrationPaymentDao.countOrganPaymentAmountWithDay(examId,Arrays.asList(organId), now.toString()));
 		examOrganStatistics.setTodayTotalPaymentAmount(examRegistrationPaymentDao.countOrganPaymentAmountWithDay(examId,childOrganIds, now.toString()));