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

273 Commits

Author SHA1 Message Date
yuqh d808021db1 基础数据初始化SQL 2024-08-19 10:58:13 +08:00
lvleigang 6eb4dd9908 报销接口编写，esb转发修改校验规则 2024-08-15 10:18:00 +08:00
xiang2lin 902d6933c3 测试类 
2024年8月14日 13:32:44
 2024-08-14 13:32:49 +08:00
xiang2lin eeeae913da 附件处理 
2024年8月14日 13:31:45
 2024-08-14 13:31:50 +08:00
lvleigang b5f679d45c 237服务器配置转发地址 2024-08-08 10:51:49 +08:00
yuqh f238847fc4 Merge remote-tracking branch 'origin/dongj' into dongj 2024-08-08 09:55:54 +08:00
yuqh 59840afc97 1 2024-08-08 09:55:40 +08:00
xiang2lin 45576106c7 Merge branch 'dongj' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into dongj 2024-08-07 09:47:11 +08:00
xiang2lin 0cf730bb43 增加附件上传接口 
2024年8月7日 09:45:52
 2024-08-07 09:46:05 +08:00
lvleigang ee1195cbfa 主数据自动下发，查询三方主键 2024-08-05 15:50:11 +08:00
lvleigang 37815377e7 Merge branch 'dongj' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into dongj 2024-08-05 15:45:17 +08:00
lvleigang c5664ad86b 东进OA审批结果回传U8C 2024-08-05 15:45:09 +08:00
xiang2lin ae561ea8b8 T/T汇款配置文件 
2024年8月5日 09:25:50
 2024-08-05 09:25:54 +08:00
xiang2lin e200fd768d Merge branch 'dongj' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into dongj 2024-08-05 09:23:11 +08:00
xiang2lin 6d3ce7042f T/T汇款 
2024年8月5日 09:18:23
 2024-08-05 09:18:33 +08:00
lvleigang e6f9c5824e 主数据修改 2024-08-02 15:57:52 +08:00
lvleigang ca14226903 oa销售开票审核状态同步u8c 2024-08-02 10:34:00 +08:00
lvleigang a555abda9c Merge branches 'dev' and 'dongj' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into dongj 
 Conflicts:
	buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java
 2024-08-02 10:05:59 +08:00
yuqh 08567f88f7 1 2024-08-02 08:56:27 +08:00
lvleigang 99897ddbb2 调整主数据树形结构上级关联，引用表只保存上级i 2024-08-01 08:51:10 +08:00
lvleigang 4129d738df 调整主数据树形结构上级关联，引用表只保存上级i 2024-08-01 08:50:26 +08:00
xiang2lin f8fb7c91c3 Merge remote-tracking branch 'origin/dongj' into dongj 2024-07-30 17:34:17 +08:00
xiang2lin 2301365d08 宁波银行接口 
2024年7月30日 17:33:52
 2024-07-30 17:33:59 +08:00
xiang2lin 1eac206f28 宁波银行接口 
2024年7月30日 09:17:43
 2024-07-30 09:18:28 +08:00
username 29a0b03f14 同步生成收款单接口 2024-07-29 17:48:06 +08:00
username 9090ca3dfa 配置文件 2024-07-29 17:23:09 +08:00
xiang2lin 1221059d06 本地配置 2024-07-26 16:43:29 +08:00
xiang2lin 765f35b3e6 测试类 2024-07-26 16:43:00 +08:00
xiang2lin 11d418a5b3 收款记录保存 
2024年7月26日 15:16:33
 2024-07-26 15:16:39 +08:00
xiang2lin e5c27bd860 东进配置 
只push了dongj这个分支
2024年7月26日 14:14:06
 2024-07-26 14:14:32 +08:00
xiang2lin 2b544b4e32 Merge branch 'dev' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into dongj 2024-07-25 15:49:25 +08:00
xiang2lin af5a85b748 环境修改 
2024年7月25日 10:04:08
 2024-07-25 10:04:11 +08:00
