wangli/orgmanax
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
633 Commits 1 Branch 0 Tags 2.5 MiB
00d124580f
Commit Graph

320 Commits

Author SHA1 Message Date
liuyang
d93864be71 feat:[REQ-3488] 优化协同关系创建service方法 2025-01-15 10:47:19 +08:00
liuyang
6e23456512 feat:[REQ-3488] cooperateShip 创建方法，将通用创建能力下沉到foundation层中 2025-01-14 18:36:03 +08:00
liuyang
fe1d733c66 Merge remote-tracking branch 'origin/feature/REQ-3488' into feature/REQ-3488 2025-01-14 16:06:31 +08:00
liuyang
cfda8a36b7 feat:[REQ-3488] 替换判空方法,使用hutool提供的工具 2025-01-14 16:05:57 +08:00
songyuanlun
22883d3ed4 feat(REQ-3488): 班组类别调整平台班组查询逻辑 2025-01-14 11:52:02 +08:00
liuyang
94fd1421c8 feat:[REQ-3488] 自测, 解决json查询报错问题 2025-01-13 17:29:32 +08:00
liuyang
ffa22f6f7c feat:[REQ-3488] 自测, 解决json查询报错问题 2025-01-13 17:25:02 +08:00
liuyang
2497d7d77c feat:[REQ-3488] 自测, 解决json查询报错问题 2025-01-13 17:07:41 +08:00
liuyang
69d52a8e18 feat:[REQ-3488] 删除无用的依赖 2025-01-13 16:13:29 +08:00
liuyang
4ccd1d5393 feat:[REQ-3488] 修复BUG 2025-01-13 16:05:54 +08:00
liuyang
46a70312d2 feat:[REQ-3488] 过滤入参中集合类型中可能有null值的元素 2025-01-13 16:04:15 +08:00
liuyang
9720d8d8b0 feat:[REQ-3488] 过滤入参中集合类型中可能有null值的元素 2025-01-13 16:01:14 +08:00
liuyang
7a22e944c4 feat:[REQ-3488] 过滤入参中集合类型中可能有null值的元素 2025-01-13 15:50:59 +08:00
liuyang
7f329ee8c8 feat:[REQ-3488] 对ownerProjectWorkerIds字段查询进行实现 2025-01-13 15:42:07 +08:00
zhanghonghao
42048a507e feat(REQ-3488): 去掉小组冗余字段 2025-01-13 14:43:10 +08:00
zhanghonghao
8cb7d59ff8 Merge remote-tracking branch 'origin/feature/REQ-3488' into feature/REQ-3488-zhh 
# Conflicts:
#	orgmanax-server/src/main/java/cn/axzo/orgmanax/server/project/team/service/impl/ProjectTeamServiceImpl.java
 2025-01-13 14:41:52 +08:00
