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

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

 package com.zjty.inspect.controller;
 
+import com.alibaba.fastjson.JSON;
+import com.zjty.inspect.entity.AssessmentReport;
 import com.zjty.inspect.entity.Evaluation;
 import com.zjty.inspect.entity.PageResult;
+import com.zjty.inspect.entity.Reform;
 import com.zjty.inspect.service.EvaluationService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -39,13 +42,15 @@ public class EvaluationController {
         if(StringUtils.isEmpty(id)||id.equals("null")){
             Evaluation e = evaluationService.findByName(name);
             if(e!=null){
-                return ResponseEntity.ok(e.getOutEva());
+                AssessmentReport assessmentReport = JSON.parseObject(e.getOutEva(), AssessmentReport.class);
+                return ResponseEntity.ok(assessmentReport);
             }
             return ResponseEntity.ok(null);
         }
         Evaluation evaluation = evaluationService.findById(id);
         if(evaluation!=null){
-            return ResponseEntity.ok(evaluation.getOutEva());
+            AssessmentReport assessmentReport = JSON.parseObject(evaluation.getOutEva(), AssessmentReport.class);
+            return ResponseEntity.ok(assessmentReport);
         }
         return ResponseEntity.ok(null);
     }
@@ -54,7 +59,8 @@ public class EvaluationController {
     public ResponseEntity getInName(@PathVariable String name) {
         Evaluation evaluation = evaluationService.findById(name);
         if(evaluation!=null){
-            return ResponseEntity.ok(evaluation.getInEva());
+            Reform reform = JSON.parseObject(evaluation.getInEva(), Reform.class);
+            return ResponseEntity.ok(reform);
         }
         return ResponseEntity.ok(null);
     }