评估报告管理页面修改v1.0.3

src/main/java/com/zjty/inspect/controller/EvaluationController.java

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.http.ResponseEntity;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Map;
@@ -33,9 +34,16 @@ public class EvaluationController {
         return ResponseEntity.ok(200);
     }
     @ApiOperation("根据用户名查询最新的报告输出")
-    @GetMapping(value = "/{name}")
-    public ResponseEntity getName(@PathVariable String name) {
-        Evaluation evaluation = evaluationService.findByName(name);
+    @GetMapping(value = "/{name}/{id}")
+    public ResponseEntity getName(@PathVariable String name,@PathVariable String id) {
+        if(StringUtils.isEmpty(id)){
+            Evaluation e = evaluationService.findByName(name);
+            if(e!=null){
+                return ResponseEntity.ok(e.getOutEva());
+            }
+            return ResponseEntity.ok(null);
+        }
+        Evaluation evaluation = evaluationService.findById(id);
         if(evaluation!=null){
             return ResponseEntity.ok(evaluation.getOutEva());
         }