Commit Graph

600 Commits

Author SHA1 Message Date
宋远伦
874d468797 Merge branch 'feature/REQ-3282-syl' into 'feature/REQ-3282'
feat(REQ-3282): 岗位关联表查询

See merge request universal/infrastructure/backend/orgmanax!19
2024-12-24 03:28:01 +00: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
liuyang
729c1b0adc Merge remote-tracking branch 'origin/feature/REQ-3282' into feature/REQ-3282 2024-12-24 10:28:05 +08:00
liuyang
411cc12d95 feat:[REQ-3282] 简单自测,修复BUG 2024-12-24 10:28:00 +08: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
张弘昊
b5f89e591b Merge branch 'feature/REQ-3282-zhh' into 'feature/REQ-3282'
Feature/req 3282 zhh

See merge request universal/infrastructure/backend/orgmanax!15
2024-12-24 02:19:59 +00: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
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
张弘昊
1dfe98d1cc Merge branch 'feature/REQ-3282-zhh' into 'feature/REQ-3282'
feat(REQ-3282): 单位列表查询加上可以查删除的属性

See merge request universal/infrastructure/backend/orgmanax!13
2024-12-24 01:53:09 +00:00
zhanghonghao
8dfb10ba0e feat(REQ-3282): 单位列表查询加上可以查删除的属性 2024-12-24 09:51:59 +08:00
宋远伦
62b52d55cd Merge branch 'feature/REQ-3282-syl' into 'feature/REQ-3282'
feat(REQ-3282): 新的岗位分页接口实现

See merge request universal/infrastructure/backend/orgmanax!12
2024-12-23 14:24:42 +00: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
f9d7859d47 Merge remote-tracking branch 'refs/remotes/origin/feature/REQ-3282' into feature/REQ-3282-zhh 2024-12-23 20:37:26 +08:00
zhanghonghao
55c754cde9 feat(REQ-3282): 提交资质单位类型查询 2024-12-23 20:37:10 +08:00
周敏
18caac6179 feat(REQ-3282): README.md增加dto层描述 2024-12-23 19:55:32 +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
周敏
eb759aa5a6 feat(REQ-3282): NodeUserDTO的node,unit,job等对象注释。增加相应Needs描述。 2024-12-23 17:29:57 +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
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
zhanghonghao
8051c9eeee feat(REQ-3282): 切换成PageReqV2 2024-12-23 13:34:02 +08:00
songyuanlun
6bf7339b75 feat(REQ-3282): org_job_group_relation_history 字段调整 2024-12-23 12:54:35 +08:00
周敏
b72a16b55c chore(REQ-3282): 调整README。增加Page接口的 入参、出参 公共类描述。 2024-12-23 11:48:01 +08:00
zhanghonghao
7b81020619 feat(REQ-3282): 调整jobCodes,启动服务 2024-12-23 11:29:06 +08:00
songyuanlun
b7c54c1c72 Merge branch 'feature/REQ-3282-syl-1' into feature/REQ-3282 2024-12-23 11:25:07 +08:00
songyuanlun
c2108c6410 feat(REQ-3282): 岗位表新增id字段 2024-12-23 11:22:58 +08:00
zhanghonghao
408cc3f2a7 feat(REQ-3282): 调整pageReq 2024-12-23 11:04:32 +08:00
zhanghonghao
05bc5ee4ae Merge remote-tracking branch 'refs/remotes/origin/feature/REQ-3282' into feature/REQ-3282-zhh 2024-12-23 10:55:55 +08:00
zhanghonghao
73019a14c2 feat(REQ-3282): 调整pageReq 2024-12-23 10:55:48 +08:00
宋远伦
a098cc1e2e Merge branch 'feature/REQ-3282-syl' into 'feature/REQ-3282'
feat(REQ-3282): 岗位枚举类移除 CodeDefinition

See merge request universal/infrastructure/backend/orgmanax!5
2024-12-23 02:55:12 +00:00
songyuanlun
dd4dcc7de9 feat(REQ-3282): 岗位枚举类移除 CodeDefinition 2024-12-23 10:48:56 +08:00
周敏
516139dfce chore(REQ-3282): 调整README 2024-12-23 10:11:52 +08:00
宋远伦
b29372f4ed Merge branch 'feature/REQ-3282-syl' into 'feature/REQ-3282'
feat(REQ-3282): 岗位相关表结构、mapper、dao引入

See merge request universal/infrastructure/backend/orgmanax!4
2024-12-20 10:25:51 +00:00