lvleigang 9faaafafa9 修改文件上传 2024-07-18 16:19:32 +08:00
lvleigang 62a23e7d77 主数据下发修改业务调整 2024-07-18 15:28:14 +08:00
lvleigang 510b1ec036 主数据下发修改业务调整 2024-07-18 15:02:30 +08:00
lvleigang 01ca0a5c19 主数据下发修改业务调整 2024-07-17 14:22:29 +08:00
lvleigang f0583e8967 主数据调整xml保存为空的情况 2024-07-12 16:43:43 +08:00
lvleigang 2ad4ff5be5 系统添加不加在数据库操作 2024-07-09 15:30:27 +08:00
lvleigang 39b999dc6a 修改主数据 2024-07-04 15:47:12 +08:00
lvleigang c84d5017aa 修改主数据 2024-07-04 13:56:09 +08:00
lvleigang 195846ba99 修改主数据 2024-07-04 13:44:32 +08:00
lvleigang fde35bf879 主数据按钮，保存到菜单表 2024-07-01 11:24:28 +08:00
lvleigang 319bd2ba7a 修改保存数据到任务日志 2024-06-28 15:09:32 +08:00
lvleigang c333f3f84f 修改适配达梦 2024-06-28 14:00:52 +08:00
yuqh 197c7620c5 MDM公用文件 2024-06-28 09:10:29 +08:00
476474485@qq.com 1b2fe8d78a 修改MDM方法，根据表名称获取字段，转换小写后传递数据 2024-06-27 17:07:38 +08:00
xiang2lin 3b772bf43b cbs支付 代发 2024-06-26 17:02:32 +08:00
xiang2lin 466a89e1c4 电子回单临时文件 2024-06-26 15:44:58 +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
476474485@qq.com 671ec5475e 增加tlog配置 
https://tlog.yomahub.com/pages/5b7bd2/
 2024-06-26 09:11:01 +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 ef065c3f8c MDM公用文件 2024-06-25 14:08:07 +08:00
xiang2lin 1039fa7295 cbs 2024-06-24 18:52:24 +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
xiang2lin 4d6c7f5d03 Merge branch 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-24 16:01:05 +08:00
yuqh aedf496c2a MDM公用文件 2024-06-24 16:00:45 +08:00
xiang2lin dce61d024b Merge branch 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-24 15:42:47 +08:00
lvleigang 9c6996e0ca 数据源添加dm 2024-06-24 13:37:49 +08:00
yuqh 7b8ce8e35a MDM公用文件 2024-06-24 10:30:59 +08:00
yuqh 7b40d8c0dc MDM公用文件 2024-06-24 10:30:23 +08:00
xiang2lin 55161cad35 查询交易明细 2024-06-21 18:36:55 +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 e1adda59ae 客户档案插件以及明细插件 2024-06-21 13:59:12 +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
xiang2lin a4758ac2a4 cbs测试 2024-06-21 09:18:56 +08:00
xiang2lin 6b19e593f6 查询交易明细 2024-06-21 09:15:46 +08:00
xiang2lin 3cc0acb065 查询交易明细 2024-06-21 09:15:29 +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 8e042a925a 主数据修改 2024-06-20 17:12:16 +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 70e3bdd4a6 插件测试 2024-06-20 14:38:38 +08:00
xiang2lin e699ffa37f 测试 2024-06-20 14:00:40 +08:00
xiang2lin 6a2691ff69 cbs8交易日志查询 2024-06-20 14:00:23 +08:00
xiang2lin 48186afb82 测试方法 2024-06-20 13:56:18 +08:00
xiang2lin 907a5f057f cbs8 插件 2024-06-20 13:51:04 +08:00
xiang2lin 89e2f4326c cbs8 插件 2024-06-20 09:07:18 +08:00
lvleigang 4e94526a30 主数据修改 2024-06-20 08:43:33 +08:00
xiang2lin 20091505d8 测试类 2024-06-19 17:52:32 +08:00
xiang2lin d2a97cd7ad 测试类 2024-06-19 17:02:09 +08:00
xiang2lin 0ca5c75a1a cbs8 插件 2024-06-19 17:01:54 +08:00
xiang2lin 642986b94a cbs8 插件 2024-06-19 16:56:21 +08:00
xiang2lin e4d0f19e02 cbs8插件 2024-06-19 13:47:44 +08:00
lvleigang 772a2e86f5 修改返回默认值 2024-06-19 11:56:42 +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 e64978e5e9 cbs8插件 2024-06-19 10:06:53 +08:00
lvleigang 2d4b3af64c 主数据下发，重新发送 2024-06-18 17:17:11 +08:00
lvleigang db50cf0c1a 主数据下发，重新发送 2024-06-18 16:29:47 +08:00
xiang2lin fccd328111 测试cbs接口 2024-06-18 10:35:55 +08:00
xiang2lin f0b53a019f cbs8 2024-06-18 10:35:30 +08:00
xiang2lin 82a4353949 Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-18 10:17:22 +08:00
xiang2lin 54eb505bda 增加oa数据源编码配置 2024-06-18 09:43:43 +08:00
xiang2lin 444e034511 增加电子回单、交易明细查询配置 2024-06-18 09:17:01 +08:00
xiang2lin 29c560bcfe cbs8 2024-06-18 09:16:47 +08:00
xiang2lin 347eb4e89f 交易明细查询接口 2024-06-18 09:15:50 +08:00
xiang2lin df4f4f584b 电子回单 2024-06-18 09:15:01 +08:00
xiang2lin 74e0f8ae38 增加cbs8电子回单下载临时存放文件夹配置 2024-06-17 15:11:32 +08:00
hecan cbf2fff967 用户档案插件 2024-06-17 15:00:04 +08:00
hecan 92ff85498d 用户档案插件配置 2024-06-17 14:59:51 +08:00
yuqh 72b827fa11 越城公用配置文件 2024-06-17 14:24:03 +08:00
yuqh 4d26dfa435 Merge branch 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 
 Conflicts:
	buildpackage/src/main/resources/application-yc.yml
 2024-06-17 14:23:25 +08:00
