 lvleigang
|
d8d8b42d54
|
Merge branch 'yuecheng-project' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project
|
2024-06-28 15:49:47 +08:00 |
|
lvleigang
|
4351dd9ef7
|
下发填写日志
|
2024-06-28 15:49:35 +08:00 |
yuqh
|
1818363bb7
|
Merge remote-tracking branch 'origin/yuecheng-project' into yuecheng-project
|
2024-06-28 15:13:04 +08:00 |
|
yuqh
|
a51412fa0e
|
MDM公用文件
|
2024-06-28 15:12:55 +08:00 |
|
lvleigang
|
319bd2ba7a
|
修改保存数据到任务日志
|
2024-06-28 15:09:32 +08:00 |
|
lvleigang
|
c333f3f84f
|
修改适配达梦
|
2024-06-28 14:00:52 +08:00 |
|
yuqh
|
32275b018e
|
MDM公用文件
|
2024-06-28 09:09:56 +08:00 |
476474485@qq.com
|
1b2fe8d78a
|
修改MDM方法，根据表名称获取字段，转换小写后传递数据
|
2024-06-27 17:07:38 +08:00 |
|
476474485@qq.com
|
4b9e19ab81
|
强制转换数据库字段为小写,出问题在说
|
2024-06-27 14:57:14 +08:00 |
 xiang2lin
|
2ff34ebe7e
|
cbs支付 代发
|
2024-06-26 17:02:59 +08:00 |
|
xiang2lin
|
cd8dba9b1d
|
cbs 支付 代发代扣
|
2024-06-26 17:02:10 +08:00 |
|
xiang2lin
|
6779afc801
|
Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project
|
2024-06-26 16:16:53 +08:00 |
|
xiang2lin
|
6e77825ce2
|
Merge branch 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project
|
2024-06-26 15:44:34 +08:00 |
 hecan
