增加房间数量字段校验

src/main/java/com/template/api/ApplicationProcedureTemporaryControllerAPI.java

@@ -8,12 +8,14 @@ import com.template.model.result.CommonResult;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
+
 @RequestMapping("/auto/application-procedure-temporary")
 public interface ApplicationProcedureTemporaryControllerAPI {
 
     @PostMapping("/save")
     @ApiOperation(value = "小程序流程管理申请", notes = "小程序流程管理申请", httpMethod = "POST")
-    CommonResult save(@RequestBody ApplicationProcedureTemporaryDto applicationProcedureDto);
+    CommonResult save(@RequestBody @Valid ApplicationProcedureTemporaryDto applicationProcedureDto);
 
     @GetMapping("/list")
     @ApiOperation(value = "临时人员流程管理展示", notes = "临时人员流程管理展示", httpMethod = "GET")

src/main/java/com/template/controller/ApplicationProcedureTemporaryController.java

@@ -85,7 +85,7 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
         if (!list.isEmpty()){
             String[] arr =TimeExchange.getCurrentWeekTimeFrame(startDto);
             //开始时间为本周
-            list=list.stream().filter(a -> a.getStartTime().compareTo(arr[0])>=0&&a.getStartTime().compareTo(arr[1])<=0)
+            list=list.stream().filter(a -> a.getStartTime().substring(0,10).compareTo(arr[0])>=0&&a.getStartTime().substring(0,10).compareTo(arr[1])<=0)
                     .collect(Collectors.toList());
         }
         if (!list.isEmpty()) {
@@ -494,7 +494,7 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
         if(year==year1&&week==week1){
             return day1-day;
         }else if (year==year1&&week+1==week1&&day1==1){
-            return day-day1;
+            return 1;
         }else{
             return -1;
         }

src/main/java/com/template/model/dto/ApplicationProcedureTemporaryDto.java

@@ -3,6 +3,9 @@ package com.template.model.dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+
 @Data
 public class ApplicationProcedureTemporaryDto {
     @ApiModelProperty(value = "申请人id")
@@ -21,5 +24,7 @@ public class ApplicationProcedureTemporaryDto {
     private String reasonApplication;
 
     @ApiModelProperty(value = "房间数量")
+    @NotBlank(message = "房间数量不能为空")
+    @Pattern(regexp = "^([1-9][0-9]*){1,3}$", message = "房间数量需填入不为0的数字")
     private String houseCount;
 }