feats

deploy/bootstrap

@@ -2,6 +2,6 @@
 #
 #
 
-appVer="0.0.6"
+appVer="0.0.8"
 
 java -jar ./medical-plat-${appVer}.jar

deploy/template.yml

@@ -11,7 +11,7 @@ Resources:
       Properties:
         Handler: com.yunzhi.demo.SpringApplication::main
         Runtime: custom
-        CodeUri: 'oss://yz-serverless/medical-plat/medical-plat-0.0.6.zip'
+        CodeUri: 'oss://yz-serverless/medical-plat/medical-plat-0.0.8.zip'
         MemorySize: 1024
         Timeout: 30
         InitializationTimeout: 30

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.yunzhi</groupId>
 	<artifactId>medical-plat</artifactId>
-	<version>0.0.6</version>
+	<version>0.0.8</version>
 	<name>medical-plat</name>
 	<description>Demo project for Spring Boot</description>
 

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

@@ -62,11 +62,13 @@ public class TaTestLogController extends BaseController {
                                       @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
         TaPerson taPerson = getCurrentPerson();
         TaStudent taStudent = iTaStudentService.getByPersonId(taPerson.getPersonId());
-        String studentId = taStudent == null ? "******" : taStudent.getStudentId();
+        String schoolId = taStudent == null ? "******" : taStudent.getSchoolId();
+        String studentNo = taStudent == null ? "******" : taStudent.getStudentNo();
 
         IPage<TaTestLog> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaTestLog> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("student_id", studentId);
+        queryWrapper.eq("school_id", schoolId);
+        queryWrapper.eq("student_no", studentNo);
         queryWrapper.eq("status", Constants.STATUS_NORMAL);
         queryWrapper.orderByDesc("create_date");
 
@@ -103,6 +105,10 @@ public class TaTestLogController extends BaseController {
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
     public ResponseBean taTestLogAdd(@ApiParam("保存内容") @RequestBody TaTestLog taTestLog) throws Exception{
 
+        if (StringUtils.isEmpty(taTestLog.getSchoolId())) {
+            return ResponseBean.error("没有找到学校信息", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
         if (iTaTestLogService.save(taTestLog)){
             return ResponseBean.success(taTestLog);
         }else {
@@ -171,6 +177,10 @@ public class TaTestLogController extends BaseController {
     public ResponseBean taTestLogUpdate(@ApiParam("对象ID") @PathVariable Integer id,
                                         @ApiParam("更新内容") @RequestBody TaTestLog taTestLog) throws Exception{
 
+        if (StringUtils.isEmpty(taTestLog.getSchoolId())) {
+            return ResponseBean.error("没有找到学校信息", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
         if (iTaTestLogService.updateById(taTestLog)){
             return ResponseBean.success(iTaTestLogService.getById(id));
         }else {

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

@@ -41,7 +41,7 @@ public class TdSpecialtyController extends BaseController {
     public ResponseBean maSchoolList(@ApiParam(value = "学校ID", required = false) @RequestParam(value ="school", required = false) String school,
                                      @ApiParam(value = "名称", required = false) @RequestParam(value ="name", required = false) String name) throws Exception {
         QueryWrapper<TdSpecialty> queryWrapper = new QueryWrapper<TdSpecialty>()
-                .eq(!StringUtils.isEmpty(school),"schoolId", school)
+                .eq(!StringUtils.isEmpty(school),"school_id", school)
                 .like(!StringUtils.isEmpty(name), "name", "%"+name+"%")
                 .eq("status", Constants.STATUS_NORMAL)
                 .orderByAsc("sort_no")
@@ -77,12 +77,12 @@ public class TdSpecialtyController extends BaseController {
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean adminSpecialtyList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                            @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                           @ApiParam(value = "学校ID", required = false) @RequestParam(value ="schoolId", required = false) String schoolId,
+                                           @ApiParam(value = "学校ID", required = false) @RequestParam(value ="school", required = false) String school,
                                            @ApiParam(value = "名称", required = false) @RequestParam(value ="name", required = false) String name) throws Exception {
 
         IPage<TdSpecialty> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TdSpecialty> queryWrapper = new QueryWrapper<TdSpecialty>()
-                .eq(!StringUtils.isEmpty(schoolId),"school_id", schoolId)
+                .eq(!StringUtils.isEmpty(school),"school_id", school)
                 .like(!StringUtils.isEmpty(name), "name", "%"+name+"%")
                 .eq("status", Constants.STATUS_NORMAL)
                 .orderByAsc("sort_no")

src/main/resources/mapper/TaTestLogMapper.xml

@@ -4,7 +4,19 @@
 
     <select id="getTestLogWithStudent" resultType="com.yunzhi.demo.vo.StudentTestLog">
         SELECT
-            b.*,
+            b.student_id,
+            b.name,
+            b.sex,
+            b.phone,
+            b.e_mail,
+            a.school_id,
+            b.school_batch,
+            b.specialty_id,
+            a.student_no,
+            b.person_id,
+            b.status,
+            b.create_date,
+            b.update_date,
             a.`name` as test_name,
             a.serial_no,
             a.attchment,
@@ -12,16 +24,16 @@
             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 ta_student b on a.student_no = b.student_no
+            LEFT JOIN td_school c on a.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}, '%' )
+            AND a.student_no LIKE CONCAT( '%', #{studentNo}, '%' )
         </if>
         <if test="schoolId != null and schoolId != ''">
-            AND b.school_id = #{schoolId}
+            AND a.school_id = #{schoolId}
         </if>
         <if test="specialtyId != null and specialtyId != ''">
             AND b.specialty_id = #{specialtyId}