update

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/dao/ExamRegistrationPaymentDao.java

@@ -75,4 +75,9 @@ public interface ExamRegistrationPaymentDao extends BaseDAO<Long, ExamRegistrati
     List<ExamRegistrationPayment> getWithExamOrganAndDay(@Param("examId") Long examId,
                                                          @Param("organId") Integer organId,
                                                          @Param("days") List<String> days);
+
+
+    List<ExamRegistrationPayment> getWithExamOrgansAndDay(@Param("examId") Long examId,
+                                                         @Param("organIds") List<Integer> organIds,
+                                                         @Param("days") List<String> days);
 }

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

@@ -18,6 +18,8 @@ public class ExamOrganStatisticsDto extends ExamOrganizationRelation {
 
     private Map<String, BigDecimal> dayPaymentAmount;
 
+    private Map<String, BigDecimal> dayTotalPaymentAmount;
+
     public List<ExamLifecycleLogDto> getExamLifecycleLogs() {
         return examLifecycleLogs;
     }
@@ -41,4 +43,12 @@ public class ExamOrganStatisticsDto extends ExamOrganizationRelation {
     public void setDayPaymentAmount(Map<String, BigDecimal> dayPaymentAmount) {
         this.dayPaymentAmount = dayPaymentAmount;
     }
+
+    public Map<String, BigDecimal> getDayTotalPaymentAmount() {
+        return dayTotalPaymentAmount;
+    }
+
+    public void setDayTotalPaymentAmount(Map<String, BigDecimal> dayTotalPaymentAmount) {
+        this.dayTotalPaymentAmount = dayTotalPaymentAmount;
+    }
 }

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

@@ -478,6 +478,7 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
 
 		Map<String, BigDecimal> dayTransAmount=new LinkedHashMap<>();
 		Map<String, BigDecimal> dayPaymentAmount=new LinkedHashMap<>();
+		Map<String, BigDecimal> dayTotalPaymentAmount=new LinkedHashMap<>();
 
 		LocalDate today = LocalDate.now();
 		List<String> days=new ArrayList<>();
@@ -488,9 +489,12 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
 			days.add(today.plusDays(i).toString());
 			dayTransAmount.put(today.plusDays(i).toString(), BigDecimal.ZERO);
 			dayPaymentAmount.put(today.plusDays(i).toString(), BigDecimal.ZERO);
+			dayTotalPaymentAmount.put(today.plusDays(i).toString(), BigDecimal.ZERO);
 		}
 
-		List<ExamRegistrationPayment> examRegistrationPayments = examRegistrationPaymentDao.getWithExamOrganAndDay(examId, organId, days);
+		List<Integer> childOrganIds = organizationService.getChildOrganIds(organId, true);
+
+		List<ExamRegistrationPayment> examRegistrationPayments = examRegistrationPaymentDao.getWithExamOrgansAndDay(examId, childOrganIds, days);
 		List<ExamManualLedger> examOrganManualLedgers = examManualLedgerDao.getExamOrganManualLedgers(organId, examId, days);
 
 		Map<String, List<ExamRegistrationPayment>> dayPaymentMap = new HashMap<>();
@@ -516,12 +520,15 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
 			if(CollectionUtils.isEmpty(dayPayments)){
 				continue;
 			}
-			BigDecimal amount = dayPayments.stream().map(ExamRegistrationPayment::getTransAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+			BigDecimal totalAmount = dayPayments.stream().map(ExamRegistrationPayment::getTransAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+			BigDecimal amount = dayPayments.stream().filter(e->organId.equals(e.getOrganId())).map(ExamRegistrationPayment::getTransAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
 			dayPaymentAmount.put(day, amount);
+			dayTotalPaymentAmount.put(day, totalAmount);
 		}
 
 		examOrganStatistics.setDayTransAmount(dayTransAmount);
 		examOrganStatistics.setDayPaymentAmount(dayPaymentAmount);
+		examOrganStatistics.setDayTotalPaymentAmount(dayTotalPaymentAmount);
 		return examOrganStatistics;
 	}
 

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/impl/StudentExamResultServiceImpl.java

@@ -151,7 +151,7 @@ public class StudentExamResultServiceImpl extends BaseServiceImpl<Long, StudentE
 		Map<Integer, String> subjectIdNameMap = this.getMap("subject", "id_", "name_", new ArrayList(subjectIds), Integer.class, String.class);
 
 
-		String baseUrl = "4?";
+		String baseUrl = "4";
 
 		for (StudentExamResult studentExamResult : studentExamResults) {
 			if(Objects.isNull(studentExamResult.getResult())){

edu-user/edu-user-biz/src/main/resources/config/mybatis/ExamRegistrationPaymentMapper.xml

@@ -215,6 +215,7 @@
         AND trans_status_=#{transStatus,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler}
         <![CDATA[ AND create_time_ <= ]]> #{beforeTime}
     </select>
+
     <select id="getWithExamOrganAndDay" resultMap="ExamRegistrationPayment">
         SELECT
             *
@@ -229,6 +230,23 @@
             </foreach>
     </select>
 
+    <select id="getWithExamOrgansAndDay" resultMap="ExamRegistrationPayment">
+        SELECT
+        *
+        FROM
+        exam_registration_payment
+        WHERE
+        examination_basic_id_ = #{examId}
+        AND organ_id_ IN
+        <foreach collection="organIds" item="organId" separator="," open="(" close=")">
+            #{organId}
+        </foreach>
+        AND DATE_FORMAT( create_time_, '%Y-%m-%d' ) IN
+        <foreach collection="days" item="day" separator="," open="(" close=")">
+            #{day}
+        </foreach>
+    </select>
+
     <resultMap id="ExamRegistrationPaymentDto" type="com.keao.edu.user.dto.ExamRegistrationPaymentDto"
                extends="ExamRegistrationPayment">
         <result column="card_no_" property="cardNo"/>

edu-user/edu-user-biz/src/main/resources/config/mybatis/ExamRoomMapper.xml

@@ -110,18 +110,10 @@
 				exam_mode_ = #{examMode,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
 			</if>
 			exam_location_id_ = #{examLocationId},
-			<if test="mainTeacherUserId != null">
-				main_teacher_user_id_ = #{mainTeacherUserId},
-			</if>
-			<if test="mainTeacherName != null">
-				main_teacher_user_name_ = #{mainTeacherName},
-			</if>
-			<if test="assistantTeacherUserIdList != null">
-				assistant_teacher_user_id_list_ = #{assistantTeacherUserIdList},
-			</if>
-			<if test="assistantTeacherUserNameList != null">
-				assistant_teacher_user_name_list_ = #{assistantTeacherUserNameList},
-			</if>
+			main_teacher_user_id_ = #{mainTeacherUserId},
+			main_teacher_user_name_ = #{mainTeacherName},
+			assistant_teacher_user_id_list_ = #{assistantTeacherUserIdList},
+			assistant_teacher_user_name_list_ = #{assistantTeacherUserNameList},
 			<if test="organId != null">
 				organ_id_ = #{organId},
 			</if>