Commit Graph

233 Commits

Author SHA1 Message Date
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
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
周敏
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
6163706230 Merge remote-tracking branch 'origin/feature/REQ-3282' into feature/REQ-3282 2024-12-23 14:15:03 +08:00
liuyang
2761939b14 feat:[REQ-3282] 暂时提交 2024-12-23 14:14:57 +08:00
zhanghonghao
64b344310b Merge remote-tracking branch 'origin/feature/REQ-3282' into feature/REQ-3282 2024-12-23 13:47:13 +08:00
zhanghonghao
b92a1d0f9a feat(REQ-3282): 切换成PageReqV2 2024-12-23 13:47:03 +08:00
liuyang
3da7df020d feat:[REQ-3282] 编写协同关系查询 2024-12-23 13:45:56 +08:00
songyuanlun
6bf7339b75 feat(REQ-3282): org_job_group_relation_history 字段调整 2024-12-23 12:54:35 +08:00
zhanghonghao
7b81020619 feat(REQ-3282): 调整jobCodes,启动服务 2024-12-23 11:29:06 +08:00
songyuanlun
c2108c6410 feat(REQ-3282): 岗位表新增id字段 2024-12-23 11:22:58 +08:00
songyuanlun
7c012f63bb feat(REQ-3282): 岗位相关表结构、mapper、dao引入 2024-12-20 18:25:16 +08:00
liuyang
e816cc703f feat:[REQ-3282] 暂时提交 2024-12-20 13:48:38 +08:00
liuyang
4702a28789 feat:[REQ-3282] 修改配置 2024-12-20 13:48:19 +08:00
liuyang
efffc8ab34 feat:[REQ-3282]实现协同关系方查询接口 2024-12-19 14:21:00 +08:00
liuyang
725ce1422b feat:[REQ-3282]实现协同关系方查询接口 2024-12-19 13:59:00 +08:00
liuyang
b5c308a454 Merge remote-tracking branch 'origin/feature/REQ-3282' into feature/REQ-3282 2024-12-19 11:27:41 +08:00
liuyang
0e2b853c8f feat:[REQ-3282]实现协同关系方查询接口 2024-12-19 11:27:35 +08:00
TanJ
e92796037a README.md调整 2024-12-19 11:24:52 +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
e949fe5309 Merge remote-tracking branch 'origin/feature/REQ-3282' into feature/REQ-3282 2024-12-17 17:16:35 +08:00
TanJ
f9057245c7 README.md调整 2024-12-17 17:16:27 +08:00
zhanghongbo
79f5b1729d feat(REQ-3282): 修改Page基本dto 2024-12-17 15:08:19 +08:00
zhanghongbo
ac6fb87706 feat(REQ-3282): 修改测试中的bug 2024-12-17 09:47:17 +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
liuyang
3d4ce5f422 feat:[REQ-3282] 引入workspace v2 sdk 2024-12-16 18:02:01 +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
周敏
82752b4d21 feature(REQ-3282): OrgUser的通用查询接口实现 2024-12-16 11:24:25 +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
4487b0f866 Merge remote-tracking branch 'origin/feature/REQ-3282' into feature/REQ-3282 2024-12-13 15:12:16 +08:00
liuyang
87e699b183 feat:[REQ-3282] 编写岗位相关代码 2024-12-13 15:12:11 +08:00
zhanghongbo
6bf02e55d8 feat(REQ-3282): 增加profile防腐层调用相关 2024-12-13 13:55:19 +08:00
liuyang
5984cfa6b6 Merge remote-tracking branch 'origin/feature/REQ-3282' into feature/REQ-3282 2024-12-13 10:52:30 +08:00
liuyang
5cd51dc30a feat:[REQ-3282] 暂时提交,编写单位相关代码 2024-12-13 10:52:24 +08:00
zhanghongbo
3b7705c565 feat(REQ-3282): 增加profile防腐层调用相关 2024-12-13 10:31:35 +08:00
周敏
5619387e9c feature(REQ-3282): 引入数据库加解密 2024-12-13 10:26:29 +08:00
liuyang
5b65867e7f feat:[REQ-3282] 暂时提交,编写单位相关代码 2024-12-12 16:49:42 +08:00
周敏
1731607ce0 feature(REQ-3282): node查询,unit接口定义 2024-12-12 11:02:22 +08:00
liuyang
3a7e8593be feat:[REQ-3282] 修改不能报错问题 2024-12-11 18:27:41 +08:00
周敏
c77d41503e feature(REQ-3282): DO对象,使用SuperBuilder; 2024-12-11 17:17:36 +08:00
zhanghongbo
90937eeb8d feat(REQ-3282): 增加apollo调用相关 2024-12-11 16:24:33 +08:00
liuyang
3f72843c79 feat:[REQ-3282] 完善datacollection二方sdk的基础方法 2024-12-11 14:37:58 +08:00
liuyang
15ddb4b2ea feat:[REQ-3282] 增加gaia rpc接口 2024-12-11 11:32:44 +08:00
liuyang
4d4d394579 feat:[REQ-3282] 暂时提交,编写gaia方法调用ing.... 2024-12-10 18:53:06 +08:00
周敏
8ba3de283d Merge remote-tracking branch 'origin/feature/REQ-3282' into feature/REQ-3282 2024-12-10 18:50:54 +08:00
周敏
0357481bf4 feature(REQ-3282): 提交 创建部门代码;提交部分单位代码; 2024-12-10 18:50:48 +08:00
liuyang
d5b0e2dc94 feat:[REQ-3282] 暂时提交 2024-12-10 18:37:53 +08:00
liuyang
af27f5c52f feat:[REQ-3282] 暂时提交, 新增Elise相关二方SDK调用 2024-12-10 18:04:47 +08:00
liuyang
0a914876ef Merge remote-tracking branch 'origin/feature/REQ-3282' into feature/REQ-3282 2024-12-10 16:27:40 +08:00
liuyang
f773ebaa0a feat:[REQ-3282] 编写rpc调用demo 2024-12-10 16:27:35 +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
liuyang
4ac7554f94 Merge remote-tracking branch 'origin/feature/REQ-3282' into feature/REQ-3282 2024-12-09 20:46:13 +08:00
liuyang
598f2f084a feat:[REQ-3282] 编写unit模块代码 2024-12-09 20:46:07 +08:00
周敏
f472e99396 feature(REQ-3282): Node基于Processor方式写收口的方法demo step4 2024-12-09 19:45:07 +08:00
liuyang
5172011d83 feat:[REQ-3282] 增加autoResultMap字段设置 2024-12-09 16:59:25 +08:00
liuyang
b4fc025c37 feat:[REQ-3282] 创建repository对象 2024-12-09 16:52:06 +08:00
liuyang
cce89f1e32 feat:[REQ-3282] 简化部分对象命名 2024-12-09 16:25:28 +08:00
liuyang
771422849e feat:[REQ-3282] 创建基础的对象 2024-12-09 16:07:30 +08:00
liuyang
0ab26252ce feat:[REQ-3282] 创建基础的对象 2024-12-09 16:04:36 +08:00
liuyang
2c72c471ac feat:[REQ-3282] 创建基础的对象 2024-12-09 15:49:21 +08:00
liuyang
1529797712 feat:[REQ-3282] 创建基础的对象 2024-12-09 15:33:17 +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
3432758016 feat:[REQ-3282] 创建实体 2024-12-05 15:50:59 +08:00
TanJ
5445460a22 README.md 添加接口参数约束 2024-12-05 13:50:58 +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