zgty/zt-dsc
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
987 Commits 2 Branches 0 Tags
22b87fdabf9a739e819c1bdb63a914afa27e63f6
Commit Graph

283 Commits

Author SHA1 Message Date
朝锦 杨
22b87fdabf Merge branch 'dev' into 'test' 
Dev

See merge request jygk/dsc!23
 2026-01-23 09:59:01 +00:00
yangchaojin
90b0d7836a Merge remote-tracking branch 'ztcloud/test' into dev 2026-01-23 17:57:33 +08:00
yangchaojin
c63a153b3e 修复iwork数据同步参数传递问题 2026-01-23 17:56:15 +08:00
qianshijiang
d6ef89b70d 优化 2026-01-23 15:52:53 +08:00
chenbowen
00a092a240 Merge branch 'dev' into test 2026-01-23 10:35:12 +08:00
chenbowen
6ff39a4f83 1. 后端门户逻辑 2026-01-23 10:23:30 +08:00
朝锦 杨
966e48ffb7 Merge branch 'dev' into 'test' 
修复数据总线访问日志无法显示状态码问题:...

See merge request jygk/dsc!22
 2026-01-22 02:40:04 +00:00
yangchaojin
83da1e8bdc Merge remote-tracking branch 'ztcloud/test' into dev 2026-01-22 10:37:46 +08:00
yangchaojin
2a15568b36 修复iwork查询同步参数问题 2026-01-22 10:36:55 +08:00
朝锦 杨
95df0a4e12 Merge branch 'dev' into 'test' 
feat(system): 新增外部系统推送配置功能

See merge request jygk/dsc!21
 2026-01-21 09:47:39 +00:00
yangchaojin
bbc1081a47 Merge remote-tracking branch 'ztcloud/test' into dev 2026-01-21 17:33:45 +08:00
yangchaojin
c1ca1d5372 任务717、718，添加iwork同步参数以及当日变更用户同步任务 2026-01-21 17:26:41 +08:00
wuzongyong
a4ff83ec50 feat(system): 新增外部系统推送配置功能 
- 添加 BusinessTypeEnum 枚举定义采购、销售、生产三种业务类型
- 在 ErrorCodeConstants 中新增外部系统推送配置相关错误码
- 创建 ExternalPushConfigApi 定义推送配置的 RPC 接口
- 实现 ExternalPushConfigApiImpl 提供推送判断功能
- 设计 ExternalPushConfigDO 数据对象存储推送配置信息
- 开发 ExternalPushConfigMapper 提供数据库操作功能
- 实现 ExternalPushConfigService 业务逻辑处理
- 创建管理后台 Controller 提供 CRUD 和查询接口
- 定义请求响应 VO 对象规范接口参数和返回值
- 添加数据库表结构初始化脚本支持推送配置存储
 2026-01-20 17:16:32 +08:00
wuzongyong
95d156940f feat(system): 新增外部系统推送配置功能 
- 添加 BusinessTypeEnum 枚举定义采购、销售、生产三种业务类型
- 在 ErrorCodeConstants 中新增外部系统推送配置相关错误码
- 创建 ExternalPushConfigApi 定义推送配置的 RPC 接口
- 实现 ExternalPushConfigApiImpl 提供推送判断功能
- 设计 ExternalPushConfigDO 数据对象存储推送配置信息
- 开发 ExternalPushConfigMapper 提供数据库操作功能
- 实现 ExternalPushConfigService 业务逻辑处理
- 创建管理后台 Controller 提供 CRUD 和查询接口
- 定义请求响应 VO 对象规范接口参数和返回值
- 添加数据库表结构初始化脚本支持推送配置存储
 2026-01-20 17:14:37 +08:00
