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 |
|