修改获取套餐信息和过学生ID查询学生信息需要的sql

common/src/main/java/com/winsun/bean/Student.java

+package com.winsun.bean;
+
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import lombok.Data;
+
+/**
+ * 学生信息
+ */
+@Data
+@TableName("hhr_student")
+public class Student {
+
+    /**
+     *主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private String id;
+    /**
+     *学生姓名
+     */
+    private String stuName;
+    /**
+     *学生身份证号
+     */
+    private String idCard;
+     /**
+      *专业
+      */
+    private String worker;
+      /**
+       *班级
+       */
+    private String aClass;
+}

common/src/main/java/com/winsun/mapper/SchoolMapper.java

@@ -20,10 +20,4 @@ public interface SchoolMapper extends BaseMapper<School> {
     @Select("select school_id schoolId from `hhr_user_school` where  user_id = #{partner}")
     String selectSchoolIdByUserId(String partner);
 
-    @Select("SELECT * FROM hh_student WHERE customer_name = #{name} AND id_card = #{idCard}")
-    Map<String,Object> selectStudentByNameAndIdCard(@Param("name")String name,@Param("idCard")String idCard);
-
-    @Select("SELECT * FROM hh_student WHERE id = #{id}")
-    Map<String,Object> getStuById(@Param("id")String id);
-
 }

common/src/main/java/com/winsun/mapper/StudentMapper.java

+package com.winsun.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.winsun.bean.Student;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+@Mapper
+@Component
+public interface StudentMapper extends BaseMapper<Student> {
+
+    @Select("SELECT * FROM hhr_student WHERE stu_name = #{name} AND id_card = #{idCard}")
+    Map<String,Object> selectStudentByNameAndIdCard(@Param("name") String name, @Param("idCard") String idCard);
+
+    @Select("SELECT * FROM hhr_student WHERE id = #{id}")
+    Map<String,Object> getStuById(@Param("id") String id);
+
+}

new-user/src/main/java/com/winsun/controller/StartSelectController.java

 package com.winsun.controller;
 
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.winsun.auth.core.common.model.ResponseData;
+import com.winsun.bean.Student;
 import com.winsun.mapper.SchoolMapper;
+import com.winsun.mapper.StudentMapper;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -21,7 +25,9 @@ import java.util.Map;
 public class StartSelectController {
 
     @Autowired
-    private  SchoolMapper schoolMapper;
+    private SchoolMapper schoolMapper;
+    @Autowired
+    private StudentMapper studentMapper;
 
     @RequestMapping("/findStartData")
     public ResponseData<Map<String, Object>> findStartData(@RequestParam("id") String id){
@@ -46,11 +52,23 @@ public class StartSelectController {
     @RequestMapping(value = "checkStudent", method = RequestMethod.POST)
     public ResponseData<Map<String, Object>> checkStudent(String stuId,String name,String idCard){
 
-        Map<String,Object> studentMap = schoolMapper.selectStudentByNameAndIdCard(name,idCard);
+        Wrapper<Student> studentWrapper = new EntityWrapper<>();
+        studentWrapper.setSqlSelect("id,stu_name AS stuName,id_card AS idCard,worker,aClass");
+        if (StringUtils.isNotBlank(stuId)){
+            studentWrapper.addFilter("id = '"+stuId+"'");
+        }
+        if (StringUtils.isNotBlank(name)){
+            studentWrapper.addFilter("stu_name = '"+name+"'");
+        }
+        if (StringUtils.isNotBlank(idCard)){
+            studentWrapper.addFilter("id_card = '"+idCard+"'");
+        }
+        List<Map<String, Object>> studentMap = studentMapper.selectMaps(studentWrapper);
+        //Map<String,Object> studentMap = schoolMapper.selectStudentByNameAndIdCard(name,idCard);
         if (studentMap == null || studentMap.size() == 0) {
             return ResponseData.error("该学生信息不存在！");
         }
-        return ResponseData.success(studentMap,"验证通过");
+        return ResponseData.success(studentMap.get(0),"验证通过");
     }
     /**
      *通过学生ID查询学生信息
@@ -61,7 +79,7 @@ public class StartSelectController {
     @RequestMapping(value = "getStuInfoById", method = RequestMethod.POST)
     public ResponseData<Map<String, Object>> getStuInfoById(String stuId){
 
-        Map<String,Object> studentMap = schoolMapper.getStuById(stuId);
+        Map<String,Object> studentMap = studentMapper.getStuById(stuId);
         if (studentMap == null || studentMap.size() == 0) {
             return ResponseData.error("该学生信息不存在！");
         }