Commit Graph

234 Commits

Author SHA1 Message Date
zhanghonghao
9e44459378 feat(REQ-3488): 创建企业注册历史接口实现 2025-01-10 17:27:13 +08:00
zhanghonghao
c2cf7ea9cb feat(REQ-3488): 资质申请更新接口 2025-01-10 16:59:33 +08:00
zhanghonghao
94df94a1c6 feat(REQ-3488): 确认时间支持查空 2025-01-10 15:45:21 +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
2734288c63 feat(REQ-3488): 实现单位联系人新增\删除 查询接口 2025-01-10 11:35:31 +08:00
zhanghonghao
33ef364931 feat(REQ-3488): 单位查询加参数 2025-01-10 09:38:24 +08:00
周敏
95ba0bd0ce Merge remote-tracking branch 'origin/feature/REQ-3282' 2025-01-09 21:58: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
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
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
0b361628c5 feat(REQ-3488): 创建项目班组日志接口实现 2025-01-08 16:58:42 +08:00
周敏
481d1b5016 chore(server): 调整 orgmanax 的默认 topic为 topic_organizational_${spring_profiles.active} 2025-01-08 14:41:51 +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
zhanghongbo
d3c7446ad6 feat(REQ-3488): 修改查询组织用户 2025-01-07 17:36:30 +08:00
zhanghongbo
038241bd93 feat(REQ-3488): 增加获取工种相关接口 2025-01-07 15:19:54 +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
zhanghongbo
d49656e26d feat(REQ-3488): 增加获取有效工人工种接口 2025-01-06 15:14:23 +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
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
zhanghonghao
d6af38224c feat(REQ-3488): 删除多余的类 2025-01-02 11:41:01 +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
周敏
f7afb2de61 feat(REQ-3488): 添加NodeProfile定义及解析。调整NodeType枚举的包路径 2024-12-31 18:54:51 +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
a42124c18b feat(REQ-3488): 解决编译问题 2024-12-30 18:13:08 +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
69631d9981 feat(REQ-3488): 增加业务审批关系查询 2024-12-30 16:45:20 +08:00
zhanghongbo
30077df494 feat(REQ-3488): 增加业务审批关系查询 2024-12-30 16:39:24 +08:00
zhanghonghao
f59ba102ef feat(REQ-3488): 加上模糊查询的支持 2024-12-30 10:42:00 +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
878bb5317f Merge remote-tracking branch 'refs/remotes/origin/feature/REQ-3488' into feature/REQ-3488-zhh 2024-12-27 16:16:17 +08:00
zhanghongbo
dc6a7c65b6 feat(REQ-3282): 增加班组日志创建 2024-12-27 16:13:35 +08:00
zhanghonghao
fcc08643b9 feat(REQ-3488): 联系人手机号加密 2024-12-27 14:30:27 +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
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
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
200e7e05cb feat(REQ-3488): 提交企业相关的查询接口实现 2024-12-26 17:06:13 +08:00
zhanghonghao
028c067bcc feat(REQ-3488): 提交企业相关的查询接口实现 2024-12-26 17:02:43 +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
d297589892 Merge remote-tracking branch 'refs/remotes/origin/feature/REQ-3282' into feature/REQ-3282-v2-zhh 2024-12-26 10:39:59 +08:00
liuyang
013954f7da feat:[REQ-3282] 删除无用依赖 2024-12-26 10:11:15 +08:00
songyuanlun
94caf009f3 feat(REQ-3282): 岗位分组和关联关系查询新增includeDeleted 2024-12-25 21:58:43 +08:00
songyuanlun
7faac00411 feat(REQ-3282): 岗位接口参数支持查询身份id和岗位名模糊条件 2024-12-25 21:44:31 +08:00
liuyang
abf4d345f0 Merge remote-tracking branch 'origin/feature/REQ-3282' into feature/REQ-3282 2024-12-25 17:13:51 +08:00
liuyang
050642ac35 feat:[REQ-3282] 协同关系增加默认值查询 2024-12-25 17:13:47 +08:00
周敏
cc8e5ed212 feat(REQ-3282): 提供briefDTO,用于聚合 step2 2024-12-25 17:04:46 +08:00
周敏
3d4788d670 feat(REQ-3282): 提供briefDTO,用于聚合 2024-12-25 15:28:36 +08:00
张弘昊
2704bfe4ef Merge branch 'feature/REQ-3282-zhh' into 'feature/REQ-3282'
Feature/req 3282 zhh

