修改Command参数

site/src/main/java/com/mooctest/crowd/site/command/CrowdTestReportCommand.java

@@ -17,13 +17,11 @@ public class CrowdTestReportCommand {
     @NotNull(message = "请填写报告名称")
     private String name;
 
-    @NotNull(message = "请选择报告范围")
-    private int scope;
+    @NotNull(message = "请选择报告所属范围")
+    private Integer scope;
 
     @NotNull(message = "请选择报告类型 ")
-    @Min(0)
-    @Max(5)
-    private int type;
+    private Integer type;
 
     private String dependencyCode;
 
@@ -45,6 +43,7 @@ public class CrowdTestReportCommand {
         CrowdTestReport report = new CrowdTestReport();
         report.setName(name);
         report.setType(type);
+        report.setScope(scope);
         report.setConclusion(conclusion);
         report.setContent(content);
         report.setFile(file);

site/src/main/java/com/mooctest/crowd/site/command/CrowdTestTaskCommand.java

@@ -23,10 +23,10 @@ public class CrowdTestTaskCommand {
     private String desc;
 
     @NotNull(message = "请填写任务类型")
-    private int type;
+    private Integer type;
 
     @NotNull(message = "请指定任务发布类型")
-    private int resource;
+    private Integer resource;
 
     private Map<String, String> location;
 

site/src/main/java/com/mooctest/crowd/site/controller/CrowdReportController.java

@@ -1,6 +1,5 @@
 package com.mooctest.crowd.site.controller;
 
-import com.mooctest.crowd.domain.domainobject.CrowdTestReport;
 import com.mooctest.crowd.domain.exception.BaseException;
 import com.mooctest.crowd.site.command.CrowdTestReportCommand;
 import com.mooctest.crowd.site.data.dto.ReportDetailsDTO;
@@ -36,7 +35,7 @@ public class CrowdReportController {
     @RequestMapping(value = "/project/{projectCode}/task/{taskCode}/report", method = RequestMethod.POST)
     public ReportDetailsDTO createTaskReport(@PathVariable("projectCode") String projectCode,
                                              @PathVariable("taskCode") String taskCode,
-                                             @Validated @RequestBody CrowdTestReportCommand command, BindingResult result){
+                                             @RequestBody @Validated CrowdTestReportCommand command, BindingResult result){
         log.info("projectCode: " + projectCode + ", taskCode: "+taskCode);
         if (result.hasErrors())
             throw new BaseException(result.getFieldError().getDefaultMessage());
@@ -47,7 +46,10 @@ public class CrowdReportController {
     public ReportDetailsDTO updateTaskReport(@PathVariable("projectCode") String projectCode,
                                              @PathVariable("taskCode") String taskCode,
                                              @PathVariable("reportCode") String reportCode,
-                                             @Validated @RequestBody CrowdTestReportCommand command, BindingResult result){
+                                             @RequestBody @Validated CrowdTestReportCommand command, BindingResult result){
+        log.info("projectCode: " + projectCode + ", taskCode: "+taskCode);
+        if (result.hasErrors())
+            throw new BaseException(result.getFieldError().getDefaultMessage());
         return reportService.updateTaskReport(projectCode, taskCode, reportCode, command);
     }
 

site/src/main/java/com/mooctest/crowd/site/data/vo/CrowdReportVO.java

@@ -18,6 +18,7 @@ public class CrowdReportVO {
     private String code;
     private String name;
     private Long crowdTestTaskId;
+    private int scope;
     private int type;
     private String description;
     private String content;