角色授权申请添加有效期字段

dcuc-auth-model/src/main/java/com/dragoninfo/dcuc/auth/auth/vo/zerotrust/roleauthapply/RoleAuthApplySaveVo.java

@@ -1,9 +1,14 @@
 package com.dragoninfo.dcuc.auth.auth.vo.zerotrust.roleauthapply;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -15,10 +20,24 @@ import java.util.List;
 @ApiModel(value = "角色授权申请保存Vo")
 public class RoleAuthApplySaveVo {
 
+    @NotBlank
     @ApiModelProperty(value = "申请人人员id")
     private String userId;
 
+    @NotNull
     @ApiModelProperty(value = "申请角色内容")
     private List<ApplyRoleInVo> applyRoleInVos;
 
+    @NotNull
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "权限申请开始时间 yyyy-MM-dd HH:mm:ss")
+    private Date startTime;
+
+    @NotNull
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "权限申请结束时间 yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
+
 }

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/auth/service/impl/zerotrust/RoleAuthApplyServiceImpl.java

@@ -93,6 +93,8 @@ public class RoleAuthApplyServiceImpl implements IRoleAuthApplyService {
         AuthUserVo userVo = new AuthUserVo();
         BeanUtil.copyProperties(userInfo, userVo);
         applyDto.setUserInfo(userVo);
+        applyDto.setStartTime(saveVo.getStartTime());
+        applyDto.setEndTime(saveVo.getEndTime());
         return applyAndPushToApproval(applyDto, null);
     }