|
55695a0257
|
判断字段是否是必填项，操作日志新增类型
|
2024-06-26 10:41:57 +08:00 |
|
476474485@qq.com
|
c2c3435967
|
Merge branches 'dev' and 'yuecheng-project' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project
|
2024-06-26 09:08:24 +08:00 |
|
lvleigang
|
6250ce4a83
|
修改主数据
|
2024-06-25 17:20:07 +08:00 |
|
xiang2lin
|
5991883e53
|
Merge branch 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project
|
2024-06-25 16:46:46 +08:00 |
|
yuqh
|
f35603466a
|
Merge remote-tracking branch 'origin/yuecheng-project' into yuecheng-project
|
2024-06-25 15:57:23 +08:00 |
|
yuqh
|
f601167183
|
收款单dao
|
2024-06-25 15:57:15 +08:00 |
|
lvleigang
|
bbd2bbb428
|
Merge branches 'dev' and 'yuecheng-project' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project
|
2024-06-25 15:50:26 +08:00 |
|
lvleigang
|
dfd77dc842
|
修改人员脚本
|
2024-06-25 15:40:34 +08:00 |
|
lvleigang
|
465ede3d79
|
Merge branch 'dev' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into dev
|
2024-06-25 14:12:24 +08:00 |
|
lvleigang
|
4b39c006f5
|
主数据发送判断是否可以发送，返回null
|
2024-06-25 14:12:15 +08:00 |
|
yuqh
|
3e726e8b3c
|
数智办公对接数智财务逻辑
|
2024-06-25 14:10:22 +08:00 |
|
xiang2lin
|
f6223037d1
|
币种枚举
|
2024-06-25 13:33:47 +08:00 |
|
xiang2lin
|
3f9058de62
|
交易明细查询
|
2024-06-25 11:20:18 +08:00 |
|
yuqh
|
466aaaf04f
|
Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project
|
2024-06-25 11:02:14 +08:00 |
|
hecan
|
c2266e103d
|
调整增删改查逻辑，使用主表id当作明细的formmain_id
|
2024-06-25 11:01:39 +08:00 |
|
yuqh
|
ce9f561bbe
|
Merge branches 'dev' and 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project
|
2024-06-25 09:54:16 +08:00 |
|
hecan
|
15b031bd36
|
新增字段data_id为第三方主键id，用第三方主键来操作
|
2024-06-25 09:52:29 +08:00 |
|
yuqh
|
e6d814e405
|
Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project
|
2024-06-25 09:29:17 +08:00 |
|
yuqh
|
5c77244d24
|
MDM公用文件
|
2024-06-25 09:25:06 +08:00 |
|
lvleigang
|
0e7b05e788
|
主数据创建表添加第三方主键id
|
2024-06-25 09:22:24 +08:00 |
|
lvleigang
|
f495d7b88d
|
Merge branch 'dev' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into dev
|
2024-06-25 08:59:10 +08:00 |
|
lvleigang
|
aea0ee873b
|
主数据删除修改
|
2024-06-25 08:59:00 +08:00 |
|
yuqh
|
816bdbc51b
|
Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project
|
2024-06-24 19:03:30 +08:00 |
|
hecan
|
f9a0375063
|
修改明细表的id
|
2024-06-24 19:03:00 +08:00 |
|
yuqh
|
738eb5801f
|
Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project
|
2024-06-24 19:01:39 +08:00 |
|
hecan
|
cc866f471d
|
使用传入的id
|
2024-06-24 19:00:54 +08:00 |
|
xiang2lin
|
fa3f5eb622
|
cbs
|
2024-06-24 18:51:59 +08:00 |
|
xiang2lin
|
f779db543c
|
cbs
|
2024-06-24 18:51:00 +08:00 |
|
yuqh
|
9637c73b96
|
Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project
|
2024-06-24 18:06:12 +08:00 |
|
hecan
|
4b27586193
|
查询接口新增判断，明细表是否为空
|
2024-06-24 18:03:02 +08:00 |
|
yuqh
|
dfc406864b
|
Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project
|
2024-06-24 17:48:42 +08:00 |
|
lvleigang
|
08e0a56099
|
任务计划，添加查询数据源
|
2024-06-24 17:48:12 +08:00 |
|
hecan
|
2ae7391e65
|
放开测试时候注释掉的操作日志保存接口
|
2024-06-24 17:44:13 +08:00 |
|
hecan
|
6cdbd049a7
|
Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into hecan
|
2024-06-24 17:42:29 +08:00 |
|
yuqh
|
2208514dc7
|
Merge branches 'dev' and 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project
Conflicts:
pom.xml
service/src/main/java/com/hzya/frame/serviceUtil/DsDataSourceUtil.java
|
2024-06-24 17:36:00 +08:00 |
|
hecan
|
422f5f4469
|
调整修改和新增得参数，为表名称
|
2024-06-24 17:33:14 +08:00 |
|
yuqh
|
2e8baebbb1
|
MDM公用文件
|
2024-06-24 15:52:45 +08:00 |
|
hecan
|
c5dc5449d0
|
根据表名称和表类型进行分组
|
2024-06-24 15:49:23 +08:00 |
|
yuqh
|
9b6e70ac92
|
Merge remote-tracking branch 'origin/yuecheng-project' into yuecheng-project
|
2024-06-24 14:34:45 +08:00 |
|
yuqh
|
2a3a1520f7
|
MDM公用文件
|
2024-06-24 14:34:28 +08:00 |
|
lvleigang
|
467b162b0d
|
Merge branch 'dev' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into dev
|
2024-06-24 11:57:44 +08:00 |
|
lvleigang
|
9effdca0c8
|
数据源添加dm
|
2024-06-24 11:57:31 +08:00 |
|
lvleigang
|
da1e4c2b35
|
Merge branch 'yuecheng-project' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project
|
2024-06-24 11:55:30 +08:00 |
|
lvleigang
|
5dfcb9037f
|
主数据下发，重新发送
|
2024-06-24 11:54:38 +08:00 |
|
hecan
|
c2e6863913
|
调整通用数据保存和修改接口返回格式
|
2024-06-24 10:25:53 +08:00 |
|
xiang2lin
|
88775d3efe
|
Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into dev
|
2024-06-21 18:38:57 +08:00 |
|
xiang2lin
|
4e42a1fcf5
|
cap4无流程表单导入参数
|
2024-06-21 18:38:28 +08:00 |
|
xiang2lin
|
bf947dd50d
|
Merge branch 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project
|
2024-06-21 18:34:04 +08:00 |
|
xiang2lin
|
ddaacd38fd
|
cap4无流程表单导入参数
|
2024-06-21 17:55:21 +08:00 |
|
yuqh
|
020c7645ca
|
Merge remote-tracking branch 'origin/yuecheng-project' into yuecheng-project
|
2024-06-21 17:06:17 +08:00 |
|
yuqh
|
0f8ba6400d
|
OA单据、档案 同步BIP和主数据中心
|
2024-06-21 17:06:04 +08:00 |
|
lvleigang
|
e694304837
|
Merge branches 'dev' and 'yuecheng-project' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project
Conflicts:
buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java
service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java
|
2024-06-21 17:02:07 +08:00 |
|
lvleigang
|
53000de5ae
|
主数据下发，重新发送
|
2024-06-21 17:01:11 +08:00 |
|
lvleigang
|
14d1532be3
|
主数据下发，重新发送
|
2024-06-21 16:47:04 +08:00 |
|
lvleigang
|
5840c6392b
|
Merge branch 'dev' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project
|
2024-06-21 16:46:19 +08:00 |
|
lvleigang
|
37cbcfb620
|
Merge branch 'yuecheng-project' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project
|
2024-06-21 16:45:59 +08:00 |
|
xiang2lin
|
9c0eabf938
|
Merge branch 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project
|
2024-06-21 15:03:02 +08:00 |
|
yuqh
|
6b0120eb23
|
Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project
|
2024-06-21 14:01:51 +08:00 |
|
hecan
|
6b39d8b54d
|
去掉明细得操作保存日志
|
2024-06-21 11:41:18 +08:00 |
|
hecan
|
8ab6b88fb0
|
调整通用数据查询返回格式
|
2024-06-21 11:37:24 +08:00 |
|
yuqh
|
6145dcbf3c
|
Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project
|
2024-06-21 10:27:22 +08:00 |
|
hecan
|
d4b2ff16ff
|
调整通用数据查询，查询子表
|
2024-06-21 10:26:50 +08:00 |
|
yuqh
|
0223fd56e5
|
Merge branches 'dev' and 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project
|
2024-06-21 09:31:37 +08:00 |
|
hecan
|
299ba86d60
|
调整代码，子表不新增操作日志
|
2024-06-21 09:29:09 +08:00 |
|
xiang2lin
|
08b2113519
|
查询待支付列表
|
2024-06-21 09:18:24 +08:00 |
|
xiang2lin
|
8fe85f64df
|
查询交易明细
|
2024-06-21 09:17:56 +08:00 |
|
lvleigang
|
977320833f
|
Merge branch 'dev' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project
Conflicts:
buildpackage/src/main/resources/application-llg.yml
|
2024-06-20 17:16:40 +08:00 |
|
lvleigang
|
c6d4f8ad3a
|
修改澳星url的名称，所有项目都可以使用
|
2024-06-20 17:15:15 +08:00 |
|
lvleigang
|
c811eaa0e0
|
Merge branches 'dev' and 'yuecheng-project' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project
Conflicts:
service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.java
service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.xml
|
2024-06-20 16:43:20 +08:00 |
|
lvleigang
|
353dd95a60
|
主数据修改
|
2024-06-20 16:30:37 +08:00 |
|
xiang2lin
|
f400392f14
|
cbs8
|
2024-06-20 13:51:53 +08:00 |
|
xiang2lin
|
486ba7b0a8
|
cbs8接口
|
2024-06-20 13:51:22 +08:00 |
|
lvleigang
|
2adb827e0d
|
Merge branch 'dev' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into lvleigang
|
2024-06-20 08:43:44 +08:00 |
|
lvleigang
|
4e94526a30
|
主数据修改
|
2024-06-20 08:43:33 +08:00 |
|
xiang2lin
|
b11be51018
|
增加达梦数据源
|
2024-06-19 17:55:32 +08:00 |
|
xiang2lin
|
026fcab189
|
去掉过滤条件
|
2024-06-19 17:51:28 +08:00 |
|
xiang2lin
|
ed316c2cdc
|
增加达梦数据源
|
2024-06-19 17:48:14 +08:00 |
|
xiang2lin
|
50541f7ca5
|
Merge remote-tracking branch 'origin/yuecheng-project' into yuecheng-project
|
2024-06-19 16:57:03 +08:00 |
|
xiang2lin
|
f8238f9000
|
增加ds注解
|
2024-06-19 16:56:40 +08:00 |
|
yuqh
|
c9cd5e817b
|
Merge remote-tracking branch 'origin/yuecheng-project' into yuecheng-project
|
2024-06-19 15:31:40 +08:00 |
|
yuqh
|
a664a96cfe
|
MDM公用文件
|
2024-06-19 15:31:31 +08:00 |
|
xiang2lin
|
dd47f23b8b
|
代发代扣查询响应数据
|
2024-06-19 15:29:41 +08:00 |
|
hecan
|
4fefde38eb
|
调整金额字段
|
2024-06-19 15:18:53 +08:00 |
|
hecan
|
f1fcd9658a
|
差旅费用报销单测试sql语句
|
2024-06-19 14:45:09 +08:00 |
|
xiang2lin
|
375e1619b0
|
去掉没用的引用
|
2024-06-19 14:36:58 +08:00 |
|
xiang2lin
|
442fbb602e
|
cbs8接口
|
2024-06-19 13:58:05 +08:00 |
|
lvleigang
|
772a2e86f5
|
修改返回默认值
|
2024-06-19 11:56:42 +08:00 |