Microservice/cn-rdms
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(新增加班申请功能): 新增申请功能，可在工作台进行审核。

Browse Source 
fix(dict_data): 字典数据的颜色类型字段不允许null更新。
This commit is contained in:
dk
2026-06-01 21:25:02 +08:00
parent 5c7dbf7286
commit e71140d8a2
24 changed files with 1247 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rdms-system/rdms-system-api/src/main/java/com/njcn/rdms/module/system/api/user/UserManagementRelationApi.java
View File

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.map.MapUtil;
import com.njcn.rdms.framework.common.pojo.CommonResult;
import com.njcn.rdms.framework.common.util.collection.CollectionUtils;
import com.njcn.rdms.module.system.api.user.dto.AdminUserRespDTO;
import com.njcn.rdms.module.system.api.user.dto.UserManagementRelationRespDTO;
import com.njcn.rdms.module.system.enums.ApiConstants;
import io.swagger.v3.oas.annotations.Operation;
@@ -33,6 +34,11 @@ public interface UserManagementRelationApi {
@Parameter(name = "subordinateUserId", description = "被管理者用户ID", example = "2", required = true)
CommonResult<List<UserManagementRelationRespDTO>> getRelationListBySubordinateUserId(@RequestParam("subordinateUserId") Long subordinateUserId);
@GetMapping(PREFIX + "/direct-manager")
@Operation(summary = "根据用户ID获得当前生效的直属上级")
@Parameter(name = "userId", description = "用户ID", example = "2", required = true)
CommonResult<AdminUserRespDTO> getDirectManager(@RequestParam("userId") Long userId);
@GetMapping(PREFIX + "/list")
@Operation(summary = "获得管理链路列表")
@Parameter(name = "ids", description = "关系编号数组", example = "1,2", required = true)

10
rdms-system/rdms-system-api/src/main/java/com/njcn/rdms/module/system/enums/DictTypeConstants.java
View File

@@ -32,4 +32,14 @@ public interface DictTypeConstants {
*/
String RDMS_TASK_ITEM_TYPE="rdms_task_item_type";
/**
* 加班申请审批状态字典。
*/
String RDMS_OVERTIME_APPLICATION_STATUS = "rdms_overtime_application_status";
/**
* 加班申请时长快捷选项字典。
*/
String RDMS_OVERTIME_DURATION = "rdms_overtime_duration";
}