소스 검색

3.4.0 update

xiaofei 1 년 전
부모
커밋
6dfc924871
1개의 변경된 파일6개의 추가작업 그리고 3개의 파일을 삭제
  1. 6 3
      distributed-print-business/src/main/resources/mapper/ExamTaskMapper.xml

+ 6 - 3
distributed-print-business/src/main/resources/mapper/ExamTaskMapper.xml

@@ -392,7 +392,7 @@
         LEFT JOIN basic_semester bs on be.school_id = bs.school_id and be.semester_id = bs.id
         LEFT JOIN basic_semester bs on be.school_id = bs.school_id and be.semester_id = bs.id
         <where>
         <where>
             a.enable = true and a.review = true and be.enable = true
             a.enable = true and a.review = true and be.enable = true
-            and (f.status = 'AUDITING' or f.status = 'REJECT' or f.status = 'FINISH')
+            and f.status = 'FINISH'
             and EXISTS (
             and EXISTS (
             select * from(select
             select * from(select
             aht.PROC_INST_ID_
             aht.PROC_INST_ID_
@@ -675,8 +675,8 @@
                 et.id,
                 et.id,
                 et.school_id schoolId,
                 et.school_id schoolId,
                 et.org_id as orgId,
                 et.org_id as orgId,
-                et.course_code courseCode,
-                et.course_name courseName,
+                bc.code courseCode,
+                bc.name courseName,
                 et.specialty,
                 et.specialty,
                 et.paper_number paperNumber,
                 et.paper_number paperNumber,
                 et.card_rule_id cardRuleId,
                 et.card_rule_id cardRuleId,
@@ -726,6 +726,9 @@
                 basic_exam be ON et.exam_id = be.id
                 basic_exam be ON et.exam_id = be.id
             LEFT JOIN
             LEFT JOIN
                 basic_semester bs ON be.semester_id = bs.id
                 basic_semester bs ON be.semester_id = bs.id
+            LEFT JOIN
+                basic_course bc ON
+                    et.course_id = bc.id
             where
             where
                 et.enable = true and be.enable = true and bs.enable = true
                 et.enable = true and be.enable = true and bs.enable = true
                 and art.ASSIGNEE_ = cast(#{userId} as char)
                 and art.ASSIGNEE_ = cast(#{userId} as char)