Commit Graph

190 Commits

Author SHA1 Message Date
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
b67f365607 feat(REQ-3488): 构建二方依赖所需的业务范围拼接方法 2025-01-09 14:25:00 +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
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
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
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
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
songyuanlun
29d7e6d829 feat(REQ-3488): 班组类别分组resp调整 2025-01-07 15:17:08 +08:00
liuyang
3172065a5b feat:[REQ-3488] 修复BUG 2025-01-07 15:04:47 +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
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
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
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
songyuanlun
64be1db23e feat(REQ-3488): 批量邀请req字段调整 2025-01-03 16:35:15 +08:00
songyuanlun
0d15e6e710 feat(REQ-3488): 项目内工人邀请,班组类别工种api相关调整 2025-01-03 16:16:38 +08:00
张弘昊
4123402258 Merge branch 'feature/REQ-3488-zhh' into 'feature/REQ-3488'
feat(REQ-3488): 资质req/resp属性扩充

See merge request universal/infrastructure/backend/orgmanax!106
2025-01-03 08:13:08 +00:00
zhanghonghao
e00e1813ce feat(REQ-3488): 资质req/resp属性扩充 2025-01-03 16:12:28 +08:00
songyuanlun
e0ad5f757c feat(REQ-3488): 班组类别api、出参、入参调整 2025-01-03 11:42:33 +08:00
zhanghongbo
a7c4a3eaf6 feat(REQ-3488): 迁移dto 2025-01-03 11:33:46 +08:00
zhanghonghao
25077fbb6f feat(REQ-3488): 查询项目班组填充属性 2025-01-03 11:29:02 +08:00
zhanghonghao
77eff6b5cd feat(REQ-3488): 查询班组请求参数调整 2025-01-03 11:16:04 +08:00
zhanghonghao
80fad48121 Merge remote-tracking branch 'refs/remotes/origin/feature/REQ-3488' into feature/REQ-3488-zhh 2025-01-03 11:14:08 +08:00
zhanghonghao
c71bd2a4db feat(REQ-3488): 查询班组请求参数调整 2025-01-03 11:13:29 +08:00
songyuanlun
0d2b226c44 feat(REQ-3488): 单位隐私接口参数调整 2025-01-03 11:01:24 +08:00
zhanghonghao
60de8fa0e7 Merge remote-tracking branch 'refs/remotes/origin/feature/REQ-3488' into feature/REQ-3488-zhh 2025-01-03 10:51:21 +08:00
zhanghonghao
d00578fcfc feat(REQ-3488): 查询班组支持单位id 2025-01-03 10:51:12 +08:00
zhanghonghao
e40f416764 feat(REQ-3488): 查询班组支持单位id 2025-01-03 10:50:35 +08:00
songyuanlun
2f885b3c48 feat(REQ-3488): 人员通用查询接口迁移调整 2025-01-03 10:29:11 +08:00
songyuanlun
329d349f09 feat(REQ-3488): 人员异动记录api调整 2025-01-03 10:13:01 +08:00
songyuanlun
6a58b71c08 feat(REQ-3488): 人员邀请相关api 的req、resp调整 2025-01-02 19:27:46 +08:00
周敏
0ea671f661 feat(REQ-3488): 添加NodeUserProfile定义及解析。重构NodeUserService.list方法的代码,将listReq的resolve抽成一个方法,提升page主方法的可读性。 2025-01-02 15:26:17 +08:00
songyuanlun
7f2133533e feat(REQ-3488): 单位隐私相关的req、dto迁移 2025-01-02 14:13:34 +08:00
songyuanlun
ce62d5ad3d feat(REQ-3488): SaasCooperateShipCooperateTypeEnum 废弃,统一采用CooperateShipTypeEnum 2025-01-02 13:54:06 +08:00
zhanghonghao
98be557563 feat(REQ-3488): 调整资质枚举 2025-01-02 13:35:25 +08:00
zhanghonghao
2f7e7a4cf9 feat(REQ-3488): 调整identityEnum 2025-01-02 11:18:37 +08:00
zhanghonghao
0307b1f41e feat(REQ-3488): 调整identityEnum 2025-01-02 11:15:04 +08:00
zhanghonghao
6d39e24827 feat(REQ-3488): 删除多余的枚举 2025-01-02 11:02:57 +08:00
zhanghonghao
f4cbf00742 feat(REQ-3488): 改成superBuilder 2025-01-02 10:56:19 +08:00
zhanghonghao
9cbdd70bc5 feat(REQ-3488): 添加builder 2025-01-02 10:51:39 +08:00
zhanghonghao
f7a373a878 feat(REQ-3488): 添加builder 2025-01-02 10:47:59 +08:00
zhanghonghao
af7ab62fe6 Merge remote-tracking branch 'refs/remotes/origin/feature/REQ-3488' into feature/REQ-3488-zhh 2025-01-02 10:34:38 +08:00
zhanghonghao
abed5e87b6 feat(REQ-3488): 调整枚举 2025-01-02 10:34:22 +08:00
周敏
f7afb2de61 feat(REQ-3488): 添加NodeProfile定义及解析。调整NodeType枚举的包路径 2024-12-31 18:54:51 +08:00
songyuanlun
a430394912 feat(REQ-3488): 单位联系人接口定义 2024-12-31 17:50:59 +08:00
zhanghonghao
3d0c070bd6 Merge remote-tracking branch 'refs/remotes/origin/feature/REQ-3282' into feature/REQ-3488 2024-12-30 18:15:55 +08:00
songyuanlun
c6352b38eb feat(REQ-3282): 岗位接口移除查询角色信息,二期实现 2024-12-30 18:03:55 +08:00
zhanghonghao
4109e0214f feat(REQ-3488): 提供项目内班组列表查询接口 2024-12-30 17:59:59 +08:00
zhanghongbo
30077df494 feat(REQ-3488): 增加业务审批关系查询 2024-12-30 16:39:24 +08:00
zhanghonghao
7b711ce29b Merge remote-tracking branch 'refs/remotes/origin/feature/REQ-3282' into feature/REQ-3488 2024-12-30 09:44:40 +08:00
周敏
692035078f feat(REQ-3282): 完善一批查询接口 2024-12-27 18:37:52 +08:00
zhanghonghao
3ab7f2827e Merge remote-tracking branch 'refs/remotes/origin/feature/REQ-3282' into feature/REQ-3488 2024-12-27 18:20:12 +08:00
songyuanlun
c2a3cc4369 feat(REQ-3282): 解决打包编译问题 2024-12-27 17:04:24 +08:00
zhanghongbo
dc6a7c65b6 feat(REQ-3282): 增加班组日志创建 2024-12-27 16:13:35 +08:00
zhanghonghao
1a0e4c0237 feat(REQ-3488): 解决构建问题 2024-12-27 13:38:13 +08:00
zhanghonghao
80e8b40c87 Merge remote-tracking branch 'refs/remotes/origin/feature/REQ-3488' into feature/REQ-3488-zhh 2024-12-27 11:45:28 +08:00
zhanghonghao
8b6115fa13 feat(REQ-3488): 提交资质序列/单位类型列表实现 2024-12-27 11:45:10 +08:00
liuyang
56a7b29a24 Merge remote-tracking branch 'origin/feature/REQ-3488' into feature/REQ-3488 2024-12-27 10:36:55 +08:00
liuyang
f950393393 feat:[REQ-3488] 暂时提交 2024-12-27 10:36:48 +08:00
宋远伦
4225d1a6bb Merge branch 'feature/REQ-3282' into 'feature/REQ-3488'
Feature/req 3282

