瀏覽代碼

增加报名列表信息

周箭河 5 年之前
父節點
當前提交
f0b96e7476

+ 1 - 1
edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ExamOrderController.java

@@ -46,7 +46,7 @@ public class ExamOrderController extends BaseController {
     @ApiOperation(value = "缴费列表")
     @GetMapping(value = "pageList")
     @PreAuthorize("@pcs.hasPermissions('examOrder/pageList')")
-    public HttpResponseResult<PageInfo<ExamRegistrationPayment>> pageList(@RequestBody ExamRegistrationPaymentQueryInfo queryInfo) {
+    public HttpResponseResult<PageInfo<ExamRegistrationPayment>> pageList(ExamRegistrationPaymentQueryInfo queryInfo) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (!sysUser.getIsSuperAdmin() && Objects.isNull(queryInfo.getOrganId())) {
             Employee employee = employeeService.get(sysUser.getId());

+ 4 - 1
edu-user/edu-user-server/src/main/resources/config/mybatis/ExamRegistrationMapper.xml

@@ -31,6 +31,7 @@
 		<result column="memo_" property="memo" />
 		<association property="sysUser" columnPrefix="sys_user_" resultMap="com.keao.edu.user.dao.StudentDao.Student"/>
 		<association property="subject" columnPrefix="subject_" resultMap="com.keao.edu.user.dao.SubjectDao.Subject"/>
+		<association property="examinationBasic" columnPrefix="examination_basic_" resultMap="com.keao.edu.user.dao.ExaminationBasicDao.ExaminationBasic"/>
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -313,8 +314,10 @@
 	</select>
 
 	<select id="getExamRegistrationInfo" resultMap="ExamRegistration">
-		SELECT er.*, su.id_ sys_user_id_, su.real_name_ sys_user_real_name_,su.phone_ sys_user_phone_ , s.id_ subject_id_, s.name_ subject_name_
+		SELECT er.*, su.id_ sys_user_id_, su.real_name_ sys_user_real_name_,su.phone_ sys_user_phone_ , s.id_ subject_id_,
+		s.name_ subject_name_ ,eb.name_ examination_basic_name_
 		FROM exam_registration er
+		LEFT JOIN examination_basic eb ON eb.id_=er.examination_basic_id_
 		LEFT JOIN sys_user su ON er.student_id_ = su.id_
 		LEFT JOIN subject s on er.subject_id_ = s.id_
 		WHERE er.id_ = #{id}