Merge remote-tracking branch 'origin/dev_govgrid' into dev

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java

@@ -3,6 +3,7 @@ package com.epmet.controller;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.AuditedPartyMemberFormDTO;
 import com.epmet.dto.form.AuditingPartyMemberFormDTO;
 import com.epmet.dto.form.CertifiedDetailFormDTO;
@@ -96,6 +97,7 @@ public class ResiPartyMemberController {
      */
     @PostMapping("audit")
     public Result manualConfirmResult(@RequestBody PartyMemberConfirmFromDTO fromDTO) {
+        ValidatorUtils.validateEntity(fromDTO);
         return resiPartyMemberService.manualConfirmResult(fromDTO);
     }
 

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/PartyMemberConfirmFromDTO.java

@@ -1,7 +1,9 @@
 package com.epmet.resi.partymember.dto.partymember.form;
 
 import lombok.Data;
+import org.hibernate.validator.constraints.Length;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
@@ -30,10 +32,12 @@ public class PartyMemberConfirmFromDTO implements Serializable {
 	/**
 	 * 审核状态 yes,no
 	 */
+	@NotBlank(message = "审核状态不能为空")
 	private String partyMemberFlag;
 
 	/**
 	 * 审核理由
 	 */
+	@Length(max = 50, message = "审核理由不超过50字")
 	private String reason;
 }