|
|
@@ -18,8 +18,8 @@
|
|
|
bm.name as majorName,
|
|
|
bc.id as clazz_id,
|
|
|
bc.clazz_name as clazzName,
|
|
|
- tsess.subject_code as courseCode,
|
|
|
- tsess.subject_name as courseName,
|
|
|
+ concat(edc.paper_number,edc.paper_type) as courseCode,
|
|
|
+ edc.course_name as courseName,
|
|
|
tsess.total_score as totalScore,
|
|
|
tsess.objective_score as objectiveScore,
|
|
|
tsess.subjective_score as subjectiveScore,
|
|
|
@@ -42,7 +42,7 @@
|
|
|
join sys_org so on
|
|
|
so.id = tsess.org_id
|
|
|
join exam_detail_course edc on
|
|
|
- edc.school_id = tsess.school_id and concat(edc.paper_number,edc.paper_type) = tsess.subject_code
|
|
|
+ edc.school_id = tsess.school_id and concat(edc.paper_number,edc.paper_type,'-',edc.course_name) = tsess.subject_name
|
|
|
</sql>
|
|
|
|
|
|
<sql id="footCommonSql">
|
wangliang