wangli/orgmanax
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
619 Commits 1 Branch 0 Tags 2.5 MiB
35bca70644
Commit Graph

306 Commits

Author SHA1 Message Date
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
liuyang
bafc1e0bb3 feat:[REQ-3282] 增加通用树工具 2024-12-24 13:47:34 +08:00
liuyang
411cc12d95 feat:[REQ-3282] 简单自测,修复BUG 2024-12-24 10:28:00 +08:00
liuyang
1c02b74730 feat:[REQ-3282] 简单自测,修复BUG 2024-12-24 10:12:01 +08:00
liuyang
06f130c11a Merge remote-tracking branch 'origin/feature/REQ-3282' into feature/REQ-3282 2024-12-24 09:54:47 +08:00
liuyang
0b6ca636f5 feat:[REQ-3282] 暂时提交,完成节点基本查询 2024-12-24 09:54:42 +08:00
songyuanlun
22d1ab0f05 feat(REQ-3282): 新的岗位分页接口实现 2024-12-23 22:23:58 +08:00
liuyang
433f763ac3 feat:[REQ-3282] 暂时提交 2024-12-23 20:53:01 +08:00
zhanghonghao
55c754cde9 feat(REQ-3282): 提交资质单位类型查询 2024-12-23 20:37:10 +08:00
zhanghonghao
7d36020e60 Merge remote-tracking branch 'refs/remotes/origin/feature/REQ-3282' into feature/REQ-3282-zhh 2024-12-23 18:05:42 +08:00
zhanghonghao
0f98f8d513 feat(REQ-3282): 单位查询加上查询条件 2024-12-23 18:05:29 +08:00
liuyang
9a211bfa7d feat:[REQ-3282] 解决报错问题 2024-12-23 17:44:01 +08:00
周敏
7f42bfca7e feat(REQ-3282): 添加dto层。提供对外暴露的公共对象。step2 2024-12-23 17:26:17 +08:00
周敏
cb0c0b5530 feat(REQ-3282): 添加dto层。提供对外暴露的公共对象。 2024-12-23 17:21:14 +08:00
liuyang
fe87bb1019 feat:[REQ-3282] 解决报错问题 2024-12-23 16:29:38 +08:00
liuyang
dfc0b93b93 Merge remote-tracking branch 'origin/feature/REQ-3282' into feature/REQ-3282 
# Conflicts:
#	orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/repository/OrgJobQueryRepository.java
 2024-12-23 16:25:15 +08:00
liuyang
e8e939cd87 feat:[REQ-3282] 编写组织节点相关代码 2024-12-23 16:23:22 +08:00
周敏
414f1318f2 feat(REQ-3282): 定义完整的ListNodeUserReq参数。完成node，unit，job的返回支持。 2024-12-23 16:05:17 +08:00
liuyang
2761939b14 feat:[REQ-3282] 暂时提交 2024-12-23 14:14:57 +08:00
liuyang
3da7df020d feat:[REQ-3282] 编写协同关系查询 2024-12-23 13:45:56 +08:00
liuyang
ea27e70c08 feat:[REQ-3282] 暂时提交 2024-12-20 17:12:16 +08:00
liuyang
e816cc703f feat:[REQ-3282] 暂时提交 2024-12-20 13:48:38 +08:00
zhanghonghao
13056f0067 Merge remote-tracking branch 'refs/remotes/origin/feature/REQ-3282' into feature/REQ-3282-zhh 2024-12-19 14:43:14 +08:00
zhanghonghao
87cbd0e9a1 feat(REQ-3282): 调整返回类名 2024-12-19 14:43:00 +08:00
liuyang
02449776f6 Merge remote-tracking branch 'origin/feature/REQ-3282' into feature/REQ-3282 2024-12-19 13:59:06 +08:00
liuyang
725ce1422b feat:[REQ-3282]实现协同关系方查询接口 2024-12-19 13:59:00 +08:00
zhanghonghao
b884d1c05e Merge remote-tracking branch 'refs/remotes/origin/feature/REQ-3282' into feature/REQ-3282-zhh 2024-12-19 11:44:30 +08:00
zhanghonghao
9dd9c67adb feat(REQ-3282): 添加联系人api 2024-12-19 11:44:07 +08:00
liuyang
0e2b853c8f feat:[REQ-3282]实现协同关系方查询接口 2024-12-19 11:27:35 +08:00
zhanghonghao
5daef2a2e9 feat(REQ-3282): 联系人加密手机号 2024-12-18 20:05:08 +08:00
zhanghonghao
de35a23047 feat(REQ-3282): 添加单位联系人api 2024-12-18 17:24:27 +08:00
TanJ
ef9a061d41 README.md调整 2024-12-17 19:13:28 +08:00
TanJ
f9057245c7 README.md调整 2024-12-17 17:16:27 +08:00
liuyang
e671277662 feat:[REQ-3282] 实现workspace查询 2024-12-16 20:02:25 +08:00
liuyang
748c52386a feat:[REQ-3282] 引入workspace v2 sdk 2024-12-16 19:56:43 +08:00
zhanghongbo
18445db179 Merge remote-tracking branch 'origin/feature/REQ-3282' into feature/REQ-3282 2024-12-16 17:52:30 +08:00
zhanghongbo
f5c9b41857 feat(REQ-3282): 修改测试中的bug 2024-12-16 17:52:23 +08:00
周敏
d41cae21b2 feat(REQ-3282): profileGateway临时对接profile的查询接口。 
后续需要对接通用接口。目前只是为了方便测试，对接了用到的参数。
 2024-12-16 17:51:55 +08:00
