合并分支 'czq' 到 'master'

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

@@ -227,18 +227,23 @@ public class InspectController {
         马晨俊运算结束
          */
         System.out.println(JSON.toJSONString(inspect));
-        if(reform.getMode()==1 && inspect.getLanguage()!=1){
-            Evaluation evaluation1=new Evaluation();
-            evaluation1.setInEva(in);
-            evaluation1.setOutEva("500");
-            evaluation1.setUsername(reform.getUsername());
-            evaluationService.save(evaluation1);
-            return ResponseEntity.ok(500);
-        }
+//        if(reform.getMode()==1 && inspect.getLanguage()!=1){
+//            Evaluation evaluation1=new Evaluation();
+//            evaluation1.setInEva(in);
+//            evaluation1.setOutEva("500");
+//            evaluation1.setUsername(reform.getUsername());
+//            evaluationService.save(evaluation1);
+//            return ResponseEntity.ok(500);
+//        }
         /*
         将马晨俊的数据放入输出的表单
          */
         AssessmentReport assessmentReport = new AssessmentReport();
+        if(reform.getMode()==1 && inspect.getLanguage()!=1){
+            assessmentReport.setCode(500);
+        }else{
+            assessmentReport.setCode(200);
+        }
         //架构
         assessmentReport.setFramework(inspect.getFramework());
         //语言

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

@@ -18,7 +18,10 @@ import java.util.Date;
 @NoArgsConstructor
 public class AssessmentReport {
 
-
+    /**
+     * 数据的状态
+     */
+    private Integer code;
     /**
      * 单位名称
      */