Commit Graph

536 Commits

Author SHA1 Message Date
zhanghonghao
950186b5c1 feat(REQ-3488): 处理平台班组id入参 2025-01-08 11:43:10 +08:00
zhanghonghao
b7f5af79bd Merge remote-tracking branch 'origin/master' into feature/REQ-3488 2025-01-08 11:07:57 +08:00
周敏
11ac5934e2 feat(REQ-3488): 完善node-user.http的请求参数 2025-01-08 09:35:28 +08:00
张弘昊
45c2506055 Merge branch 'feature/REQ-3488-zhh' into 'feature/REQ-3488'
Feature/req 3488 zhh

See merge request universal/infrastructure/backend/orgmanax!130
2025-01-07 10:26:40 +00:00
zhanghonghao
b46354353e Merge remote-tracking branch 'origin/feature/REQ-3488' into feature/REQ-3488-zhh 2025-01-07 18:26:15 +08:00
zhanghonghao
1c6d56a3bf feat(REQ-3488): unit创建/更新 mq修改 2025-01-07 18:25:55 +08:00
张弘昊
dc1f057b86 Merge branch 'feature/REQ-3488-zhh' into 'feature/REQ-3488'
Feature/req 3488 zhh

See merge request universal/infrastructure/backend/orgmanax!128
2025-01-07 10:02:36 +00:00
zhanghonghao
b2fd79efdf Merge remote-tracking branch 'origin/feature/REQ-3488' into feature/REQ-3488-zhh 2025-01-07 18:01:57 +08:00
zhanghonghao
ef1021cc31 feat(REQ-3488): unit创建,重复性校验 2025-01-07 17:58:40 +08:00
zhanghongbo
d3c7446ad6 feat(REQ-3488): 修改查询组织用户 2025-01-07 17:36:30 +08:00
liuyang
610db4a3f9 feat:[REQ-3488] 测试协同关系列表接口, 修复BUG 2025-01-07 17:27:56 +08:00
liuyang
86303c58c1 Merge remote-tracking branch 'origin/feature/REQ-3488' into feature/REQ-3488 2025-01-07 17:03:17 +08:00
liuyang
bdc7baebb0 feat:[REQ-3488] 测试协同关系列表接口, 修复BUG 2025-01-07 17:03:08 +08:00
zhanghongbo
a8100f9cf2 feat(REQ-3488): 增加获取工种相关接口 2025-01-07 15:53:01 +08:00
周敏
4a39ce4dc6 feat(REQ-3488): nodeUser查询接口,移除Needs.childNodeUser,没有场景,目前遇到的场景,都是通过findByAncestorNodeId查询 2025-01-07 15:20:36 +08:00
zhanghongbo
4e53da2555 Merge remote-tracking branch 'origin/feature/REQ-3488' into feature/REQ-3488 2025-01-07 15:20:05 +08:00
zhanghongbo
038241bd93 feat(REQ-3488): 增加获取工种相关接口 2025-01-07 15:19:54 +08:00
宋远伦
5f7c6af93d Merge branch 'feature/REQ-3488-syl' into 'feature/REQ-3488'
feat(REQ-3488): 班组类别分组resp调整

See merge request universal/infrastructure/backend/orgmanax!126
2025-01-07 07:17:57 +00:00
songyuanlun
29d7e6d829 feat(REQ-3488): 班组类别分组resp调整 2025-01-07 15:17:08 +08:00
liuyang
66fc1b44b1 Merge remote-tracking branch 'origin/feature/REQ-3488' into feature/REQ-3488 2025-01-07 15:04:53 +08:00
liuyang
3172065a5b feat:[REQ-3488] 修复BUG 2025-01-07 15:04:47 +08:00
张弘昊
5143fa40c3 Merge branch 'feature/REQ-3488-zhh' into 'feature/REQ-3488'
feat(REQ-3488): unit更新,发送mq

See merge request universal/infrastructure/backend/orgmanax!124
2025-01-07 06:22:23 +00:00
zhanghonghao
3743deade5 feat(REQ-3488): unit更新,发送mq 2025-01-07 14:21:44 +08:00
liuyang
879a21a9af feat:[REQ-3488] 修改integration反转依赖项, 从server改为infra 2025-01-07 14:18:13 +08:00
liuyang
e95ee02dae feat:[REQ-3488] 暂时提交 2025-01-07 14:15:54 +08:00
周敏
65f3c4af01 feat(REQ-3488): nodeUser查询接口,支持根据节点类型进行过滤。支持仅查询顶级节点的用户 2025-01-07 11:31:25 +08:00
liuyang
ca0b8e1cf5 feat:[REQ-3488] TreeUtil迁移到dto包中 2025-01-07 11:19:15 +08:00
liuyang
eed1b6747c feat:[REQ-3488] integration 依赖从service改为infra 2025-01-07 10:57:35 +08:00
liuyang
5e713cef20 feat:[REQ-3488] 将TreeUtil迁移到dto包中 2025-01-07 10:38:40 +08:00
宋远伦
9fb86978ef Merge branch 'feature/REQ-3488-syl' into 'feature/REQ-3488'
feat(REQ-3488): 解决服务启动问题