周敏
02a198984d feature(REQ-3282): OrgUser的通用查询接口实现 step2 2024-12-16 11:52:29 +08:00
周敏
82752b4d21 feature(REQ-3282): OrgUser的通用查询接口实现 2024-12-16 11:24:25 +08:00
liuyang
426f39fbd7 feat:[REQ-3282] 删除测试类 2024-12-16 09:45:13 +08:00
liuyang
a3522e67be feat:[REQ-3282] 处理冲突 2024-12-13 16:02:04 +08:00
周敏
43d7b0a12e feature(REQ-3282): NodeUser，SaasCooperateShip的基础接口实现。 2024-12-13 15:59:47 +08:00
liuyang
9f86ad450b feat:[REQ-3282] 编写岗位相关代码 2024-12-13 15:42:20 +08:00
liuyang
87e699b183 feat:[REQ-3282] 编写岗位相关代码 2024-12-13 15:12:11 +08:00
liuyang
17f8efb7d7 feat:[REQ-3282] 暂时提交,编写单位相关代码 2024-12-13 13:42:04 +08:00
liuyang
5cd51dc30a feat:[REQ-3282] 暂时提交,编写单位相关代码 2024-12-13 10:52:24 +08:00
liuyang
5737b3cd47 feat:[REQ-3282] 暂时提交,编写单位相关代码 2024-12-12 18:47:26 +08:00
liuyang
5b65867e7f feat:[REQ-3282] 暂时提交,编写单位相关代码 2024-12-12 16:49:42 +08:00
liuyang
1b6806f1bf feat:[REQ-3282] 合并代码 2024-12-12 11:46:09 +08:00
周敏
dd624aca0d feature(REQ-3282): node查询，unit接口定义 step2 2024-12-12 11:04:22 +08:00
周敏
1731607ce0 feature(REQ-3282): node查询，unit接口定义 2024-12-12 11:02:22 +08:00
liuyang
9e863a1b47 feat:[REQ-3282] 暂时提交测试接口，后期删除 2024-12-11 19:42:56 +08:00
liuyang
76cbcb0ef3 feat:[REQ-3282] 增加feign日志打印 2024-12-11 19:38:37 +08:00
liuyang
3a7e8593be feat:[REQ-3282] 修改不能报错问题 2024-12-11 18:27:41 +08:00
周敏
0357481bf4 feature(REQ-3282): 提交 创建部门代码；提交部分单位代码； 2024-12-10 18:50:48 +08:00
周敏
34e89461bb feature(REQ-3282): 调整api引入的包。以及node的部分实现 2024-12-10 15:31:34 +08:00
liuyang
c1108dd54a feat:[REQ-3282] 修改程序运行异常问题 2024-12-10 14:40:19 +08:00
周敏
f472e99396 feature(REQ-3282): Node基于Processor方式写收口的方法demo step4 2024-12-09 19:45:07 +08:00
周敏
f4d1687219 feature(REQ-3282): Node基于Processor方式写收口的方法demo step3 2024-12-09 11:01:37 +08:00
liuyang
b540bf0919 feat:[REQ-3282] 删除伪代码 2024-12-09 10:36:17 +08:00
liuyang
1b6d3321a4 feat:[REQ-3282] 解决报错问题 2024-12-09 10:12:29 +08:00
周敏
1e2af942a5 feature(REQ-3282): Node基于Processor方式写收口的方法demo step2 2024-12-09 09:58:19 +08:00
周敏
6baeb19d40 feature(REQ-3282): Node基于Processor方式写收口的方法demo 2024-12-06 19:43:29 +08:00
liuyang
6bcf30a339 feat:[REQ-3282] 暂时提交 2024-12-06 18:48:59 +08:00
TanJ
3af6b5b855 分层调整 2024-12-06 10:06:12 +08:00
TanJ
1ae4a9bc0a 目录层级调整 2024-12-05 11:45:49 +08:00
TanJ
5edeb439c1 添加 README.md 2024-12-04 11:29:07 +08:00
TanJ
19228b0412 规范maven，添加创建部门示例 2024-12-02 20:12:54 +08:00
TanJ
19c1754f93 目录结构调整 2024-12-02 15:57:10 +08:00
TanJ
8bcbf1b26b init 2024-12-02 15:23:06 +08:00