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

420 Commits

Author SHA1 Message Date
xiang2lin 66ad9e41d2 Merge branch 'dev' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into dev 
# Conflicts:
#	service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/IOerDjmlService.java
#	service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/impl/OerDjmlServiceImpl.java
 2024-08-15 10:56:48 +08:00
xiang2lin 9dabf05268 保存前组装参数方法 
2024年8月15日 10:53:59
 2024-08-15 10:54:09 +08:00
lvleigang e02a6114ed Merge branch 'dev' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into dev 
 Conflicts:
	service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjmlEntity.java
 2024-08-15 10:20:20 +08:00
lvleigang 6eb4dd9908 报销接口编写，esb转发修改校验规则 2024-08-15 10:18:00 +08:00
xiang2lin dce400eb37 增加差旅费字段 
2024年8月15日 08:40:57
 2024-08-15 08:41:04 +08:00
xiang2lin cdacfbc9bf 增加差旅报销单用到的字段 
2024年8月15日 08:39:04
 2024-08-15 08:39:09 +08:00
xiang2lin 51fb2476e7 流程事件类型枚举 
2024年8月14日 16:26:44
 2024-08-14 16:26:48 +08:00
hecan 3b7571a3b1 去掉sqlsession注解 2024-08-14 11:03:47 +08:00
hecan 2058ea3d2c 新增时候先查询，不存在则新增，存在则更新 2024-08-13 17:38:53 +08:00
hecan 1f5dcbd24d 修改指标占用xml 2024-08-13 16:57:49 +08:00
hecan 7f0d7280d5 指标占用 2024-08-13 16:53:31 +08:00
hecan 97752629d2 Merge remote-tracking branch 'origin/dev' into dev 2024-08-13 16:36:24 +08:00
hecan a92d144e45 GRPU8 2024-08-13 16:35:48 +08:00
xiang2lin fbae83138d 增加appCode字段 
2024年8月12日 11:22:11
 2024-08-12 11:22:17 +08:00
xiang2lin d5e4699ea4 增加模糊查询方法，api联查应用 
/2024年8月12日 11:15:33
 2024-08-12 11:15:40 +08:00
lvleigang 92916e872c GrpU8查询接口修改 2024-08-09 16:46:34 +08:00
lvleigang a1b46b6dd5 澳星修改 2024-08-09 13:37:29 +08:00
lvleigang 9e619c8425 修改主数据显示 2024-08-09 10:28:20 +08:00
lvleigang f5a9fe7077 GrpU8查询 2024-08-08 17:53:03 +08:00
username 86193cadba 日志按創建時間排序 2024-08-08 11:59:25 +08:00
hecan 3b897cf172 新增接口中根据data_id判断数据是否已经保存过 2024-08-08 10:17:49 +08:00
lvleigang 9d2875e3ba 主数据下发修改返回提示 2024-08-07 09:13:09 +08:00
lvleigang c5a55a82ca 调整主数据树形结构上级关联，引用表只保存上级i 2024-08-02 09:31:17 +08:00
lvleigang 4129d738df 调整主数据树形结构上级关联，引用表只保存上级i 2024-08-01 08:50:26 +08:00
lvleigang 279dff107d 宁波银行文件下载接口修改，日志查询分表 2024-07-31 14:42:09 +08:00
lvleigang fe31fc6999 Merge branch 'dev' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into dev 2024-07-30 10:27:29 +08:00
lvleigang 7aed1aca10 宁波银行文件下载接口修改，日志查询分表 2024-07-30 10:27:16 +08:00
hecan bf511fcada 调整返回格式 2024-07-30 10:09:27 +08:00
hecan e1277beb60 调整返回格式 2024-07-29 16:16:18 +08:00
hecan cf845501c0 调整通用接口返回格式，避免两层 2024-07-29 15:53:18 +08:00
lvleigang 63b0a26a65 数据源链接拼接修改 2024-07-26 10:00:38 +08:00
lvleigang 9b3c01c86d 主数据按钮排序调整，保存到菜单按钮排序修改 2024-07-25 09:40:05 +08:00
lvleigang 9035801444 主数据修改 2024-07-24 11:06:16 +08:00
lvleigang 256e616fe5 主数据通用接口修改兼容mysql 2024-07-19 11:49:25 +08:00
lvleigang 9faaafafa9 修改文件上传 2024-07-18 16:19:32 +08:00
lvleigang 510b1ec036 主数据下发修改业务调整 2024-07-18 15:02:30 +08:00
lvleigang 01ca0a5c19 主数据下发修改业务调整 2024-07-17 14:22:29 +08:00
lvleigang a2f046ae90 主数据下发修改业务调整 2024-07-15 14:36:12 +08:00
lvleigang 1dc6df02f6 主数据调整xml保存为空的情况 2024-07-12 16:26:04 +08:00
lvleigang 0d8c43fb46 修改表字段回滚失败，调整语句先后顺序，金额类型默认8位小数 2024-07-11 11:48:39 +08:00
lvleigang c96e1f2f70 保存日志自动添加排序 2024-07-11 10:43:47 +08:00
lvleigang 4912b61ae4 修改宁波银行自定义接口的返回格式 2024-07-11 09:12:14 +08:00
lvleigang d1825d3543 堃博生物OA对接宁波银行 2024-07-10 14:03:09 +08:00
lvleigang be5923d8ea 修复war打不出来本地jar的问题 2024-07-08 15:43:36 +08:00
lvleigang c84d5017aa 修改主数据 2024-07-04 13:56:09 +08:00
lvleigang 195846ba99 修改主数据 2024-07-04 13:44:32 +08:00
lvleigang 99c9bc958a 主数据按钮，保存到菜单表 2024-07-01 11:24:39 +08:00
lvleigang e3cb9592e7 Merge branches 'dev' and 'yuecheng-project' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project 2024-07-01 10:23:02 +08:00
lvleigang 28ecb9eb1c 主数据按钮，保存到菜单表 2024-06-29 15:13:59 +08:00
lvleigang c2b8961854 修改适配达梦 2024-06-29 11:39:52 +08:00
lvleigang bb9bd024f4 修改脚本 2024-06-29 11:28:30 +08:00
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