申请人信息

FullCardClient/src/main/java/com/zhongshu/card/client/model/attendance/LeaveApprovalModel.java

@@ -10,6 +10,8 @@ import java.util.List;
 @Data
 public class LeaveApprovalModel {
 
+    private String leaveName;
+
     private String id;
 
     private Long createTime;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/attendance/LeaveService.java

@@ -13,10 +13,14 @@ import com.zhongshu.card.client.type.LeaveStatus;
 import com.zhongshu.card.client.utils.DateUtils;
 import com.zhongshu.card.server.core.dao.attendance.LeaveApprovalDao;
 import com.zhongshu.card.server.core.dao.attendance.LeaveSettingDao;
+import com.zhongshu.card.server.core.dao.dictionary.DictionaryDao;
+import com.zhongshu.card.server.core.dao.dictionary.DictionaryItemDao;
 import com.zhongshu.card.server.core.dao.org.RoleDao;
 import com.zhongshu.card.server.core.dao.org.UserCountDao;
 import com.zhongshu.card.server.core.domain.attendance.LeaveApproval;
 import com.zhongshu.card.server.core.domain.attendance.LeaveSetting;
+import com.zhongshu.card.server.core.domain.dictionary.Dictionary;
+import com.zhongshu.card.server.core.domain.dictionary.DictionaryItem;
 import com.zhongshu.card.server.core.domain.org.Role;
 import com.zhongshu.card.server.core.domain.org.UserAccount;
 import com.zhongshu.card.server.core.service.base.SuperService;
@@ -49,6 +53,12 @@ public class LeaveService extends SuperService {
     @Autowired
     AuthHelper authHelper;
 
+    @Autowired
+    DictionaryItemDao dictionaryItemDao;
+
+    @Autowired
+    DictionaryDao dictionaryDao;
+
 
     public ResultContent setting(LeaveSettingParam param) {
         LeaveSetting leaveSetting = null;
@@ -178,6 +188,17 @@ public class LeaveService extends SuperService {
                 UserAccount leaveUser = userCountDao.findTopByUserId(leaveApproval.getLeaveUser());
                 model.setLeaveUser(toUserCountModel(leaveUser));
             }
+
+            if (StringUtils.isNotBlank(leaveApproval.getLeaveType())){
+                Dictionary dictionary = dictionaryDao.findTopByProjectIdAndKey(leaveApproval.getProjectId(), "sys_leave_type");
+                if (dictionary != null){
+                    DictionaryItem item = dictionaryItemDao.findTopByDictionary_IdAndKey(dictionary.getId(), leaveApproval.getLeaveType());
+                    if (item != null){
+                        model.setLeaveName(item.getName());
+                    }
+                }
+
+            }
         }
         return model;
     }