efats

deploy/bootstrap

@@ -2,6 +2,6 @@
 #
 #
 
-appVer="0.0.8"
+appVer="0.0.10"
 
 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.8.zip'
+        CodeUri: 'oss://yz-serverless/medical-plat/medical-plat-0.0.10.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.8</version>
+	<version>0.0.11</version>
 	<name>medical-plat</name>
 	<description>Demo project for Spring Boot</description>
 

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

@@ -156,7 +156,7 @@ public class TaTestLogController extends BaseController {
      * 根据id删除对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taTestLog/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/admin/taTestLog/{id}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
     public ResponseBean taTestLogDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
         if(iTaTestLogService.removeById(id)){

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

@@ -38,10 +38,10 @@ public class TdSpecialtyController extends BaseController {
 
     @GetMapping("/ma/specialty")
     @ApiOperation(value="小程序学科专业字典", notes = "学科专业", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean maSchoolList(@ApiParam(value = "学校ID", required = false) @RequestParam(value ="school", required = false) String school,
+    public ResponseBean maSchoolList(@ApiParam(value = "学校ID", required = false) @RequestParam(value ="schoolId", required = false) String schoolId,
                                      @ApiParam(value = "名称", required = false) @RequestParam(value ="name", required = false) String name) throws Exception {
         QueryWrapper<TdSpecialty> queryWrapper = new QueryWrapper<TdSpecialty>()
-                .eq(!StringUtils.isEmpty(school),"school_id", school)
+                .eq(!StringUtils.isEmpty(schoolId),"school_id", schoolId)
                 .like(!StringUtils.isEmpty(name), "name", "%"+name+"%")
                 .eq("status", Constants.STATUS_NORMAL)
                 .orderByAsc("sort_no")
@@ -61,12 +61,13 @@ public class TdSpecialtyController extends BaseController {
     public ResponseBean tdSpecialtyList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
 									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
 
-		    IPage<TdSpecialty> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TdSpecialty> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+        IPage<TdSpecialty> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TdSpecialty> queryWrapper = new QueryWrapper<>();
+        queryWrapper.gt("status", Constants.STATUS_DELETED);
+        queryWrapper.orderByDesc("create_date");
 
-            IPage<TdSpecialty> result = iTdSpecialtyService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
+        IPage<TdSpecialty> result = iTdSpecialtyService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
     }
 
     /**
@@ -145,7 +146,13 @@ public class TdSpecialtyController extends BaseController {
     @RequestMapping(value="/admin/specialty/{id}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
     public ResponseBean specialtyDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
-        if(iTdSpecialtyService.removeById(id)){
+        TdSpecialty tdSpecialty = iTdSpecialtyService.getById(id);
+        if (null == tdSpecialty || Constants.STATUS_DELETED.equals(tdSpecialty.getStatus())) {
+            return ResponseBean.success("success");
+        }
+
+        tdSpecialty.setStatus(Constants.STATUS_DELETED);
+        if(iTdSpecialtyService.updateById(tdSpecialty)){
             return ResponseBean.success("success");
         }else {
             return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);

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

@@ -14,6 +14,9 @@ public class StudentTestLog extends TaStudent {
     @ApiModelProperty(value = "体检ID")
     private Integer serialNo;
 
+    @ApiModelProperty(value = "体检编号")
+    private String testNo;
+
     @ApiModelProperty(value = "体检名称")
     private String testName;
 

src/main/resources/mapper/TaTestLogMapper.xml

@@ -17,6 +17,7 @@
             b.status,
             b.create_date,
             b.update_date,
+            a.test_no,
             a.`name` as test_name,
             a.serial_no,
             a.attchment,