zhanghonghao
f85ccefc0e feat(REQ-3488): 去掉小组冗余字段 2025-01-13 14:41:09 +08:00
周敏
cafea7b02d feat(server): 移除cn.axzo.orgmanax.dto.node.dto.NodeProfile.PlatTeamProfile 这个类。 2025-01-13 11:43:48 +08:00
songyuanlun
a623410550 feat(REQ-3488): 岗位恢复查询角色信息相关逻辑 2025-01-13 10:56:10 +08:00
zhanghongbo
9025aa237c feat(REQ-3488): 提交获取小组接口 2025-01-13 10:27:47 +08:00
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
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
songyuanlun
3d554392c3 feat(REQ-3488): 解决服务启动问题 2025-01-06 21:24:22 +08:00
songyuanlun
6ad0e7da4f feat(REQ-3488): 班组类别api调整step2 2025-01-06 21:20:57 +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
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
songyuanlun
617239def6 feat(REQ-3488): 新增班组类别相关的表、dao、service 2025-01-03 19:06:23 +08:00
zhanghonghao
2a15ccf3ea feat(REQ-3488): 查询项目班组填充属性 2025-01-03 11:27:35 +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
songyuanlun
2f885b3c48 feat(REQ-3488): 人员通用查询接口迁移调整 2025-01-03 10:29:11 +08:00
zhanghonghao
e4d0ab0060 feat(REQ-3488): 删除org_project_team表 2025-01-02 17:00:17 +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
liuyang
60879a7822 Merge branch 'feature/REQ-3282' into feature/REQ-3488 2024-12-31 14:23:54 +08:00
liuyang
9749fbec7e Merge remote-tracking branch 'origin/feature/REQ-3282' into feature/REQ-3282 2024-12-31 14:21:46 +08:00
liuyang
0df7e7d3b8 feat:[REQ-3488] 协同关系数据进行去重 2024-12-31 14:21:39 +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
zhanghongbo
dc6a7c65b6 feat(REQ-3282): 增加班组日志创建 2024-12-27 16:13:35 +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
f0f840be31 feat:[REQ-3488] 暂时提交 2024-12-27 11:09:27 +08:00
liuyang
f950393393 feat:[REQ-3488] 暂时提交 2024-12-27 10:36:48 +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
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
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
4132e694bf feat(REQ-3282): 调整包名 2024-12-26 15:16:16 +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
zhanghonghao
eae694a613 feat(REQ-3282): 调整单位的req/resp的路径 2024-12-26 11:36:06 +08:00
zhanghonghao
16c7f0d77c feat(REQ-3448): 增加资质的实现 2024-12-26 11:29:34 +08:00
liuyang
4f36fcb0a3 feat:[REQ-3282] 实现二期协同关系代码逻辑 2024-12-26 11:27:20 +08:00
liuyang
54c88183d3 feat:[REQ-3282] 将通用能力放在foundation层中 2024-12-26 10:30:33 +08:00
周敏
6a7a78027a feat(REQ-3282): 修复job查询问题 2024-12-26 10:04:09 +08:00
songyuanlun
7faac00411 feat(REQ-3282): 岗位接口参数支持查询身份id和岗位名模糊条件 2024-12-25 21:44:31 +08:00
liuyang
864e8426e4 Merge remote-tracking branch 'origin/feature/REQ-3282' into feature/REQ-3282 2024-12-25 16:46:55 +08:00
liuyang
2a07843626 feat:[REQ-3282] 增加协同关系类型查询 2024-12-25 16:46:50 +08:00
周敏
3d4788d670 feat(REQ-3282): 提供briefDTO，用于聚合 2024-12-25 15:28:36 +08:00
zhanghongbo
956c0ce56c Merge remote-tracking branch 'origin/feature/REQ-3282' into feature/REQ-3282 2024-12-25 14:35:12 +08:00
zhanghongbo
31aa1b00a7 feat(REQ-3282): 新增节点用户代码 2024-12-25 14:35:06 +08:00
liuyang
7a41b82e61 feat:[REQ-3282] 自测, 修复已知问题 2024-12-25 14:18:13 +08:00
liuyang
fd93f73c58 Merge remote-tracking branch 'origin/feature/REQ-3282' into feature/REQ-3282 2024-12-25 11:43:40 +08:00
liuyang
985229f627 feat:[REQ-3282] 自测, 修复已知问题 2024-12-25 11:43:35 +08:00
songyuanlun
d01523e0f6 feat(REQ-3282): 岗位接口调试 2024-12-25 11:14:42 +08:00
liuyang
bb8d798510 feat:[REQ-3282] 自测, 修复已知问题 2024-12-25 11:12:50 +08:00
liuyang
ed90487f85 Merge remote-tracking branch 'origin/feature/REQ-3282' into feature/REQ-3282 2024-12-25 10:34:24 +08:00
liuyang
dff44ba17d feat:[REQ-3282] 删除内部类，使用实体类进行传递数据 2024-12-25 10:34:19 +08:00
songyuanlun
fca5b84da4 feat(REQ-3282): 岗位扩展字段优化 2024-12-24 18:38:45 +08:00
liuyang
5ed580c89e feat:[REQ-3282] 增加异常处理类 2024-12-24 17:47:25 +08:00
liuyang
275d3319c8 feat:[REQ-3282] 增加异常处理类 2024-12-24 17:45:11 +08:00
liuyang
597aa0319c feat:[REQ-3282] 解决代码冲突问题 2024-12-24 15:53:52 +08:00
songyuanlun
ddaa3f7c1b feat(REQ-3282): 岗位接口调整和处理服务启动问题 2024-12-24 15:49:16 +08:00
liuyang
5f69d297c2 feat:[REQ-3282] 解决代码冲突问题 2024-12-24 15:18:46 +08:00
liuyang
3037260d9c feat:[REQ-3282] 解决代码冲突问题 2024-12-24 15:17:07 +08:00
liuyang
f69c8b41b0 feat:[REQ-3282] 解决代码冲突问题 2024-12-24 15:10:43 +08:00
liuyang
34912c2ffa feat:[REQ-3282] 解决代码冲突问题 2024-12-24 15:07:11 +08:00
liuyang
d945124ff4 Merge remote-tracking branch 'origin/feature/REQ-3282' into feature/REQ-3282 2024-12-24 15:03:35 +08:00
liuyang
9404a4b845 feat:[REQ-3282] 暂时提交 2024-12-24 15:03:30 +08:00
zhanghonghao
e2312518a9 Merge remote-tracking branch 'refs/remotes/origin/feature/REQ-3282' into feature/REQ-3282-zhh 2024-12-24 14:56:44 +08:00
zhanghonghao
2a869292e3 feat(REQ-3282): 单位查询支持指定参数 2024-12-24 14:56:28 +08:00
周敏
8ab687fa95 feat(REQ-3282): 调整NodeUserQueryRepository的职责，不做聚合，聚合和查询参数转化放到service层 2024-12-24 14:54:07 +08:00
songyuanlun
d543184f53 feat(REQ-3282): 调整岗位分页的参数 2024-12-24 14:02:29 +08:00