3.4.0 update

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/ExamTaskDetailDto.java

@@ -19,6 +19,7 @@ public class ExamTaskDetailDto {
     private Long courseId;
     private String courseCode;
     private String courseName;
+    private String openCollege;
     private String specialty;
     private String cardRuleId;
 
@@ -119,6 +120,14 @@ public class ExamTaskDetailDto {
         this.courseName = courseName;
     }
 
+    public String getOpenCollege() {
+        return openCollege;
+    }
+
+    public void setOpenCollege(String openCollege) {
+        this.openCollege = openCollege;
+    }
+
     public String getSpecialty() {
         return specialty;
     }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/ExamTaskDto.java

@@ -22,6 +22,7 @@ public class ExamTaskDto {
     private Long courseId;
     private String courseCode;
     private String courseName;
+    private String openCollege;
     private String sequence;
     private String specialty;
     private String cardRuleId;
@@ -174,6 +175,14 @@ public class ExamTaskDto {
         this.courseName = courseName;
     }
 
+    public String getOpenCollege() {
+        return openCollege;
+    }
+
+    public void setOpenCollege(String openCollege) {
+        this.openCollege = openCollege;
+    }
+
     public String getSequence() {
         return sequence;
     }

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

@@ -36,6 +36,7 @@
         a.course_id courseId,
         bc.code courseCode,
         bc.name courseName,
+        so.name openCollege,
         a.sequence,
         a.specialty,
         a.paper_number paperNumber,
@@ -90,6 +91,8 @@
         basic_semester g ON f.semester_id = g.id
         LEFT JOIN
             basic_course bc ON a.course_id = bc.id
+        LEFT JOIN
+            sys_org so ON bc.teaching_room_id = so.id
         <where>
             and f.enable = true
             <if test="schoolId != null and schoolId != ''">
@@ -182,6 +185,7 @@
             a.course_id courseId,
             bc.code courseCode,
             bc.name courseName,
+            so.name openCollege,
             a.specialty,
             a.paper_number paperNumber,
             a.card_rule_id cardRuleId,
@@ -228,6 +232,8 @@
         LEFT JOIN
             (select * from basic_semester where enable = true) g on f.semester_id = g.id
         LEFT JOIN t_f_flow_join tffj on tffj.flow_id = e.flow_id
+        LEFT JOIN
+            sys_org so ON bc.teaching_room_id = so.id
         <where>
             a.enable = true
             <if test="schoolId != null">
@@ -272,6 +278,7 @@
         a.school_id schoolId,
         bc.code courseCode,
         bc.name courseName,
+        so.name openCollege,
         a.specialty,
         a.paper_number paperNumber,
         a.card_rule_id cardRuleId,
@@ -356,6 +363,7 @@
         a.school_id schoolId,
         bc.code courseCode,
         bc.name courseName,
+        e.name openCollege,
         a.specialty,
         a.paper_number paperNumber,
         a.card_rule_id cardRuleId,
@@ -469,6 +477,7 @@
         bs.name semesterName,
         bc.code courseCode,
         bc.name courseName,
+        so.name openCollege,
         a.specialty,
         a.paper_number paperNumber,
         a.user_id userId,
@@ -503,6 +512,7 @@
         (select * from basic_exam where enable = true) be ON a.exam_id = be.id
         LEFT JOIN
         (select * from basic_semester where enable = true) bs ON be.semester_id = bs.id
+        LEFT JOIN sys_org so ON bc.teaching_room_id = so.id
         <where>
             and (a.status = 'SUBMIT' and (a.flow_id is null or (a.flow_id is not null and g.status = 'FINISH')))
             <if test="schoolId != null and schoolId != ''">

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/dto/mark/MarkSettingDto.java

@@ -15,6 +15,7 @@ public class MarkSettingDto {
     private Long courseId;
     private String courseCode;
     private String courseName;
+    private String openCollege;
     private String paperNumber;
     private Boolean questionStatus;
     private Boolean groupStatus;
@@ -56,6 +57,14 @@ public class MarkSettingDto {
         this.courseName = courseName;
     }
 
+    public String getOpenCollege() {
+        return openCollege;
+    }
+
+    public void setOpenCollege(String openCollege) {
+        this.openCollege = openCollege;
+    }
+
     public String getPaperNumber() {
         return paperNumber;
     }

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/bean/archivescore/ArchiveScoreVo.java

@@ -9,6 +9,7 @@ public class ArchiveScoreVo {
 	private Long examId;
 	private String courseCode;
 	private String courseName;
+	private String openCollege;
 	private String paperNumber;
 	private Integer studentCount;
 	private Integer classCount;
@@ -45,6 +46,14 @@ public class ArchiveScoreVo {
 		this.courseName = courseName;
 	}
 
+	public String getOpenCollege() {
+		return openCollege;
+	}
+
+	public void setOpenCollege(String openCollege) {
+		this.openCollege = openCollege;
+	}
+
 	public String getPaperNumber() {
 		return paperNumber;
 	}

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/bean/document/ArchivePaperVo.java

@@ -9,6 +9,7 @@ public class ArchivePaperVo {
 	private Long examId;
 	private String courseCode;
 	private String courseName;
+	private String openCollege;
 	private String paperNumber;
 
 	public Long getExamId() {
@@ -35,6 +36,14 @@ public class ArchivePaperVo {
 		this.courseName = courseName;
 	}
 
+	public String getOpenCollege() {
+		return openCollege;
+	}
+
+	public void setOpenCollege(String openCollege) {
+		this.openCollege = openCollege;
+	}
+
 	public String getPaperNumber() {
 		return paperNumber;
 	}

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/dto/mark/entrance/MarkEntranceDto.java

@@ -13,6 +13,7 @@ public class MarkEntranceDto {
     private Integer groupNumber;
     private String courseCode;
     private String courseName;
+    private String openCollege;
     private String paperNumber;
     private String groupQuestions;
     private String className;
@@ -56,6 +57,14 @@ public class MarkEntranceDto {
         this.courseName = courseName;
     }
 
+    public String getOpenCollege() {
+        return openCollege;
+    }
+
+    public void setOpenCollege(String openCollege) {
+        this.openCollege = openCollege;
+    }
+
     public String getPaperNumber() {
         return paperNumber;
     }

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/dto/mark/manage/MarkManageDto.java

@@ -13,6 +13,7 @@ public class MarkManageDto {
     private Long examId;
     private String courseCode;
     private String courseName;
+    private String openCollege;
     private String paperNumber;
     private String paperType;
     private Integer totalCount;
@@ -49,6 +50,14 @@ public class MarkManageDto {
         this.courseName = courseName;
     }
 
+    public String getOpenCollege() {
+        return openCollege;
+    }
+
+    public void setOpenCollege(String openCollege) {
+        this.openCollege = openCollege;
+    }
+
     public String getPaperNumber() {
         return paperNumber;
     }

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/dto/mark/score/CheckScoreListDto.java

@@ -11,6 +11,7 @@ public class CheckScoreListDto {
     private Long examId;
     private String courseCode;
     private String courseName;
+    private String openCollege;
     private String paperNumber;
     private String paperType;
     private Integer studentCount;
@@ -48,6 +49,14 @@ public class CheckScoreListDto {
         this.courseName = courseName;
     }
 
+    public String getOpenCollege() {
+        return openCollege;
+    }
+
+    public void setOpenCollege(String openCollege) {
+        this.openCollege = openCollege;
+    }
+
     public String getPaperNumber() {
         return paperNumber;
     }

teachcloud-mark/src/main/resources/mapper/MarkPaperMapper.xml

@@ -34,6 +34,7 @@
         mp.exam_id examId,
         bc.code courseCode,
         bc.name courseName,
+        bc.name openCollege,
         mp.paper_number paperNumber,
         mp.mark_mode markMode,
         mp.question_status questionStatus,
@@ -43,6 +44,8 @@
         mark_paper mp
             LEFT JOIN
         basic_course bc ON mp.course_id = bc.id
+            LEFT JOIN
+        sys_org so ON bc.teaching_room_id = so.id
             JOIN
         (select * from basic_exam where enable = true) be ON mp.exam_id = be.id
         <where>
@@ -100,6 +103,7 @@
         mp.exam_id examId,
         bc.code courseCode,
         bc.name courseName,
+        so.name openCollege,
         mp.paper_number paperNumber,
         mp.paper_type,
         ifnull(c.student_count, 0) studentCount,
@@ -107,6 +111,7 @@
         FROM
         mark_paper mp
         LEFT JOIN basic_course bc ON mp.course_id = bc.id
+        LEFT JOIN sys_org so ON bc.teaching_room_id = so.id
         LEFT JOIN (SELECT exam_id, paper_number, count(1) student_count FROM  (select exam_id, paper_number,basic_student_id from mark_student where exam_id = #{examId}
         <if test="paperNumber != null and paperNumber != ''">
             AND paper_number = #{paperNumber}
@@ -155,7 +160,7 @@
         ORDER BY sp.package_code
     </select>
     <select id="scoreList" resultType="com.qmth.teachcloud.mark.bean.archivescore.ArchiveScoreVo">
-        SELECT t.id,t.exam_id,bc.code courseCode,bc.name courseName,t.paper_number,
+        SELECT t.id,t.exam_id,bc.code courseCode,bc.name courseName,so.name openCollege,t.paper_number,
         count(*) studentCount,count(distinct bes.teach_class_name) classCount,
         sum(case when s.is_absent =1 or s.omr_absent =1 then 1 else 0 end) absentCount,
         avg(case when s.is_absent !=1 then ifnull(s.objective_score,0)+ifnull(s.subjective_score,0) else null end) avgScore,
@@ -170,6 +175,7 @@
         left join mark_student s on t.exam_id=s.exam_id and t.course_paper_id=s.course_paper_id
         left join (select * from basic_exam_student where exam_id = #{req.examId}) bes on s.basic_student_id = bes.id
         left join (select * from basic_course where school_id = #{schoolId}) bc on s.course_id = bc.id
+        left join sys_org so on bc.teaching_room_id = so.id
         WHERE
         t.exam_id = #{req.examId}
         <if test="req.courseId != null">
@@ -190,7 +196,7 @@
                 </foreach>
             </if>
         </if>
-        group by t.id,t.exam_id,bc.code,bc.name, t.paper_number
+        group by t.id,t.exam_id,bc.code,bc.name,so.name, t.paper_number
         ORDER BY t.id desc
     </select>
     <select id="getCourseCount" resultType="java.lang.Integer">
@@ -260,10 +266,11 @@
     </select>
 
     <select id="documentList" resultType="com.qmth.teachcloud.mark.bean.document.ArchivePaperVo">
-        SELECT t.id,t.exam_id,bc.code courseCode,bc.name courseName,t.paper_number
+        SELECT t.id,t.exam_id,bc.code courseCode,bc.name courseName, so.name openCollege,t.paper_number
         FROM
         mark_paper t
             left join basic_course bc on t.course_id = bc.id
+            left join sys_org so on bc.teaching_room_id = so.id
         WHERE
         t.exam_id = #{req.examId}
         <if test="req.courseId != null">

teachcloud-mark/src/main/resources/mapper/MarkTaskMapper.xml

@@ -30,6 +30,7 @@
             mp.exam_id examId,
             bc.code courseCode,
             bc.name courseName,
+            bc.name openCollege,
             mp.paper_number paperNumber,
             mp.paper_type paperType,
             mp.status,
@@ -53,6 +54,7 @@
                 group by mt.exam_id, mt.paper_number) b
                     on mp.exam_id = b.exam_id and mp.paper_number = b.paper_number
             left join basic_course bc on mp.course_id = bc.id
+            left join sys_org so on bc.teaching_room_id = so.id
         <where>
             mp.exam_id = #{examId}
             <if test="courseId != null">

teachcloud-mark/src/main/resources/mapper/MarkUserGroupMapper.xml

@@ -26,6 +26,7 @@
             mg.number groupNumber,
             bc.code courseCode,
             bc.name courseName,
+            so.name openCollege,
             mg.paper_number paperNumber,
             ifnull(mg.task_count, 0) taskCount,
             ifnull(mg.marked_count, 0) markedCount
@@ -37,6 +38,8 @@
                 AND mug.group_number = mg.number
                 LEFT JOIN
             basic_course bc ON mg.course_id = bc.id
+                LEFT JOIN
+            sys_org so ON bc.teaching_room_id = so.id
         <where>
             mg.exam_id = #{examId}
             <if test="courseId != null">