itcast 1 год назад
Родитель
Сommit
2fe29c92fd

+ 7 - 7
src/main/java/com/om/controller/admin/DiagnosisVersionInfoController.java

@@ -54,9 +54,9 @@ public class DiagnosisVersionInfoController {
         return dvIoService.edit(diagnosisVersionVO);
     }
 
-    @GetMapping("/getById/{id}")
+    @GetMapping("/getById")
     @ApiOperation("根据id获取诊断程序")
-    public Result getByUserId(@PathVariable(value = "id")Integer id){
+    public Result getByUserId(@RequestParam Integer id){
 
         return dvIoService.getByUserId(id);
     }
@@ -76,20 +76,20 @@ public class DiagnosisVersionInfoController {
         return dvIoService.getPageList(pageIndex,pageSize,username);
     }
 
-    @GetMapping("/release/{id}")
-    public Result release(@PathVariable(value = "id")Integer id){
+    @GetMapping("/release")
+    public Result release(@RequestParam Integer id){
 
         return dvIoService.release(id);
     }
 
 
-    @PostMapping("/repeal/{id}")
-    public Result repeal(@PathVariable(value = "id")Integer id){
+    @PostMapping("/repeal")
+    public Result repeal(@RequestParam Integer id){
 
         return dvIoService.repeal(id);
     }
 
-    @PostMapping("/upStatus")
+    @GetMapping("/upStatus")
     @ApiOperation("修改诊断程序状态")
     public Result upStatus(@RequestBody UpStatusDto upStatusDto){
 

+ 6 - 0
src/main/java/com/om/entity/vo/DiagnosisVersionVO.java

@@ -1,11 +1,14 @@
 package com.om.entity.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 
 @Data
 @NoArgsConstructor
@@ -26,5 +29,8 @@ public class DiagnosisVersionVO implements Serializable {
     private String username;
     private String version;
     private String savePath;
+    @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;
 
 }

+ 6 - 2
src/main/java/com/om/service/impl/DiagnosisVersionInfoServiceImpl.java

@@ -244,7 +244,9 @@ public class DiagnosisVersionInfoServiceImpl extends ServiceImpl<DiagnosisVersio
     public Result release(Integer id) {
         DiagnosisVersionInfo info = this.getById(id);
         info.setStatus(1);
-        this.update(info,null);
+        LambdaQueryWrapper<DiagnosisVersionInfo> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(DiagnosisVersionInfo::getId,id);
+        this.update(info,queryWrapper);
         return Result.ok();
     }
 
@@ -252,7 +254,9 @@ public class DiagnosisVersionInfoServiceImpl extends ServiceImpl<DiagnosisVersio
     public Result repeal(Integer id) {
         DiagnosisVersionInfo info = this.getById(id);
         info.setStatus(0);
-        this.update(info,null);
+        LambdaQueryWrapper<DiagnosisVersionInfo> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(DiagnosisVersionInfo::getId,id);
+        this.update(info,queryWrapper);
         return Result.ok();
     }