See merge request universal/infrastructure/backend/orgmanax!123
2025-01-06 13:25:38 +00:00
songyuanlun
3d554392c3 feat(REQ-3488): 解决服务启动问题 2025-01-06 21:24:22 +08:00
宋远伦
4b9e605609 Merge branch 'feature/REQ-3488-syl' into 'feature/REQ-3488'
feat(REQ-3488): 班组类别api调整step2

See merge request universal/infrastructure/backend/orgmanax!121
2025-01-06 13:22:04 +00:00
songyuanlun
6ad0e7da4f feat(REQ-3488): 班组类别api调整step2 2025-01-06 21:20:57 +08:00
宋远伦
370731bf50 Merge branch 'feature/REQ-3488-syl' into 'feature/REQ-3488'
feat(REQ-3488): 班组类别api调整

See merge request universal/infrastructure/backend/orgmanax!119
2025-01-06 13:17:33 +00:00
songyuanlun
ae57c46028 feat(REQ-3488): 班组类别api调整 2025-01-06 21:17:01 +08:00
liuyang
b7343d92a9 feat:[REQ-3488] 修改为collection类, 集合处理不关心子类 2025-01-06 20:49:44 +08:00
zhanghongbo
ae91917153 Merge remote-tracking branch 'origin/feature/REQ-3488' into feature/REQ-3488 2025-01-06 15:14:32 +08:00
zhanghongbo
d49656e26d feat(REQ-3488): 增加获取有效工人工种接口 2025-01-06 15:14:23 +08:00
周敏
9baf4bb583 feat(REQ-3488): nodeUser查询接口,支持ancestorNodeIds参数。 2025-01-06 15:08:38 +08:00
张弘昊
6c5a407930 Merge branch 'feature/REQ-3488-zhh' into 'feature/REQ-3488'
feat(REQ-3488): node查询,添加platTeamIds

See merge request universal/infrastructure/backend/orgmanax!118
2025-01-06 07:00:18 +00:00
zhanghonghao
ad7dcdd302 feat(REQ-3488): node查询,添加platTeamIds 2025-01-06 14:59:06 +08:00
周敏
3b0c7d63a1 feat(REQ-3488): 完善一批NodeUserApi.list查询条件 2025-01-06 13:31:38 +08:00
宋远伦
7410b12c35 Merge branch 'feature/REQ-3488-syl' into 'feature/REQ-3488'
feat(REQ-3488): 新增简单版分页查询班组类别

See merge request universal/infrastructure/backend/orgmanax!116
2025-01-06 03:19:22 +00:00
songyuanlun
233f7857ed feat(REQ-3488): 新增简单版分页查询班组类别 2025-01-06 11:18:14 +08:00
宋远伦
f6da3219db Merge branch 'feature/REQ-3488-syl' into 'feature/REQ-3488'
feat(REQ-3488): 新增班组类别相关的表、dao、service

See merge request universal/infrastructure/backend/orgmanax!114
2025-01-03 11:07:21 +00:00
songyuanlun
617239def6 feat(REQ-3488): 新增班组类别相关的表、dao、service 2025-01-03 19:06:23 +08:00
张弘昊
430db66b14 Merge branch 'feature/REQ-3488-zhh' into 'feature/REQ-3488'
feat(REQ-3488): 添加resolve

See merge request universal/infrastructure/backend/orgmanax!112
2025-01-03 08:37:36 +00:00
zhanghonghao
88d5f2bc13 feat(REQ-3488): 添加resolve 2025-01-03 16:37:02 +08:00
宋远伦
87313fa983 Merge branch 'feature/REQ-3488-syl' into 'feature/REQ-3488'
feat(REQ-3488): 批量邀请req字段调整

See merge request universal/infrastructure/backend/orgmanax!110
2025-01-03 08:36:20 +00:00
songyuanlun
64be1db23e feat(REQ-3488): 批量邀请req字段调整 2025-01-03 16:35:15 +08:00