See merge request universal/infrastructure/backend/orgmanax!37
2024-12-25 07:15:10 +00:00
zhanghonghao
821d7ab143 feat(REQ-3282): unitList查询增加includeDeleted 2024-12-25 15:13:34 +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
zhanghonghao
10f9e58ea0 Merge remote-tracking branch 'refs/remotes/origin/feature/REQ-3282' into feature/REQ-3282-v2-zhh 2024-12-25 14:26:29 +08:00
liuyang
a77ee4de8a Merge remote-tracking branch 'origin/feature/REQ-3282' into feature/REQ-3282 2024-12-25 14:18:17 +08:00
liuyang
7a41b82e61 feat:[REQ-3282] 自测, 修复已知问题 2024-12-25 14:18:13 +08:00
周敏
1a29267804 feat(REQ-3282): NodeUser加密字段处理 2024-12-25 14:01:21 +08:00
liuyang
bb8d798510 feat:[REQ-3282] 自测, 修复已知问题 2024-12-25 11:12:50 +08:00
zhanghonghao
6235280b9d feat(REQ-3282): 添加qualificationsApply 2024-12-25 11:08:39 +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
zhanghonghao
8501568b39 feat(REQ-3282): 添加创建时间和更新时间 2024-12-24 17:47:53 +08:00
zhanghonghao
0a79dbf459 feat(REQ-3282): 删除创建人和更新人 2024-12-24 16:29:45 +08:00
zhanghonghao
3d9aec8a49 feat(REQ-3282): 单位查询支持身份id 2024-12-24 16:05:37 +08:00
zhanghonghao
d63d9f9da1 feat(REQ-3282): 单位查询支持社会信用码列表 2024-12-24 15:59:47 +08:00
songyuanlun
ddaa3f7c1b feat(REQ-3282): 岗位接口调整和处理服务启动问题 2024-12-24 15:49:16 +08:00
liuyang
7e7bd19b74 feat:[REQ-3282] 解决代码冲突问题 2024-12-24 15:27:16 +08:00
zhanghonghao
ee19a40571 feat(REQ-3282): 单位查询支持指定参数 2024-12-24 15:11:19 +08:00
liuyang
32b2e701c7 feat:[REQ-3282] 解决代码冲突问题 2024-12-24 15:09:35 +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
liuyang
9cba45b82d Merge remote-tracking branch 'origin/feature/REQ-3282' into feature/REQ-3282 2024-12-24 13:47:47 +08:00
liuyang
bafc1e0bb3 feat:[REQ-3282] 增加通用树工具 2024-12-24 13:47:34 +08:00
songyuanlun
7f6416f576 feat(REQ-3282): 岗位关联表查询 2024-12-24 11:26:38 +08:00
张弘昊
3cfdb5d3f0 Merge branch 'feature/REQ-3282-zhh' into 'feature/REQ-3282'
feat(REQ-3282): 单位列表查询加上identityType

See merge request universal/infrastructure/backend/orgmanax!17
2024-12-24 02:30:24 +00:00
周敏
6bc3228b00 feat(REQ-3282): WorkspaceOuPair放到dto.common包。 2024-12-24 10:27:42 +08:00
zhanghonghao
4959321908 feat(REQ-3282): 单位列表查询加上identityType 2024-12-24 10:26:24 +08:00
zhanghonghao
faf3ee9636 Merge remote-tracking branch 'refs/remotes/origin/feature/REQ-3282' into feature/REQ-3282-zhh 2024-12-24 10:19:26 +08:00
zhanghonghao
48735138c8 feat(REQ-3282): 单位列表查询加上identityId和legalIdCard 2024-12-24 10:19:10 +08:00
zhanghonghao
55e63b4e55 feat(REQ-3282): 单位列表查询加上identityId 2024-12-24 10:17:40 +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