Merge branch 'dev_epidemic_situation' into develop

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddIcNatFormDTO.java

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Date;
@@ -20,10 +21,13 @@ public class AddIcNatFormDTO implements Serializable {
 
     public interface Nat extends CustomerClientShowGroup {
     }
+    public interface Edit extends CustomerClientShowGroup {
+    }
 
     /**
      * 核酸记录Id,修改时使用
      */
+    @NotBlank(message = "组织Id不能为空", groups = Edit.class)
     private String icNatId;
     /**
      * 当前网格所属组织Id
@@ -57,7 +61,7 @@ public class AddIcNatFormDTO implements Serializable {
     /**
      * 检测时间
      */
-    //@NotBlank(message = "检测时间不能为空", groups = Nat.class)
+    @NotNull(message = "检测时间不能为空", groups = Nat.class)
     @JsonFormat(pattern="yyyy-MM-dd HH:mm")
     private Date natTime;
     /**

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java

@@ -122,6 +122,7 @@ public class IcNatController implements ResultDataResolver {
     @NoRepeatSubmit
     @PostMapping("edit")
     public Result edit(@LoginUser TokenDto tokenDto, @RequestBody AddIcNatFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, AddIcNatFormDTO.Edit.class);
         formDTO.setCustomerId(tokenDto.getCustomerId());
         formDTO.setStaffId(tokenDto.getUserId());
         icNucleinService.edit(formDTO);