update

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamOrganizationRelationServiceImpl.java

@@ -16,6 +16,7 @@ import com.keao.edu.user.dto.ExamOrganStatisticsDto;
 import com.keao.edu.user.dto.ExamOrganizationRelationExtraDto;
 import com.keao.edu.user.entity.*;
 import com.keao.edu.user.enums.ExamStatusEnum;
+import com.keao.edu.user.enums.TransStatusEnum;
 import com.keao.edu.user.enums.YesOrNoEnum;
 import com.keao.edu.user.page.ExamOrganizationRelationQueryInfo;
 import com.keao.edu.user.service.ExamOrganizationRelationService;
@@ -326,17 +327,17 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
 
 		examOrganStatistics.setExamLifecycleLogs(examLifecycleLogDao.findWithExam(examId));
 
-		Map<String, BigDecimal> dayTransAmount=new HashMap<>();
-		Map<String, BigDecimal> dayPaymentAmount=new HashMap<>();
+		Map<String, BigDecimal> dayTransAmount=new LinkedHashMap<>();
+		Map<String, BigDecimal> dayPaymentAmount=new LinkedHashMap<>();
 
 		LocalDate today = LocalDate.now();
 		List<String> days=new ArrayList<>();
-		days.add(today.toString());
+		dayTransAmount.put(today.toString(), BigDecimal.ZERO);
+		dayPaymentAmount.put(today.toString(), BigDecimal.ZERO);
 		for (int i=-1;i>-7;i--){
-			today = today.plusDays(i);
-			days.add(today.toString());
-			dayTransAmount.put(today.toString(), BigDecimal.ZERO);
-			dayPaymentAmount.put(today.toString(), BigDecimal.ZERO);
+			days.add(today.plusDays(i).toString());
+			dayTransAmount.put(today.plusDays(i).toString(), BigDecimal.ZERO);
+			dayPaymentAmount.put(today.plusDays(i).toString(), BigDecimal.ZERO);
 		}
 
 		List<ExamRegistrationPayment> examRegistrationPayments = examRegistrationPaymentDao.getWithExamOrganAndDay(examId, organId, days);
@@ -344,7 +345,7 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
 
 		Map<String, List<ExamRegistrationPayment>> dayPaymentMap = new HashMap<>();
 		if(!CollectionUtils.isEmpty(examRegistrationPayments)){
-			dayPaymentMap = examRegistrationPayments.stream().collect(Collectors.groupingBy(e -> DateUtil.dateToString(e.getTransSuccessedTime())));
+			dayPaymentMap = examRegistrationPayments.stream().filter(e-> TransStatusEnum.SUCCESS.equals(e.getTransStatus())).collect(Collectors.groupingBy(e -> DateUtil.dateToString(e.getTransSuccessedTime())));
 		}
 		Map<String, List<ExamManualLedger>> dayLedgerMap = new HashMap<>();
 		if(!CollectionUtils.isEmpty(examOrganManualLedgers)){

edu-user/edu-user-server/src/main/resources/config/mybatis/ExamManualLedgerMapper.xml

@@ -140,8 +140,8 @@
 		FROM
 			exam_manual_ledger
 		WHERE
-			examination_basic_id_ = 1
-			AND organ_id_ = 1
+			examination_basic_id_ = #{examId}
+			AND organ_id_ = #{organId}
 			AND DATE_FORMAT( trans_time_, '%Y-%m-%d' ) IN
 			<foreach collection="days" item="day" separator="," open="(" close=")">
 				#{day}