zhanghongbo
|
5c49746121
|
Merge remote-tracking branch 'origin/feature/REQ-3488' into feature/REQ-3488
# Conflicts:
# orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/node/req/ListNodeReq.java
|
2025-01-13 10:19:46 +08:00 |
|
zhanghongbo
|
5846b213e5
|
feat(REQ-3488): 提交获取小组接口
|
2025-01-13 10:18:44 +08:00 |
|
张弘昊
|
08e9f7a21c
|
Merge branch 'feature/REQ-3488-zhh' into 'feature/REQ-3488'
feat(REQ-3488): 创建企业注册历史接口实现
See merge request universal/infrastructure/backend/orgmanax!163
|
2025-01-10 09:27:52 +00:00 |
|
zhanghonghao
|
9e44459378
|
feat(REQ-3488): 创建企业注册历史接口实现
|
2025-01-10 17:27:13 +08:00 |
|
张弘昊
|
601a938f7e
|
Merge branch 'feature/REQ-3488-zhh' into 'feature/REQ-3488'
feat(REQ-3488): 资质申请更新接口
See merge request universal/infrastructure/backend/orgmanax!161
|
2025-01-10 09:00:29 +00:00 |
|
zhanghonghao
|
c2cf7ea9cb
|
feat(REQ-3488): 资质申请更新接口
|
2025-01-10 16:59:33 +08:00 |
|
liuyang
|
327dc28543
|
feat:[REQ-3488] 去重兜底
|
2025-01-10 15:57:26 +08:00 |
|
liuyang
|
65dc8623bc
|
feat:[REQ-3488] 将聚合类代码抽象到私有方法中，并且优
|
2025-01-10 15:43:34 +08:00 |
|
liuyang
|
1fff982c1b
|
Merge remote-tracking branch 'origin/feature/REQ-3488' into feature/REQ-3488
|
2025-01-10 15:31:19 +08:00 |
|
liuyang
|
5cc3f2a7a0
|
feat:[REQ-3488] 实现profile筛选
|
2025-01-10 15:30:58 +08:00 |
|
songyuanlun
|
cf8d6a8080
|
feat(REQ-3488): 班组类别api 逻辑调整
|
2025-01-10 15:11:47 +08:00 |
|
zhanghonghao
|
1e9f94b3b3
|
Merge remote-tracking branch 'origin/feature/REQ-3488' into feature/REQ-3488-zhh
|
2025-01-10 14:58:21 +08:00 |
|
zhanghonghao
|
d1afcd27bb
|
feat(REQ-3488): 实现单位注册接口
|
2025-01-10 14:58:09 +08:00 |
|
liuyang
|
f70d1ec9d3
|
feat:[REQ-3488] 抽到独立的类中维护, 减少service类臃肿
|
2025-01-10 14:04:17 +08:00 |
|
zhanghonghao
|
a6c3e41ff6
|
Merge remote-tracking branch 'origin/feature/REQ-3488' into feature/REQ-3488-zhh
|
2025-01-10 11:35:46 +08:00 |
|
zhanghonghao
|
2734288c63
|
feat(REQ-3488): 实现单位联系人新增\删除 查询接口
|
2025-01-10 11:35:31 +08:00 |
|
liuyang
|
7f0a2b2674
|
Merge remote-tracking branch 'origin/feature/REQ-3488' into feature/REQ-3488
|
2025-01-10 09:41:46 +08:00 |
|
liuyang
|
5d02e8c988
|
feat:[REQ-3488] 测试协同关系列表接口, 修复BUG
|
2025-01-10 09:41:39 +08:00 |
|
songyuanlun
|
d30990fd71
|
feat(REQ-3488): 班组类别api调整
|
2025-01-09 18:29:59 +08:00 |
|
songyuanlun
|
aa189fdc21
|
feat(REQ-3488): 班组类别树形查询逻辑调整
|
2025-01-09 17:22:57 +08:00 |
|
zhanghonghao
|
16e9a6b749
|
Merge remote-tracking branch 'origin/feature/REQ-3488' into feature/REQ-3488-zhh
|
2025-01-09 16:28:02 +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 |
|
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 |
|
zhanghonghao
|
6291f60636
|
feat(REQ-3488): 项目班组organizationalNodeId 字段填充
|
2025-01-08 17:37:45 +08:00 |
|
周敏
|
e166e13f90
|
feat(server): 调整日志，接入axzo-logger-spring-boot-starter
|
2025-01-08 17:17:54 +08: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
|
0aab46881a
|
feat(REQ-3488): 修改package位置
|
2025-01-08 14:50:01 +08:00 |
|
zhanghonghao
|
023add4161
|
feat(REQ-3488): 处理班组查询支持类型
|
2025-01-08 14:20:15 +08: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
|
1c6d56a3bf
|
feat(REQ-3488): unit创建/更新 mq修改
|
2025-01-07 18:25:55 +08: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 |
|
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
|
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 |
|
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
|
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 |
|