wangliang 4 years ago
parent
commit
dad1db4375

+ 22 - 0
themis-business/src/main/java/com/qmth/themis/business/dto/response/TEExamQueryDto.java

@@ -59,6 +59,28 @@ public class TEExamQueryDto implements Serializable {
     @ApiModelProperty(value = "是否IP段限制,0:不允许,1:允许")
     @ApiModelProperty(value = "是否IP段限制,0:不允许,1:允许")
     private Integer enableIpLimit;
     private Integer enableIpLimit;
 
 
+    @ApiModelProperty(name = "考场代码")
+    private String roomCode;
+
+    @ApiModelProperty(name = "考场名称")
+    private String roomName;
+
+    public String getRoomCode() {
+        return roomCode;
+    }
+
+    public void setRoomCode(String roomCode) {
+        this.roomCode = roomCode;
+    }
+
+    public String getRoomName() {
+        return roomName;
+    }
+
+    public void setRoomName(String roomName) {
+        this.roomName = roomName;
+    }
+
     public Integer getEnableIpLimit() {
     public Integer getEnableIpLimit() {
         return enableIpLimit;
         return enableIpLimit;
     }
     }

+ 19 - 2
themis-business/src/main/resources/mapper/TEExamMapper.xml

@@ -43,7 +43,9 @@
         if(t.updateName is not null, t.updateName, t.createName) as updateName,
         if(t.updateName is not null, t.updateName, t.createName) as updateName,
         if(t.updateTime is not null, t.updateTime, t.createTime) as updateTime,
         if(t.updateTime is not null, t.updateTime, t.createTime) as updateTime,
         t.enableIpLimit,
         t.enableIpLimit,
-        t.monitorVideoSource
+        t.monitorVideoSource,
+        group_concat(distinct tees.room_code) as roomCode,
+        group_concat(distinct tees.room_name) as roomName
         from
         from
         (select t.id,
         (select t.id,
         t.code,
         t.code,
@@ -106,7 +108,22 @@
             <if test="enable != null and enable != '' or enable == 0">
             <if test="enable != null and enable != '' or enable == 0">
                 and t.enable = #{enable}
                 and t.enable = #{enable}
             </if>
             </if>
-        </where> ) t order by t.createTime desc
+        </where> ) t
+        left join t_e_exam_student tees on tees.exam_id = t.id
+            group by t.id,
+            t.code,
+            t.name,
+            t.tag,
+            t.mode,
+            t.enable,
+            t.startTime,
+            t.endTime,
+            t.progress,
+            t.updateName,
+            t.updateTime,
+            t.enableIpLimit,
+            t.monitorVideoSource
+         order by t.createTime desc
     </select>
     </select>
 
 
     <select id="getWaitingExam" resultType="com.qmth.themis.business.dto.response.TEExamDto">
     <select id="getWaitingExam" resultType="com.qmth.themis.business.dto.response.TEExamDto">