瀏覽代碼

人员列表账号过期时间修改为date类型

lixing 4 年之前
父節點
當前提交
a406541f7e

+ 3 - 2
fm-person/src/main/java/com/persagy/fm/person/model/vo/ResponsePersonListItemVO.java

@@ -11,6 +11,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.assertj.core.util.Lists;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -55,8 +56,8 @@ public class ResponsePersonListItemVO {
     @ApiModelProperty("专业信息")
     private List<SimpleObjVO> professions;
 
-    @ApiModelProperty("登录权限(年.月.日/永久)")
-    private String expireDate;
+    @ApiModelProperty("登录有效期")
+    private Date expireDate;
 
     @ApiModelProperty("所属部门")
     private List<DepSimpleObjVO> deps;

+ 8 - 0
fm-person/src/main/java/com/persagy/fm/person/service/impl/PersonServiceImpl.java

@@ -772,6 +772,14 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
                 }
             }
 
+            // 设置账号的过期时间
+            SaasAccountListItemVO saasAccountListItemVO = saasAccountService.querySaasAccountDetail(
+                    responsePersonListItem.getAccountId());
+            String validLast = saasAccountListItemVO.getValidLast();
+            if (ExpireTypeEnum.EXPIRY_DATE.getType().equals(validLast)) {
+                responsePersonListItem.setExpireDate(saasAccountListItemVO.getValidEndTime());
+            }
+
             // 设置员工类型
             String type = responsePersonListItem.getPersonType();
             responsePersonListItem.setPersonTypeVO(personServiceTool.getPersonTypeVO(type));

+ 4 - 0
fm-person/src/main/java/com/persagy/fm/saas/account/model/vo/SaasAccountListItemVO.java

@@ -26,6 +26,10 @@ public class SaasAccountListItemVO {
     private Date updateTime;
     private Date validStartTime;
     private String username;
+    /**
+     * 账号有效期,0-期内有效,1-永久有效
+     */
+    private String validLast;
     private Integer valid;
     private String id;
 }