导出文件模板修改

application-facade/src/main/java/com/factory/controller/web/FirstArticleController.java

@@ -56,6 +56,8 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperationSupport;
 
+import javax.validation.Valid;
+
 /**
  * 首件计划
  *
@@ -76,7 +78,7 @@ public class FirstArticleController {
 	@ApiOperation(value = "新建首件计划")
 	@PostMapping("/addFaPlan")
 	@ApiOperationSupport(order = 1)
-	public ResponseBean<Void> addFaPlan(@RequestBody AddFaPlanReq req){
+	public ResponseBean<Void> addFaPlan(@Valid @RequestBody AddFaPlanReq req) {
 		return firstArticleService.addFaPlan(req);
 	}
 

application-facade/src/main/java/com/factory/web/entity/fa/req/AddFaPlanReq.java

@@ -8,8 +8,10 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.springframework.validation.annotation.Validated;
 
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.time.LocalDate;
 import java.util.List;
@@ -47,19 +49,21 @@ public class AddFaPlanReq {
 
     @ApiModelProperty(value = "责任人2id")
     private Long principalTwoId;
-
+    @NotEmpty(message = "首件开始时间不能为空")
     @ApiModelProperty(value = "首件开始时间")
     private String firstStart;
 
+    @NotEmpty(message = "首件结束时间不能为空")
     @ApiModelProperty(value = "首件结束时间")
     private String firstEnd;
-
+    @NotNull(message = "检验时长不能为空")
     @ApiModelProperty(value = "检验时长(分钟)")
     private Integer firstCheck;
 
+    @NotNull(message = "升级时间不能为空")
     @ApiModelProperty(value = "升级时间(分钟)")
     private Integer firstUpdate;
-
+    @NotEmpty(message = "200件最晚提交时间不能为空")
     @ApiModelProperty(value = "200件最晚提交时间")
     private String twoHundredSubmitTime;
 

application-facade/src/main/java/com/factory/web/service/impl/fa/FirstArticleServiceImpl.java

@@ -198,7 +198,7 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
                     .pauseFlag(false)
                     .effectiveDate(req.getEffectiveDate())
                     .status(PlanStatus.WAIT_APPROVAL.value)
-                    .fileId(req.getUrl() == null ? req.getUrl().intValue() : null)
+                    .fileId(req.getUrl() != null ? req.getUrl().intValue() : null)
                     .build();
             planService.save(plan);
             // 添加首件、200件点检规则
@@ -1413,7 +1413,7 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
                 String collect = Stream.of(frequencyList.toArray(new String[frequencyList.size()])).collect(Collectors.joining("&"));
                 beanMap.put("frequency", collect);
                 beanMap.put("toolDesc", new Integer(1).equals(item1.getReleaseFlag()) ? "存在" : "无");
-                beanMap.put("tool", item1.getToolId().equals("-1") ? "非工具校验" : item1.getToolId().toString());
+                beanMap.put("tool", item1.getToolId().equals("-1") ? "非工具校验" : item1.getToolId() + item1.getToolDesc());
                 beanMap.put("id", String.valueOf(id.get()));
                 id.getAndIncrement();
                 arrayList.add(beanMap);
@@ -1502,7 +1502,7 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
                 String frequency = Stream.of(frequencyList.toArray(new String[frequencyList.size()])).collect(Collectors.joining("&"));
                 beanMap.put("frequency", frequency);
                 beanMap.put("toolDesc", "");
-                beanMap.put("tool", item1.getToolId().equals("-1") ? "非工具校验" : item1.getToolId().toString());
+                beanMap.put("tool", item1.getToolId().equals("-1") ? "非工具校验" : item1.getToolId() + item1.getToolDesc());
                 beanMap.put("id", String.valueOf(id.get()));
                 id.getAndIncrement();
                 arrayList.add(beanMap);