Joburgess 5 gadi atpakaļ
vecāks
revīzija
65173eeef3

+ 2 - 1
edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamRoomStudentRelationServiceImpl.java

@@ -96,9 +96,10 @@ public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, Ex
 			}
 
 			ExamRoomStudentRelation e=new ExamRoomStudentRelation();
+			e.setExamRegistrationId(Long.valueOf(registId));
 			e.setExaminationBasicId(examRoom.getExaminationBasicId());
 			e.setExamRoomId(examRoom.getId());
-			e.setStudentId(Integer.valueOf(registId));
+			e.setStudentId(examRegistration.getStudentId());
 			e.setTenantId(TenantContextHolder.getTenantId());
 			examRoomStudentRelations.add(e);
 

+ 10 - 10
edu-user/edu-user-server/src/main/resources/config/mybatis/ExamTeacherSalaryMapper.xml

@@ -94,35 +94,35 @@
 		<foreach collection="teacherSalaries" item="ts" separator=";">
 			UPDATE exam_teacher_salary
 			<set>
-				<if test="examinationBasicId != null">
+				<if test="ts.examinationBasicId != null">
 					examination_basic_id_ = #{ts.examinationBasicId},
 				</if>
-				<if test="teacherId != null">
+				<if test="ts.teacherId != null">
 					teacher_id_ = #{ts.teacherId},
 				</if>
-				<if test="tenantId != null">
+				<if test="ts.tenantId != null">
 					tenant_id_ = #{ts.tenantId},
 				</if>
-				<if test="examMode != null">
+				<if test="ts.examMode != null">
 					exam_mode_ = #{ts.examMode,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
 				</if>
-				<if test="shareProfitAmount != null">
+				<if test="ts.shareProfitAmount != null">
 					share_profit_amount_ = #{ts.shareProfitAmount},
 				</if>
-				<if test="settlementType != null">
+				<if test="ts.settlementType != null">
 					settlement_type_ = #{ts.settlementType,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
 				</if>
-				<if test="totalInvigilationNum != null">
+				<if test="ts.totalInvigilationNum != null">
 					total_invigilation_num_ = #{ts.totalInvigilationNum},
 				</if>
-				<if test="totalInvigilationStudentNum != null">
+				<if test="ts.totalInvigilationStudentNum != null">
 					total_invigilation_student_num_ = #{ts.totalInvigilationStudentNum},
 				</if>
-				<if test="totalSettlementCost != null">
+				<if test="ts.totalSettlementCost != null">
 					total_settlement_fee_ = #{ts.totalSettlementCost},
 				</if>
 				update_time_ = NOW()
-			</set> WHERE id_ = #{id}
+			</set> WHERE id_ = #{ts.id}
 		</foreach>
 	</update>