Commit Graph

613 Commits

Author SHA1 Message Date
songyuanlun
aa189fdc21 feat(REQ-3488): 班组类别树形查询逻辑调整 2025-01-09 17:22:57 +08:00
张弘昊
fa3f36fe98 Merge branch 'feature/REQ-3488-zhh' into 'feature/REQ-3488'
Feature/req 3488 zhh

See merge request universal/infrastructure/backend/orgmanax!143
2025-01-09 08:28:46 +00:00
zhanghonghao
16e9a6b749 Merge remote-tracking branch 'origin/feature/REQ-3488' into feature/REQ-3488-zhh 2025-01-09 16:28:02 +08:00
zhanghonghao
8820fa4dca feat(REQ-3488): 调整联系人获取接口 2025-01-09 16:27:23 +08:00
zhanghongbo
5ddfcaaefc feat(REQ-3488): 提交获取小组下工人接口 2025-01-09 15:55:43 +08:00
zhanghongbo
1141598228 feat(REQ-3488): 修改获取工人id, 班组id方法 2025-01-09 14:32:31 +08:00
宋远伦
67cbabdebd Merge branch 'feature/REQ-3488-syl' into 'feature/REQ-3488'
feat(REQ-3488): 构建二方依赖所需的业务范围拼接方法

See merge request universal/infrastructure/backend/orgmanax!141
2025-01-09 06:25:51 +00:00
songyuanlun
b67f365607 feat(REQ-3488): 构建二方依赖所需的业务范围拼接方法 2025-01-09 14:25:00 +08:00
宋远伦
42eeb92bac Merge branch 'feature/REQ-3488-syl' into 'feature/REQ-3488'
Feature/req 3488 syl

See merge request universal/infrastructure/backend/orgmanax!139
2025-01-09 06:02:24 +00:00
songyuanlun
27cd892f53 feat(REQ-3488): 班组类别树形接口调整上级节点字段 2025-01-09 14:01:39 +08:00
songyuanlun
58d057b62d feat(REQ-3488): 班组类别树形结构实现 2025-01-09 13:57:08 +08:00
zhanghongbo
07eaccf53d feat(REQ-3488): 增加获取未分组工人 2025-01-09 09:52:04 +08:00
周敏
4aefaee59c feat(server): 调整请求日志,使用RequestLogV2Aspect 2025-01-08 18:06:45 +08:00
zhanghonghao
6291f60636 feat(REQ-3488): 项目班组organizationalNodeId 字段填充 2025-01-08 17:37:45 +08:00
周敏
18e4a0baa7 feat(server): 调整日志,接入axzo-logger-spring-boot-starter 2025-01-08 17:18:51 +08:00
周敏
e166e13f90 feat(server): 调整日志,接入axzo-logger-spring-boot-starter 2025-01-08 17:17:54 +08:00
张弘昊
6d9f60405b Merge branch 'feature/REQ-3488-zhh' into 'feature/REQ-3488'
Feature/req 3488 zhh

See merge request universal/infrastructure/backend/orgmanax!137
2025-01-08 09:00:26 +00:00
zhanghonghao
6dcdcba555 Merge remote-tracking branch 'origin/feature/REQ-3488' into feature/REQ-3488-zhh 2025-01-08 16:59:30 +08:00
zhanghonghao
0b361628c5 feat(REQ-3488): 创建项目班组日志接口实现 2025-01-08 16:58:42 +08:00
zhanghongbo
2c83d222f4 feat(REQ-3488): 增加获取项目班组id方法 2025-01-08 16:50:39 +08:00
周敏
6ab08bcc18 feature(server): ProjectGroupWorkerProfile增加projectWorkerId的id。 2025-01-08 15:25:21 +08:00
zhanghongbo
0aab46881a feat(REQ-3488): 修改package位置 2025-01-08 14:50:01 +08:00
周敏
481d1b5016 chore(server): 调整 orgmanax 的默认 topic为 topic_organizational_${spring_profiles.active} 2025-01-08 14:41:51 +08:00
张弘昊
68005937b7 Merge branch 'feature/REQ-3488-zhh' into 'feature/REQ-3488'
feat(REQ-3488): 处理班组查询支持类型

See merge request universal/infrastructure/backend/orgmanax!135
2025-01-08 06:21:43 +00:00
zhanghonghao
023add4161 feat(REQ-3488): 处理班组查询支持类型 2025-01-08 14:20:15 +08:00
张弘昊
a1cc1fbed1 Merge branch 'feature/REQ-3488-zhh' into 'feature/REQ-3488'
Feature/req 3488 zhh

See merge request universal/infrastructure/backend/orgmanax!133
2025-01-08 06:12:31 +00:00
zhanghonghao
a2dc94aede feat(REQ-3488): 处理班组查询支持类型 2025-01-08 14:11:45 +08:00
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