chenbowen
80de697d59 Merge branch 'dev' into test 2026-01-20 11:19:35 +08:00
chenbowen
ca75d937fc Merge remote-tracking branch 'base-version/test' into dev 2026-01-20 11:19:23 +08:00
chenbowen
20e76ec7ae 1. 支持工号登录 2026-01-20 11:18:56 +08:00
chenbowen
cc91b6bbcb Merge branch 'dev' into test 2026-01-20 10:59:09 +08:00
chenbowen
2c2b1e2692 Merge remote-tracking branch 'base-version/test' into dev 2026-01-20 10:58:56 +08:00
chenbowen
fdb3536ce3 1. 统一 iwork 查询规范，移除多余的无效的 iwork 查询参数字段 2026-01-20 10:58:15 +08:00
chenbowen
6dbbda6e59 Merge branch 'dev' into test 2026-01-20 10:29:07 +08:00
chenbowen
6e6e946ec8 Merge remote-tracking branch 'base-version/test' into dev 2026-01-20 10:28:52 +08:00
chenbowen
c2e2de3742 1. 统一 iwork 查询规范，移除多余的无效的 iwork 查询参数字段 2026-01-20 10:27:55 +08:00
chenbowen
0f43cbc302 Merge branch 'dev' into test 2026-01-20 08:59:11 +08:00
chenbowen
b637c619f1 Merge remote-tracking branch 'base-version/test' into dev 2026-01-20 08:58:56 +08:00
chenbowen
86ab64a657 1.优化 iwork 同步用户效率 2026-01-20 08:57:08 +08:00
yangchaojin
1e2b89f5fa 添加获取公司节点信息接口 2026-01-20 08:47:15 +08:00
yangchaojin
199f953f35 添加获取公司节点信息接口 2026-01-20 08:43:31 +08:00
ranke
291d18bba7 userId改为 workcode , 修复数据权限的问题. http://172.16.46.63:31560/index.php?m=task&f=view&taskID=715 2026-01-19 09:43:01 +08:00
chenbowen
2917e896fd Merge branch 'dev' into test 2026-01-17 10:37:07 +08:00
chenbowen
3b099925b6 Merge remote-tracking branch 'base-version/test' into dev 2026-01-17 10:36:51 +08:00
chenbowen
a5f844d5df 1. 调整用户名可以设置为最小一位 
(cherry picked from commit 0d31b54f1c13c5851ca448f9d55c4b2d4b345458)
 2026-01-17 10:35:50 +08:00
chenbowen
d4f26b5244 Merge branch 'dev' into test 2026-01-16 18:19:49 +08:00
chenbowen
e6ec4f9e23 1. 调整用户可以接受空字符串 username 
2. 调整 iwork 同步用户时，如果 loginid 为空，设置 username 为空格
 2026-01-16 18:19:09 +08:00
chenbowen
7c0a0601ed 1. 调整用户可以接受空字符串 username 
2. 调整 iwork 同步用户时，如果 loginid 为空，设置 username 为空格
 2026-01-16 18:17:24 +08:00
chenbowen
da6ab95d3a 修复编译错误 2026-01-16 18:10:18 +08:00
ranke
7541cb4d6f Merge branch 'test' into test-dsc 
* test:
  取消sql的日志输出
  授权菜单权限可选不展示菜单选项. http://172.16.46.63:31560/index.php?m=task&f=view&taskID=707
  1. 调整 username 同步逻辑 2. 调整 eban 回调登录逻辑
 2026-01-16 16:18:53 +08:00
ranke
c71ac5dbd3 授权菜单权限可选不展示菜单选项. http://172.16.46.63:31560/index.php?m=task&f=view&taskID=707 2026-01-16 16:17:52 +08:00
chenbowen
adc4f4bf2d Merge branch 'dev' into test 2026-01-16 15:17:41 +08:00
chenbowen
0f37a7f9b6 修复编译错误 2026-01-16 15:17:25 +08:00
chenbowen
e5c8d922c6 Merge branch 'dev' into test 2026-01-16 15:05:49 +08:00
chenbowen
fea194b7bb 1. 调整 username 同步逻辑 
2. 调整 eban 回调登录逻辑
 2026-01-16 15:05:35 +08:00
chenbowen
b35c3f8db2 1. 调整 username 同步逻辑 
2. 调整 eban 回调登录逻辑
 2026-01-16 15:04:29 +08:00
chenbowen
4bcce5046c Merge branch 'dev' into test 2026-01-16 12:51:36 +08:00
chenbowen
d3a771a8a8 Merge remote-tracking branch 'base-version/test' into dev 2026-01-16 12:51:19 +08:00
chenbowen
098be43598 调整 username 同步逻辑 2026-01-16 12:50:25 +08:00
chenbowen
1750e031c0 Merge branch 'dev' into test 2026-01-15 22:44:12 +08:00
chenbowen
e2688268ac Merge remote-tracking branch 'base-version/test' into dev 
# Conflicts:
#	zt-module-databus/zt-module-databus-server-app/src/main/resources/application-dev.yml
 2026-01-15 22:43:56 +08:00
chenbowen
d6e72f6045 密码为空的用户也进行同步 2026-01-15 21:25:25 +08:00
chenbowen
a0ec76a8d8 iwork 同步用户的规则调整 2026-01-15 17:50:21 +08:00