|
|
@@ -426,7 +426,7 @@
|
|
|
|
|
|
<select id="getIsPassedStudentsPage" resultType="cn.iocoder.yudao.module.system.controller.admin.user.vo.user.StudentProjectRespVO">
|
|
|
SELECT
|
|
|
- a.*,r.id,p.id,r.supervisor_id,
|
|
|
+ a.*,r.id,r.supervisor_id,
|
|
|
CASE
|
|
|
WHEN COALESCE(MAX(CASE WHEN r.select_type = 4 THEN 1 ELSE 0 END),0) = 1 THEN 4
|
|
|
WHEN COALESCE(MAX(CASE WHEN r.select_type = 2 THEN 1 ELSE 0 END),0)= 1 THEN 2 -- 如果有 2
|
|
|
@@ -448,7 +448,8 @@
|
|
|
r.supervisor_id AS selectSupervisorId,
|
|
|
p.project_name AS projectName,
|
|
|
r.student_sign_date AS studentSignDate,
|
|
|
- r.supervisor_sign_date AS supervisorSignDate
|
|
|
+ r.supervisor_sign_date AS supervisorSignDate,
|
|
|
+ p.id AS projectId
|
|
|
|
|
|
FROM
|
|
|
system_users a
|