xiang2lin 4b2a51cb04 越城区配置 2024-06-17 14:21:57 +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
hecan 315dc6582a 增加组织和项目插件配置 2024-06-17 14:16:14 +08:00
xiang2lin c89370ac0c cbs8接口 2024-06-17 13:40:41 +08:00
xiang2lin 5723dc440d cbs8插件spring配置文件 2024-06-17 13:40:11 +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
xiang2lin 5017517684 cbs密钥 2024-06-14 11:22:13 +08:00
hecan cfbda9907c 调整包路径 2024-06-13 10:08:56 +08:00
yuqh 6032e90e25 Merge branch 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 
 Conflicts:
	service/src/main/java/com/hzya/frame/sysnew/login/impl/LoginServiceImpl.java
 2024-06-11 10:49:28 +08:00
yuqh 564b7b6138 BIP单据与获取token公用方法编写 2024-06-11 10:10:37 +08:00
lvleigang 08994cefb1 Merge branches 'dev' and 'yuecheng-project' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project 2024-06-11 10:05:33 +08:00
lvleigang 22b32ce6dc Merge branches 'dev' and 'yuecheng-project' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project 2024-06-11 09:56:48 +08:00
hecan 64f8a58ff8 项目档案和组织档案插件 2024-06-11 09:56:18 +08:00
xiang2lin c7c6ab1c4e 越城区配置 2024-06-07 16:12:01 +08:00
xiang2lin fa1e399968 越城区配置 2024-06-07 16:11:17 +08:00
xiang2lin ab2d1b9fc4 越城区配置 2024-06-07 16:08:03 +08:00
hecan e94581d805 Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into hecan 
# Conflicts:
#	service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java
 2024-06-05 11:49:25 +08:00
lvleigang 03e4172120 修改适配达梦数据源 2024-05-31 16:48:13 +08:00
lvleigang 303e4f1340 修改适配达梦数据源 2024-05-31 16:45:13 +08:00
lvleigang 22e1047fd9 修改主数据生成类 2024-05-31 15:26:15 +08:00
lvleigang 478211ad96 修改主数据生成类 2024-05-31 09:12:40 +08:00
hecan d6f4e5febb 调整数据库连接地址 2024-05-29 17:20:12 +08:00
yuqh 77ea42d08e BIP单据与获取token公用方法编写 2024-05-29 10:17:40 +08:00
yuqh 314316824c BIP单据与获取token公用方法编写 2024-05-29 10:17:28 +08:00
lvleigang f9f5f5e23f 数据源表添加数据源状态字段，删除统一接口权限认证 2024-05-27 14:21:42 +08:00
lvleigang 09fea1c14c 数据源表添加数据源状态字段，删除统一接口权限认证 2024-05-27 14:11:25 +08:00
hecan 36284043bf 调整数据库地址 2024-05-27 10:46:36 +08:00
lvleigang 8d9c6e3f73 数据库版本研究配置 2024-05-23 16:09:49 +08:00
lvleigang bde253bf45 数据库版本研究配置 2024-05-23 15:33:25 +08:00
xiang2lin 4f76511392 取数修改，不从jsonStr里取 2024-05-17 09:57:58 +08:00
xiang2lin cbe3294e02 修改注释 2024-05-16 16:02:21 +08:00
xiang2lin d33cff5e43 seeyonExt重试插件 2024-05-16 14:13:56 +08:00
xiang2lin 10f26f27fa 增加ax.url配置 2024-05-15 14:58:47 +08:00
yuqh 22defdd0a2 Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuqh 
 Conflicts:
	buildpackage/pom.xml
	service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/dao/IIntegrationTaskLivingDetailsDao.java
	service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/dao/impl/IntegrationTaskLivingDetailsDaoImpl.java
	service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/entity/IntegrationTaskLogEntity.xml
	service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/service/IIntegrationTaskLogService.java
	service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/service/impl/IntegrationTaskLogServiceImpl.java
 2024-05-15 14:17:09 +08:00
yuqh fe4aea7112 代码生成 2024-05-15 14:15:26 +08:00
476474485@qq.com fd094d7374 新增积木报表包扫描 2024-05-15 13:40:18 +08:00
476474485@qq.com f148832b67 增加积木报表配置 2024-05-15 11:55:08 +08:00