Merge branch 'master' of git.yfzx.zjtys.com.cn:912-system/monitor/inspect

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

@@ -39,6 +39,12 @@ public class EvaluationController {
         Evaluation evaluation = evaluationService.findByName(name);
         return ResponseEntity.ok(evaluation.getOutEva());
     }
+    @ApiOperation("根据用户名查询输如")
+    @GetMapping(value = "/in/{name}")
+    public ResponseEntity getInName(@PathVariable String name) {
+        Evaluation evaluation = evaluationService.findByName(name);
+        return ResponseEntity.ok(evaluation.getInEva());
+    }
     /**
      * 修改评估报告
      * @param evaluation 规则封装

src/main/java/com/zjty/inspect/entity/Reform.java

@@ -5,7 +5,9 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /**
  * <h4>Description : 应用系统改造替换表单</h4>
@@ -103,7 +105,7 @@ public class Reform {
     /**
      * 该应用类型
      */
-    private Integer applicationType = -1;
+    private List<Integer> applicationType = new ArrayList<>();
 
     /**
      * 运行时间

src/main/java/com/zjty/inspect/service/EvaluationService.java

@@ -15,4 +15,5 @@ public interface EvaluationService {
     Page<Evaluation> findSearch(Map searchMap, int page, int size);
 
     Evaluation findByName(String name);
+
 }

src/main/java/com/zjty/inspect/service/impl/EvaluationServiceImpl.java

@@ -76,6 +76,8 @@ public class EvaluationServiceImpl implements EvaluationService {
         return evaluationDao.findByUsername(name);
     }
 
+
+
     /**
      * 动态条件构建
      *