hzya
/
kangarooDataCenterV3
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
507 Commits 41 Branches 0 Tags 34 MiB
Commit Graph

334 Commits

Author SHA1 Message Date
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
xiang2lin 004250f55d Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-19 11:33:29 +08:00
476474485@qq.com 2b624f5813 調整Base64.getEncoder().encodeToString(encryptedData) 2024-06-19 11:31:30 +08:00
lvleigang b595bba61b 主数据下发，重新发送 2024-06-19 10:17:03 +08:00
lvleigang 0ba8aebf25 主数据下发，重新发送 2024-06-19 10:16:47 +08:00
xiang2lin 86a977160d Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 
# Conflicts:
#	buildpackage/src/test/java/com/hzya/frame/temButtom.java
#	pom.xml
#	service/src/main/java/com/hzya/frame/report/reportManage/service/impl/ReportManageServiceImpl.java
#	webapp/src/main/java/com/hzya/frame/webapp/entrance/controler/EntranceController.java
 2024-06-19 10:15:33 +08:00
xiang2lin 5b19809ef0 cbs8 接口相关 2024-06-19 10:07:12 +08:00
xiang2lin 2f6f7e1755 cbs8接口 2024-06-19 10:06:03 +08:00
xiang2lin 351ed98ab4 cbs8接口 2024-06-19 10:05:15 +08:00
476474485@qq.com f645cb96db 增加byte数组参数 2024-06-19 10:03:46 +08:00
476474485@qq.com 7fa07577f0 增加转发接口支持byteBodys 2024-06-19 09:54:19 +08:00
476474485@qq.com b11706fb4e Merge branch 'dev' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into guojh 2024-06-19 09:02:12 +08:00
xiang2lin bc2290c9a0 seeyon 2024-06-18 18:02:13 +08:00
lvleigang 2d4b3af64c 主数据下发，重新发送 2024-06-18 17:17:11 +08:00
lvleigang 70a7fe3ff2 Merge branch 'dev' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into lvleigang 
 Conflicts:
	service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiEntity.java
 2024-06-18 16:31:02 +08:00
lvleigang db50cf0c1a 主数据下发，重新发送 2024-06-18 16:29:47 +08:00
xiang2lin a60e6675b6 Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-18 11:17:01 +08:00
476474485@qq.com 37d45b8ab0 添加脚本语言groovydemo 2024-06-18 11:08:43 +08:00
xiang2lin 3fffae8d3c 增加 apiUrl字段 2024-06-18 11:00:52 +08:00
xiang2lin e0efefc522 entity_get方法增加interfaceAddress字段 2024-06-18 10:21:52 +08:00
xiang2lin 6af94ef32c cbs8接口 2024-06-18 09:17:34 +08:00
476474485@qq.com 80d870073f Merge branch 'dev' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into guojh 
 Conflicts:
	service/src/main/java/com/hzya/frame/mdm/entity/MdmDto.java
	service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/IMdmModuleDao.java
	service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/impl/MdmModuleDaoImpl.java
	service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml
	service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/dao/IMdmModuleDbDao.java
	service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/dao/impl/MdmModuleDbDaoImpl.java
	service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/entity/MdmModuleDbEntity.xml
	service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.java
	service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/entity/MdmModuleDistributeEntity.java
	service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.java
	service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.xml
	service/src/main/java/com/hzya/frame/mdm/service/IMdmService.java
	service/src/main/java/com/hzya/frame/mdm/service/IMdmServiceCache.java
	service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceCache.java
	service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java
 2024-06-18 08:59:05 +08:00
yuqh 71c69c4c9c Merge branches 'dev' and 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-17 14:17:18 +08:00
xiang2lin 6e380bb0d5 cbs8 相关 2024-06-17 13:54:31 +08:00
xiang2lin 673885c091 cbs8 sm2工具类、支付状态枚举类 2024-06-17 13:54:06 +08:00
xiang2lin 1b2c85402d 请求参数实体类 2024-06-17 13:52:55 +08:00
xiang2lin c767923d87 cbs8 工具类 2024-06-17 13:45:49 +08:00
xiang2lin 1f353a3405 cbs8 token工具类 2024-06-17 13:45:37 +08:00
xiang2lin 6c48ee967b oa集成cbs 2024-06-17 13:41:57 +08:00
lvleigang e753410b89 主数据修改,应用添加脚本类 2024-06-17 11:49:50 +08:00
yuqh 5b8c6087f2 Merge branches 'dev' and 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-17 11:24:45 +08:00
lvleigang ff5676689f Merge branch 'dev' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into lvleigang 2024-06-17 10:31:26 +08:00
lvleigang 4f30c7f8fb 主数据修改,数据源切换 2024-06-17 10:31:13 +08:00
xiang2lin 55f9afdf48 oa对接cbs 2024-06-14 16:49:04 +08:00
xiang2lin ae9eca4c92 去掉没用的引用 2024-06-14 14:03:57 +08:00
xiang2lin 3d74d52f11 bcprov包升级到1.7 2024-06-14 09:46:22 +08:00