1、租户字典根据value查询回显label

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/entry/vo/OaEntryRespVO.java

@@ -49,10 +49,14 @@ public class OaEntryRespVO {
     @ExcelProperty("职位")
     private String position;
 
-    @Schema(description = "员工类型")
-    @ExcelProperty("员工类型")
+    @Schema(description = "员工类型value")
+    // @ExcelProperty("员工类型")
     private String employeeType;
 
+    @Schema(description = "员工类型label")
+    @ExcelProperty("员工类型")
+    private String employeeTypeDesc;
+
     @Schema(description = "性别")
     @ExcelProperty("性别")
     private String gender;

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/leave/vo/OaLeaveRespVO.java

@@ -58,10 +58,14 @@ public class OaLeaveRespVO {
     @ExcelProperty("手机号")
     private String employeePhone;
 
-    @Schema(description = "请假类型")
-    @ExcelProperty("请假类型")
+    @Schema(description = "请假类型value")
+    // @ExcelProperty("请假类型")
     private String leaveType;
 
+    @Schema(description = "请假类型label")
+    @ExcelProperty("请假类型")
+    private String leaveTypeDesc;
+
     @Schema(description = "开始日期")
     @ExcelProperty("请假开始日期")
     private String startDate;

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/turnover/vo/OaTurnoverRespVO.java

@@ -78,10 +78,14 @@ public class OaTurnoverRespVO {
     @ExcelProperty("离职日期")
     private String turnoverDate;
 
-    @Schema(description = "离职原因")
+    @Schema(description = "离职原因value")
     // @ExcelProperty("离职原因")
     private String turnoverReason;
 
+    @Schema(description = "离职原因label")
+    // @ExcelProperty("离职原因")
+    private String turnoverReasonDesc;
+
     @Schema(description = "备注")
     // @ExcelProperty("备注")
     private String remarks;

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/entry/OaEntryServiceImpl.java

@@ -37,7 +37,10 @@ import cn.iocoder.yudao.module.system.api.dept.DeptApi;
 import cn.iocoder.yudao.module.system.api.dept.PostApi;
 import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
 import cn.iocoder.yudao.module.system.api.dept.dto.PostRespDTO;
+import cn.iocoder.yudao.module.system.api.dicttenant.DictDataTenantApi;
+import cn.iocoder.yudao.module.system.api.dicttenant.dto.DictDataTenantRespDTO;
 import cn.iocoder.yudao.module.system.api.notify.NotifyMessageSendApi;
+import cn.iocoder.yudao.module.system.enums.dicttenant.DictTypeTenantEnum;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import org.apache.commons.lang3.StringUtils;
@@ -104,6 +107,9 @@ public class OaEntryServiceImpl implements OaEntryService {
     @Resource
     private NotifyMessageSendApi notifyMessageSendApi;
 
+    @Resource
+    private DictDataTenantApi dictDataTenantApi;
+
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -583,6 +589,16 @@ public class OaEntryServiceImpl implements OaEntryService {
             oaEntryRespVO.setAuditStatusDesc(OaAuditStatusEnum.getByStatus(oaEntryDO.getAuditStatus()));
         }
 
+        // 员工类型
+        if (StrUtil.isNotBlank(oaEntryDO.getEmployeeType())) {
+            List<DictDataTenantRespDTO> dictDataList = dictDataTenantApi.getDictDataList(DictTypeTenantEnum.TENANT_EMPLOYEE_TYPE.getType());
+            Map<String, String> dictDataMap = CollectionUtils.convertMap(dictDataList, DictDataTenantRespDTO::getDictType, DictDataTenantRespDTO::getLabel);
+            String employeeTypeDesc = dictDataMap.get(oaEntryDO.getEmployeeType());
+            if (StrUtil.isNotBlank(employeeTypeDesc)) {
+                oaEntryRespVO.setEmployeeTypeDesc(employeeTypeDesc);
+            }
+        }
+
         String procInstId = oaEntryDO.getProcInstId();
         if (StrUtil.isNotBlank(procInstId)) {
             Task task = taskService.createTaskQuery()
@@ -700,6 +716,9 @@ public class OaEntryServiceImpl implements OaEntryService {
             // 状态
             Map<String, String> statusMap = Arrays.stream(OaAuditStatusEnum.values())
                     .collect(Collectors.toMap(OaAuditStatusEnum::getStatus, OaAuditStatusEnum::getStatusDesc));
+            // 员工类型
+            List<DictDataTenantRespDTO> dictDataList = dictDataTenantApi.getDictDataList(DictTypeTenantEnum.TENANT_EMPLOYEE_TYPE.getType());
+            Map<String, String> dictDataMap = CollectionUtils.convertMap(dictDataList, DictDataTenantRespDTO::getDictType, DictDataTenantRespDTO::getLabel);
 
             for (OaEntryRespVO respVO : oaEntryRespVOList) {
                 // 当前处理人
@@ -725,6 +744,13 @@ public class OaEntryServiceImpl implements OaEntryService {
                 }
                 // 状态
                 respVO.setAuditStatusDesc(statusMap.get(respVO.getAuditStatus()));
+                // 员工类型
+                if (StrUtil.isNotBlank(respVO.getEmployeeType())) {
+                    String employeeTypeDesc = dictDataMap.get(respVO.getEmployeeType());
+                    if (StrUtil.isNotBlank(employeeTypeDesc)) {
+                        respVO.setEmployeeTypeDesc(employeeTypeDesc);
+                    }
+                }
             }
         }
 

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

@@ -37,7 +37,10 @@ import cn.iocoder.yudao.module.system.api.dept.DeptApi;
 import cn.iocoder.yudao.module.system.api.dept.PostApi;
 import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
 import cn.iocoder.yudao.module.system.api.dept.dto.PostRespDTO;
+import cn.iocoder.yudao.module.system.api.dicttenant.DictDataTenantApi;
+import cn.iocoder.yudao.module.system.api.dicttenant.dto.DictDataTenantRespDTO;
 import cn.iocoder.yudao.module.system.api.notify.NotifyMessageSendApi;
+import cn.iocoder.yudao.module.system.enums.dicttenant.DictTypeTenantEnum;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import org.apache.commons.lang3.StringUtils;
@@ -108,6 +111,8 @@ public class OaLeaveServiceImpl implements OaLeaveService {
     @Resource
     private NotifyMessageSendApi notifyMessageSendApi;
 
+    @Resource
+    private DictDataTenantApi dictDataTenantApi;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -689,6 +694,15 @@ public class OaLeaveServiceImpl implements OaLeaveService {
         if (StrUtil.isNotBlank(oaLeaveDO.getAuditStatus())) {
             oaLeaveRespVO.setAuditStatusDesc(OaAuditStatusEnum.getByStatus(oaLeaveDO.getAuditStatus()));
         }
+        // 请假类型
+        if (StrUtil.isNotBlank(oaLeaveDO.getLeaveType())) {
+            List<DictDataTenantRespDTO> dictDataList = dictDataTenantApi.getDictDataList(DictTypeTenantEnum.TENANT_LEAVE_TYPE.getType());
+            Map<String, String> dictDataMap = CollectionUtils.convertMap(dictDataList, DictDataTenantRespDTO::getDictType, DictDataTenantRespDTO::getLabel);
+            String leaveTypeDesc = dictDataMap.get(oaLeaveDO.getLeaveType());
+            if (StrUtil.isNotBlank(leaveTypeDesc)) {
+                oaLeaveRespVO.setLeaveTypeDesc(leaveTypeDesc);
+            }
+        }
 
         String procInstId = oaLeaveDO.getProcInstId();
         if (StrUtil.isNotBlank(procInstId)) {
@@ -820,6 +834,11 @@ public class OaLeaveServiceImpl implements OaLeaveService {
             Map<String, String> statusMap = Arrays.stream(OaAuditStatusEnum.values())
                     .collect(Collectors.toMap(OaAuditStatusEnum::getStatus, OaAuditStatusEnum::getStatusDesc));
 
+            // 请假类型
+            List<DictDataTenantRespDTO> dictDataList = dictDataTenantApi.getDictDataList(DictTypeTenantEnum.TENANT_LEAVE_TYPE.getType());
+            Map<String, String> dictDataMap = CollectionUtils.convertMap(dictDataList, DictDataTenantRespDTO::getDictType, DictDataTenantRespDTO::getLabel);
+
+
             for (OaLeaveRespVO respVO : oaLeaveRespVOList) {
                 // 当前处理人
                 if (respVO.getCurrentAuditEmployeeId() != null) {
@@ -844,6 +863,13 @@ public class OaLeaveServiceImpl implements OaLeaveService {
                 }
                 // 状态
                 respVO.setAuditStatusDesc(statusMap.get(respVO.getAuditStatus()));
+                // 请假类型
+                if (StrUtil.isNotBlank(respVO.getLeaveType())) {
+                    String leaveTypeDesc = dictDataMap.get(respVO.getLeaveType());
+                    if (StrUtil.isNotBlank(leaveTypeDesc)) {
+                        respVO.setLeaveTypeDesc(leaveTypeDesc);
+                    }
+                }
             }
         }
 

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

@@ -37,7 +37,10 @@ import cn.iocoder.yudao.module.system.api.dept.DeptApi;
 import cn.iocoder.yudao.module.system.api.dept.PostApi;
 import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
 import cn.iocoder.yudao.module.system.api.dept.dto.PostRespDTO;
+import cn.iocoder.yudao.module.system.api.dicttenant.DictDataTenantApi;
+import cn.iocoder.yudao.module.system.api.dicttenant.dto.DictDataTenantRespDTO;
 import cn.iocoder.yudao.module.system.api.notify.NotifyMessageSendApi;
+import cn.iocoder.yudao.module.system.enums.dicttenant.DictTypeTenantEnum;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import liquibase.pro.packaged.S;
@@ -109,6 +112,9 @@ public class OaTurnoverServiceImpl implements OaTurnoverService {
     @Resource
     private NotifyMessageSendApi notifyMessageSendApi;
 
+    @Resource
+    private DictDataTenantApi dictDataTenantApi;
+
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -670,6 +676,15 @@ public class OaTurnoverServiceImpl implements OaTurnoverService {
         }
         // 状态
         oaTurnoverRespVO.setAuditStatusDesc(OaAuditStatusEnum.getByStatus(oaTurnoverDO.getAuditStatus()));
+        // 离职原因
+        if (StrUtil.isNotBlank(oaTurnoverDO.getTurnoverReason())) {
+            List<DictDataTenantRespDTO> dictDataList = dictDataTenantApi.getDictDataList(DictTypeTenantEnum.TENANT_TURNOVER_REASON.getType());
+            Map<String, String> dictDataMap = CollectionUtils.convertMap(dictDataList, DictDataTenantRespDTO::getDictType, DictDataTenantRespDTO::getLabel);
+            String turnoverReasonDesc = dictDataMap.get(oaTurnoverDO.getTurnoverReason());
+            if (StrUtil.isNotBlank(turnoverReasonDesc)) {
+                oaTurnoverRespVO.setTurnoverReasonDesc(turnoverReasonDesc);
+            }
+        }
 
         String procInstId = oaTurnoverDO.getProcInstId();
         if (StrUtil.isNotBlank(procInstId)) {
@@ -789,6 +804,11 @@ public class OaTurnoverServiceImpl implements OaTurnoverService {
             Map<String, String> statusMap = Arrays.stream(OaAuditStatusEnum.values())
                     .collect(Collectors.toMap(OaAuditStatusEnum::getStatus, OaAuditStatusEnum::getStatusDesc));
 
+            // 离职原因
+            List<DictDataTenantRespDTO> dictDataList = dictDataTenantApi.getDictDataList(DictTypeTenantEnum.TENANT_TURNOVER_REASON.getType());
+            Map<String, String> dictDataMap = CollectionUtils.convertMap(dictDataList, DictDataTenantRespDTO::getDictType, DictDataTenantRespDTO::getLabel);
+
+
             for (OaTurnoverRespVO respVO : oaTurnoverRespVOList) {
                 // 当前处理人
                 if (respVO.getCurrentAuditEmployeeId() != null) {
@@ -813,6 +833,12 @@ public class OaTurnoverServiceImpl implements OaTurnoverService {
                 }
                 // 状态
                 respVO.setAuditStatusDesc(statusMap.get(respVO.getAuditStatus()));
+                if (StrUtil.isNotBlank(respVO.getTurnoverReason())) {
+                    String turnoverReasonDesc = dictDataMap.get(respVO.getTurnoverReason());
+                    if (StrUtil.isNotBlank(turnoverReasonDesc)) {
+                        respVO.setTurnoverReasonDesc(turnoverReasonDesc);
+                    }
+                }
             }
         }