3
0

2 Ревизии c23fe8a723 ... 9dffb570a0

Автор SHA1 Съобщение Дата
  wujiefeng 9dffb570a0 Merge remote-tracking branch 'origin/master' преди 1 година
  wujiefeng acd65e1187 是否显示警告红点 преди 1 година
променени са 1 файла, в които са добавени 10 реда и са изтрити 0 реда
  1. 10 0
      FullCardClient/src/main/java/com/zhongshu/card/client/model/attendance/LeaveApprovalModel.java

+ 10 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/attendance/LeaveApprovalModel.java

@@ -44,6 +44,9 @@ public class LeaveApprovalModel {
     //审核状态
     private LeaveStatus leaveStatus;
 
+    //审核状态信息
+    private String leaveStatusStr;
+
     @Schema(description = "是否显示警告红点")
     private Boolean isWarning = Boolean.FALSE;
 
@@ -56,6 +59,13 @@ public class LeaveApprovalModel {
         return Boolean.FALSE;
     }
 
+    public String getLeaveStatusStr() {
+        if (leaveStatus != null) {
+            return leaveStatus.getRemark();
+        }
+        return null;
+    }
+
     private Long approvalTime;
 
     //审核意见