Merge remote-tracking branch 'origin/ywx' into wn

src/main/java/com/xhkjedu/controller/EPaperVerifyController.java

@@ -5,9 +5,10 @@ import com.xhkjedu.model.EPaperStudent0608;
 import com.xhkjedu.service.EPaperVerifyService;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.vo.ResultVo;
-import lombok.val;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -19,6 +20,8 @@ import java.util.Map;
  * @description 考卷校验
  * @date 2024/6/8 14:36
  **/
+@RestController
+@RequestMapping("/ev")
 public class EPaperVerifyController {
     @Resource
     private EPaperVerifyService ePaperVerifyService;
@@ -29,7 +32,7 @@ public class EPaperVerifyController {
         Integer examid = student.getExamid();
         String studentname = student.getStudentname();
         N_Utils.validation(new Object[]{examid, "考试id", 1, studentname, "姓名", 2});
-        List<Map> list = ePaperVerifyService.listStudentByStudentname(examid, studentname);
+        List<Map> list = ePaperVerifyService.listStudentByStudentname(examid, studentname, student.getClassid());
         return new ResultVo(0, "获取成功！", list);
     }
 

src/main/java/com/xhkjedu/mapper/EPaperVerifyMapper.java

@@ -3,6 +3,7 @@ package com.xhkjedu.mapper;
 import com.xhkjedu.model.EPaperQtypeQuestion;
 import com.xhkjedu.model.EPaperStudent0608;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 import java.util.Map;
@@ -13,9 +14,10 @@ import java.util.Map;
  * @description todo
  * @date 2024/6/8 14:44
  **/
+@Repository
 public interface EPaperVerifyMapper {
     //根据姓名搜索学生信息
-    List<Map> listStudentByStudentname(@Param("examid") Integer examid,@Param("studentname") String studentname);
+    List<Map> listStudentByStudentname(@Param("examid") Integer examid,@Param("studentname") String studentname,@Param("classid") Integer classid);
 
     //获取学生试卷及试题作答
     Map getStudentPaper(@Param("ps") EPaperStudent0608 ps);

src/main/java/com/xhkjedu/service/EPaperVerifyService.java

@@ -20,8 +20,8 @@ public class EPaperVerifyService {
     private EPaperVerifyMapper ePaperVerifyMapper;
 
     //根据姓名搜索学生信息
-    public List<Map> listStudentByStudentname(Integer examid, String studentname) {
-        return ePaperVerifyMapper.listStudentByStudentname(examid, studentname);
+    public List<Map> listStudentByStudentname(Integer examid, String studentname, Integer classid) {
+        return ePaperVerifyMapper.listStudentByStudentname(examid, studentname, classid);
     }
 
     //获取学生试卷及试题作答

src/main/resources/EPaperVerifyMapper.xml

@@ -7,7 +7,9 @@
         from e_class_student s left join e_class c on s.examid=c.examid and c.classid=c.classid
         LEFT JOIN t_user u on s.studentid=u.userid
         left join e_base e on c.examid=e.examid
-        where s.examid=#{examid} and u.usertype=2 and u.username like concat('%', #{studentname}, '%') group by s.studentid
+        where s.examid=#{examid} and u.usertype=2 and u.username like concat('%', #{studentname}, '%')
+        <if test="classid!=null and classid!=0">and s.classid=#{classid}</if>
+        group by s.studentid
     </select>
 
     <!--获取学生试卷及试题作答-->
@@ -44,7 +46,7 @@
     <!--识别正确跳过-->
     <update id="correctSkip">
         UPDATE e_paper_student0608 ps LEFT JOIN e_paper_student ps2 ON ps.epsid=ps2.epsid
-        SET ps.verified=1,ps2.verified=1 WHERE ps.epsid=#{epsid}
+        SET ps.verified=1,ps.samed=1,ps2.verified=1 WHERE ps.epsid=#{epsid}
     </update>
 
     <!--获取原试卷中试题正确答案-->

src/main/resources/application.properties

@@ -22,8 +22,8 @@ spring.datasource.hikari.connection-timeout=20000
 # \u6D4B\u8BD5\u8FDE\u63A5\u662F\u5426\u53EF\u7528\u7684query \u8BED\u53E5 \u5728oracle\u662F select 1 from dual  36   28.26
 spring.datasource.hikari.connection-test-query=SELECT 1
 # \u6240\u6709Entity\u522B\u540D\u7C7B\u6240\u5728\u5305
-mybatis.type-aliases-package=com.xhkjedu.sexam.model,com.xhkjedu.sexam.vo
-mybatis.mapper-Locations=classpath*:mapper/**/*.xml
+mybatis.type-aliases-package=com.xhkjedu.model,com.xhkjedu.vo
+mybatis.mapper-Locations=classpath*:*.xml
 mybatis.configuration.call-setters-on-nulls=true
 mapper.mappers=com.xhkjedu.base.TkMapper
 mapper.identity=MYSQL