fix:1、抽检人员必填项 2、选择督察人员回显 3、抽检人员时间范围报错修复 4、抽检人数默认叠加“被抽检对象”填写的人数 5、单选框支持取消 6、默认有一条被抽检对象

src/main/java/com/biutag/supervision/pojo/entity/Sampling.java

@@ -8,6 +8,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * 抽检规则
@@ -56,11 +57,11 @@ public class Sampling {
     //开始时间
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     @TableField("start_time")
-    private LocalDateTime startTime;
+    private Date startTime;
     //结束时间
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     @TableField("end_time")
-    private LocalDateTime endTime;
+    private Date endTime;
     //被抽检次数
     @TableField("sampling_number")
     private int samplingNumber;

src/main/java/com/biutag/supervision/pojo/entity/SamplingPolice.java

@@ -32,7 +32,7 @@ public class SamplingPolice {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     @TableField("crt_time")
     private LocalDateTime crtTime;
-
+    //身份证
     @TableField("id_code")
     private String idCode;
 }

src/main/java/com/biutag/supervision/pojo/vo/SamplingVo.java

@@ -7,8 +7,8 @@ import lombok.Getter;
 import lombok.Setter;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import java.sql.Date;
 import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.List;
 
 @Data
@@ -45,9 +45,9 @@ public class SamplingVo {
     //辅警比例
     private int assistRatio;
     //时间范围
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private List<LocalDateTime> samplingTime;
+    private List<Date> samplingTime;
     //时间范围
     //开始时间