update

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ExamLocationController.java

@@ -56,8 +56,8 @@ public class ExamLocationController extends BaseController {
     }
 
     @ApiOperation("删除考点")
-    @PostMapping(value = "/del/{id}")
-    public HttpResponseResult add(@PathVariable("id") Integer id) {
+    @PostMapping(value = "/del")
+    public HttpResponseResult add(Integer id) {
         return succeed(examLocationService.delete(id));
     }
 

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ExamSongController.java

@@ -59,8 +59,8 @@ public class ExamSongController extends BaseController {
     }
 
     @ApiOperation("删除曲库")
-    @PostMapping(value = "/del/{id}")
-    public HttpResponseResult add(@PathVariable("id") Integer id) {
+    @PostMapping(value = "/del")
+    public HttpResponseResult add(Integer id) {
         return succeed(examSongService.delete(id));
     }
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dao/ExamRoomStudentRelationDao.java

@@ -30,7 +30,7 @@ public interface ExamRoomStudentRelationDao extends BaseDAO<Long, ExamRoomStuden
      * @param examRoomId:
      * @return java.util.List<com.keao.edu.user.api.entity.ExamRoomStudentRelation>
      */
-    List<ExamRoomStudentRelation> findStudentsWithExamRoom(@Param("examId") Integer examId,@Param("examRoomId") Long examRoomId);
+    List<ExamRoomStudentRelation> findStudentsWithExamRoom(@Param("examRoomId") Long examRoomId);
 
     /**
      * @describe 删除指定教室的学员

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamTeacherSalaryServiceImpl.java

@@ -3,6 +3,7 @@ package com.keao.edu.user.service.impl;
 import com.keao.edu.common.dal.BaseDAO;
 import com.keao.edu.common.service.impl.BaseServiceImpl;
 import com.keao.edu.user.api.entity.ExamRoom;
+import com.keao.edu.user.api.entity.ExamRoomStudentRelation;
 import com.keao.edu.user.dao.ExamRoomDao;
 import com.keao.edu.user.dao.ExamRoomStudentRelationDao;
 import com.keao.edu.user.dao.ExamTeacherSalaryDao;
@@ -41,6 +42,7 @@ public class ExamTeacherSalaryServiceImpl extends BaseServiceImpl<Long, ExamTeac
 		if(CollectionUtils.isEmpty(examRooms)){
 			return;
 		}
-		List<Long> roomIds = examRooms.stream().map(ExamRoom::getId).collect(Collectors.toList());
+		ExamRoomStudentRelation examRoomStudentRelations = examRoomStudentRelationDao.getExamRoomStudentRelations(examId, null, null);
+
 	}
 }

edu-user/edu-user-server/src/main/resources/config/mybatis/ExamLocationMapper.xml

@@ -70,9 +70,9 @@
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
-		DELETE FROM exam_location WHERE id_ = #{id} 
-	</delete>
+	<update id="delete" >
+		UPDATE exam_location SET del_flag_=1 WHERE id_ = #{id}
+	</update>
 
 	<sql id="queryCondition">
 		<where>

edu-user/edu-user-server/src/main/resources/config/mybatis/ExamSongMapper.xml

@@ -74,9 +74,9 @@
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
-		DELETE FROM exam_song WHERE id_ = #{id} 
-	</delete>
+	<update id="delete" >
+		UPDATE exam_song SET del_flag_=1 WHERE id_ = #{id}
+	</update>
 
 	<sql id="queryCondition">
 		<where>