feats

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

@@ -85,35 +85,11 @@ public class TaMedicalLogController extends BaseController {
                                        @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                        @ApiParam("学校ID") @RequestParam(value ="schoolId", required = false) String schoolId,
                                        @ApiParam("专业ID") @RequestParam(value ="specialtyId", required = false) String specialtyId,
-                                       @ApiParam("学号") @RequestParam(value ="studentId", required = false) String studentId) throws Exception{
+                                       @ApiParam("学号") @RequestParam(value ="studentNo", required = false) String studentNo) throws Exception{
 
-		    IPage<TaMedicalLog> pg = new Page<>(pageNum, pageSize);
-//            QueryWrapper<TaMedicalLog> queryWrapper = new QueryWrapper<>();
-//            queryWrapper.orderByDesc("create_date");
-
-//            IPage<TaPerson> pg = new Page<>(pageNum, pageSize);
-//            QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<TaPerson>()
-//                    .gt("status", Constants.STATUS_DELETED)
-//                    .eq(!StringUtils.isEmpty(schoolId), "school_id", schoolId)
-//                    .eq(!StringUtils.isEmpty(specialtyId), "specialty_id", specialtyId)
-//                    .like(!StringUtils.isEmpty(studentId), "student_id", "%"+studentId+"%");
-
-//        IPage<TaPerson> pg = new Page<>(pageNum, pageSize);
-//        QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<TaPerson>()
-//                .gt("student_id", "")
-//                .gt("status", Constants.STATUS_DELETED)
-//                .like(!StringUtils.isEmpty(name), "name", "%"+name+"%")
-//                .eq(!StringUtils.isEmpty(schoolId), "school_id", schoolId)
-//                .eq(!StringUtils.isEmpty(specialtyId), "specialty_id", specialtyId)
-//                .like(!StringUtils.isEmpty(phone), "phone", "%"+phone+"%")
-//                .like(!StringUtils.isEmpty(studentId), "student_id", "%"+studentId+"%")
-//                .orderByDesc("create_date");
-//
-        IPage<TaMedicalLog> result = iTaMedicalLogService.getMedicalLogPagedBy(pg, schoolId, specialtyId, studentId);
-//        return ResponseBean.success(result);
-
-//            IPage<TaMedicalLog> result = iTaMedicalLogService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
+        IPage<TaMedicalLog> pg = new Page<>(pageNum, pageSize);
+        IPage<TaMedicalLog> result = iTaMedicalLogService.getMedicalLogPagedBy(pg, schoolId, specialtyId, studentNo);
+        return ResponseBean.success(result);
     }
 
     /**

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

@@ -21,5 +21,5 @@ public interface TaMedicalLogMapper extends BaseMapper<TaMedicalLog> {
     IPage<TaMedicalLog> getMedicalLogPagedBy(IPage<TaMedicalLog> pg,
                                           @Param("schoolId") String schoolId,
                                           @Param("specialtyId") String specialtyId,
-                                          @Param("studentId") String studentId);
+                                          @Param("studentNo") String studentNo);
 }

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

@@ -15,5 +15,5 @@ import com.yunzhi.demo.entity.TaPerson;
  */
 public interface ITaMedicalLogService extends IService<TaMedicalLog> {
 
-    IPage<TaMedicalLog> getMedicalLogPagedBy(IPage<TaMedicalLog> pg, String schoolId, String specialtyId, String studentId);
+    IPage<TaMedicalLog> getMedicalLogPagedBy(IPage<TaMedicalLog> pg, String schoolId, String specialtyId, String studentNo);
 }

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

@@ -25,7 +25,7 @@ public class TaMedicalLogServiceImpl extends ServiceImpl<TaMedicalLogMapper, TaM
     TaMedicalLogMapper taMedicalLogMapper;
 
     @Override
-    public IPage<TaMedicalLog> getMedicalLogPagedBy(IPage<TaMedicalLog> pg, String schoolId, String specialtyId, String studentId) {
-        return taMedicalLogMapper.getMedicalLogPagedBy(pg, schoolId, specialtyId, studentId);
+    public IPage<TaMedicalLog> getMedicalLogPagedBy(IPage<TaMedicalLog> pg, String schoolId, String specialtyId, String studentNo) {
+        return taMedicalLogMapper.getMedicalLogPagedBy(pg, schoolId, specialtyId, studentNo);
     }
 }

src/main/resources/application.yml

@@ -45,8 +45,8 @@ aliyun:
 ###
 weixin:
   miniapp:
-    appid: wxf2956bfef9daf0ae
-    secret: 50898eb0e8800c9a0b7c5056a2d1446a
+    appid: wx75ce0dc4b59e0458
+    secret: 0fb386cad221580dda74b7471460a73e
     token:
     aesKey:
     msgDataFormat: JSON

src/main/resources/mapper/TaMedicalLogMapper.xml

@@ -2,44 +2,27 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.demo.mapper.TaMedicalLogMapper">
 
-<!--    SELECT-->
-<!--    a.*,-->
-<!--    b.`name`,-->
-<!--    b.sex,-->
-<!--    b.school_id,-->
-<!--    b.student_id,-->
-<!--    c.`name` as school_name,-->
-<!--    d.`name` as specialty_name,-->
-<!--    e.user_name as doctor_name-->
-<!--    FROM-->
-<!--    ta_medical_log a-->
-<!--    LEFT JOIN ta_person b on a.person_id = b.person_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-->
-<!--    LEFT JOIN sys_user e on a.doctor_id = e.user_id-->
-<!--    WHERE-->
-
     <select id="getMedicalLogPagedBy" resultType="com.yunzhi.demo.entity.TaMedicalLog">
         SELECT
-        a.*,
-        b.`name`,
-        b.sex,
-        b.school_id,
-        b.specialty_id,
-        b.student_id,
-        c.`name` as school_name,
-        d.`name` as specialty_name,
-        e.user_name as doctor_name
+            a.*,
+            b.`name`,
+            b.sex,
+            b.school_id,
+            b.specialty_id,
+            b.student_id,
+            c.`name` as school_name,
+            d.`name` as specialty_name,
+            e.user_name as doctor_name
         FROM
         ta_medical_log a
-        LEFT JOIN ta_person b on a.person_id = b.person_id
+        LEFT JOIN ta_student b on a.person_id = b.person_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
         LEFT JOIN sys_user e on a.doctor_id = e.user_id
         WHERE
         a.`status` > - 1
-        <if test="studentId != null and studentId != ''">
-            AND b.student_id LIKE CONCAT( '%', #{studentId}, '%' )
+        <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}