feats

src/main/java/com/yunzhi/demo/controller/TaTestLogController.java

@@ -7,6 +7,7 @@ import com.yunzhi.demo.common.BaseController;
 import com.yunzhi.demo.common.Constants;
 import com.yunzhi.demo.common.ResponseBean;
 import com.yunzhi.demo.entity.TaPerson;
+import com.yunzhi.demo.vo.StudentTestLog;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -73,14 +74,14 @@ public class TaTestLogController extends BaseController {
     @RequestMapping(value="/admin/testLog",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean testLogList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                      @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+                                    @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                    @ApiParam("学校") @RequestParam(value ="schoolId", required = false) String schoolId,
+                                    @ApiParam("专业") @RequestParam(value ="schoolId", required = false) String specialtyId,
+                                    @ApiParam("学号") @RequestParam(value ="studentNo", required = false) String studentNo) throws Exception{
 
-        IPage<TaTestLog> pg = new Page<>(pageNum, pageSize);
-        QueryWrapper<TaTestLog> queryWrapper = new QueryWrapper<>();
-        queryWrapper.gt("status", Constants.STATUS_DELETED);
-        queryWrapper.orderByDesc("create_date");
+        IPage<StudentTestLog> pg = new Page<>(pageNum, pageSize);
 
-        IPage<TaTestLog> result = iTaTestLogService.page(pg, queryWrapper);
+        IPage<StudentTestLog> result = iTaTestLogService.queryWithStudent(pg, schoolId, specialtyId, studentNo);
         return ResponseBean.success(result);
     }
 

src/main/java/com/yunzhi/demo/mapper/TaTestLogMapper.java

@@ -1,8 +1,11 @@
 package com.yunzhi.demo.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.demo.entity.TaTestLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yunzhi.demo.vo.StudentTestLog;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +18,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaTestLogMapper extends BaseMapper<TaTestLog> {
 
+    IPage<StudentTestLog> getTestLogWithStudent(IPage<StudentTestLog> pg, @Param("schoolId") String schoolId, @Param("specialtyId") String specialtyId, @Param("studentNo") String studentNo);
 }

src/main/java/com/yunzhi/demo/service/ITaTestLogService.java

@@ -1,7 +1,9 @@
 package com.yunzhi.demo.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.demo.entity.TaTestLog;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yunzhi.demo.vo.StudentTestLog;
 
 /**
  * <p>
@@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaTestLogService extends IService<TaTestLog> {
 
+    IPage<StudentTestLog> queryWithStudent(IPage<StudentTestLog> pg, String schoolId, String specialtyId, String studentNo);
 }

src/main/java/com/yunzhi/demo/service/impl/TaTestLogServiceImpl.java

@@ -1,9 +1,12 @@
 package com.yunzhi.demo.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.demo.entity.TaTestLog;
 import com.yunzhi.demo.mapper.TaTestLogMapper;
 import com.yunzhi.demo.service.ITaTestLogService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yunzhi.demo.vo.StudentTestLog;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +20,11 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaTestLogServiceImpl extends ServiceImpl<TaTestLogMapper, TaTestLog> implements ITaTestLogService {
 
+    @Autowired
+    TaTestLogMapper taTestLogMapper;
+
+    @Override
+    public IPage<StudentTestLog> queryWithStudent(IPage<StudentTestLog> pg, String schoolId, String specialtyId, String studentNo) {
+        return taTestLogMapper.getTestLogWithStudent(pg, schoolId, specialtyId, studentNo);
+    }
 }

src/main/java/com/yunzhi/demo/vo/StudentTestLog.java

@@ -0,0 +1,22 @@
+package com.yunzhi.demo.vo;
+
+import com.yunzhi.demo.entity.TaStudent;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@ApiModel(description = "学生体检信息")
+@Data
+public class StudentTestLog extends TaStudent {
+
+
+    @ApiModelProperty(value = "体检ID")
+    private Integer serialNo;
+
+    @ApiModelProperty(value = "体检名称")
+    private String testName;
+
+    @ApiModelProperty(value = "体检报告")
+    private String attchment;
+}

src/main/resources/mapper/TaTestLogMapper.xml

@@ -2,4 +2,31 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.demo.mapper.TaTestLogMapper">
 
+    <select id="getTestLogWithStudent" resultType="com.yunzhi.demo.vo.StudentTestLog">
+        SELECT
+            b.*,
+            a.`name` as test_name,
+            a.serial_no,
+            a.attchment,
+            c.`name` as school_name,
+            d.`name` as specialty_name
+        FROM
+            ta_test_log a
+            LEFT JOIN ta_student b on a.student_id = b.student_id
+            LEFT JOIN td_school c on b.school_id = c.school_id
+            LEFT JOIN td_specialty d on b.specialty_id = d.specialty_id
+        WHERE
+            a.`status` > - 1
+        <if test="studentNo != null and studentNo != ''">
+            AND b.student_no LIKE CONCAT( '%', #{studentNo}, '%' )
+        </if>
+        <if test="schoolId != null and schoolId != ''">
+            AND b.school_id = #{schoolId}
+        </if>
+        <if test="specialtyId != null and specialtyId != ''">
+            AND b.specialty_id = #{specialtyId}
+        </if>
+        ORDER BY
+            a.create_date DESC
+    </select>
 </mapper>