瀏覽代碼

1、oa请假、离职状态显示

dongpo 6 月之前
父節點
當前提交
8d52bdba90

+ 11 - 0
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/leave/OaLeaveServiceImpl.java

@@ -678,6 +678,17 @@ public class OaLeaveServiceImpl implements OaLeaveService {
                 oaLeaveRespVO.setDeptName(dept.getName());
             }
         }
+        // 职位
+        if (oaLeaveDO.getPostId() != null) {
+            PostRespDTO post = postApi.getPost(oaLeaveDO.getPostId());
+            if (post != null) {
+                oaLeaveRespVO.setPosition(post.getName());
+            }
+        }
+        // 状态
+        if (StrUtil.isNotBlank(oaLeaveDO.getAuditStatus())) {
+            oaLeaveRespVO.setAuditStatusDesc(OaAuditStatusEnum.getByStatus(oaLeaveDO.getAuditStatus()));
+        }
 
         String procInstId = oaLeaveDO.getProcInstId();
         if (StrUtil.isNotBlank(procInstId)) {

+ 1 - 1
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/turnover/OaTurnoverServiceImpl.java

@@ -669,7 +669,7 @@ public class OaTurnoverServiceImpl implements OaTurnoverService {
             }
         }
         // 状态
-        oaTurnoverRespVO.setAuditStatus(OaAuditStatusEnum.getByStatus(oaTurnoverDO.getAuditStatus()));
+        oaTurnoverRespVO.setAuditStatusDesc(OaAuditStatusEnum.getByStatus(oaTurnoverDO.getAuditStatus()));
 
         String procInstId = oaTurnoverDO.getProcInstId();
         if (StrUtil.isNotBlank(procInstId)) {