See merge request universal/infrastructure/backend/orgmanax!54
2024-12-26 11:33:52 +00:00
songyuanlun
7cf4af6dc0 feat(REQ-3282): JobDTO 返回值调整 2024-12-26 19:27:05 +08:00
songyuanlun
ce5e2f6851 feat(REQ-3282): 项目班组、单位隐私的枚举类定义 2024-12-26 18:51:13 +08:00
liuyang
07e8782b20 Merge remote-tracking branch 'origin/feature/REQ-3488' into feature/REQ-3488 2024-12-26 18:31:30 +08:00
liuyang
eb7379387c feat:[REQ-3282] 填充组织节点的查询接口 2024-12-26 18:31:23 +08:00
宋远伦
9753bae509 Merge branch 'feature/REQ-3488-syl' into 'feature/REQ-3488'
feat(REQ-3488): 调整岗位常量类

See merge request universal/infrastructure/backend/orgmanax!47
2024-12-26 10:12:04 +00:00
zhanghonghao
1f57e58a62 Merge remote-tracking branch 'refs/remotes/origin/feature/REQ-3488' into feature/REQ-3488-zhh 2024-12-26 18:10:09 +08:00
zhanghonghao
b5a7d1cd9a feat(REQ-3488): 调整字段定义 2024-12-26 18:09:54 +08:00
songyuanlun
a590c54260 feat(REQ-3488): 调整岗位常量类 2024-12-26 18:08:51 +08:00
zhanghongbo
9a47414d26 feat(REQ-3282): 增加班组日志分页查询 2024-12-26 17:48:39 +08:00
zhanghonghao
733748849e Merge remote-tracking branch 'refs/remotes/origin/feature/REQ-3488' into feature/REQ-3488-zhh 2024-12-26 17:03:29 +08:00
zhanghonghao
028c067bcc feat(REQ-3488): 提交企业相关的查询接口实现 2024-12-26 17:02:43 +08:00
liuyang
1d3d998ec7 Merge remote-tracking branch 'origin/feature/REQ-3488' into feature/REQ-3488 2024-12-26 16:22:57 +08:00
liuyang
fa15a4c4e7 feat:[REQ-3282] 填充协同关系查询接口 2024-12-26 16:22:47 +08:00
zhanghonghao
4805d68ead Merge remote-tracking branch 'refs/remotes/origin/feature/REQ-3488-zhh' into feature/REQ-3488 2024-12-26 15:16:37 +08:00
zhanghonghao
58f4af2788 feat(REQ-3488): 实现maokai等接口 2024-12-26 15:15:15 +08:00
zhanghonghao
61d020f945 Merge remote-tracking branch 'refs/remotes/origin/feature/REQ-3282' into feature/REQ-3488 2024-12-26 13:34:24 +08:00
zhanghonghao
a587f23b3c Merge remote-tracking branch 'refs/remotes/origin/feature/REQ-3282' into feature/REQ-3488-zhh 2024-12-26 13:34:01 +08:00