Commit Graph

3017 Commits

Author SHA1 Message Date
钱涛 f74ec99644 账套支持sql范围 2024-08-15 10:37:41 +08:00
钱涛 ff00de206c 线下对比 2024-08-05 17:23:25 +08:00
Harryxzy 8d057e2706 Merge branch 'feature/240702-编辑核算时人员信息' into release/2.15.1.2407.01 2024-08-01 10:53:29 +08:00
Harryxzy 8bbf8f3ff6 核算时编辑职称bug 2024-08-01 10:52:44 +08:00
钱涛 241a85c711 默认值 2024-07-31 14:59:03 +08:00
Harryxzy bcf5fbdce7 Merge branch 'fix/240702-社保福利档案导入下载模板bug' into release/2.15.1.2407.01 2024-07-30 18:17:49 +08:00
Harryxzy 0c3610961f 修复社保福利档案 高级搜索后下载导入模板bug 2024-07-30 17:29:12 +08:00
Harryxzy 9819bb25e0 修复社保福利台账补差添加bug 2024-07-29 10:58:41 +08:00
Harryxzy ec669c1f51 核算时编辑人员组织信息 2024-07-25 17:51:38 +08:00
Harryxzy bdd27bcfc6 核算时编辑人员组织信息 2024-07-25 14:04:14 +08:00
Harryxzy 671350654a fix薪资明细报表显示列定制 2024-07-22 15:29:34 +08:00
Harryxzy 039c6fd568 薪资明细报表合计行过滤文本项 2024-07-22 10:27:46 +08:00
钱涛 909152decc 报表导出改为从内存获取 2024-07-16 16:57:58 +08:00
Harryxzy 6f7ae2506d 阅后即焚oracle数据库修复 2024-07-16 14:56:11 +08:00
Harryxzy 78cdadbb99 工资单详情 - 显示列定制 2024-07-16 11:30:25 +08:00
Harryxzy 95ba4aee36 Merge branch 'fix/240701_返聘action优化' into release/2.15.1.2407.01 2024-07-15 14:48:21 +08:00
Harryxzy 5331494ebc Merge branch 'fix/240701_报表分页' into release/2.15.1.2407.01 2024-07-15 14:48:08 +08:00
Harryxzy e579bbc4f2 人员维度分页 2024-07-15 11:20:24 +08:00
钱涛 b91818f2dc 版本 2024-07-15 09:36:40 +08:00
钱涛 50e3be607d 修复oracle bug 2024-07-11 16:30:00 +08:00
Harryxzy a259a52044 人员维度分页 2024-07-11 11:28:54 +08:00
Harryxzy a6f02082d8 fix社保福利台账非系统人员日志空指针 2024-07-10 15:01:49 +08:00
Harryxzy 84ce2821f6 1、定薪、返聘action优化
2、修复导出时excel中双击单元格变成黑色
2024-07-10 14:01:09 +08:00
钱涛 7ef229dfde 修复社保调差bug 2024-07-10 10:43:11 +08:00
Harryxzy 95b9f5452a 薪资档案导出fix多选义务人bug 2024-07-08 10:20:21 +08:00
Harryxzy 3a7c1c2d29 修复sql隐藏bug 2024-07-03 18:00:29 +08:00
Harryxzy db93c2b8a8 修复报表分享记录分页总计数bug 2024-06-28 17:22:34 +08:00
钱涛 458f10d09b 优化考勤引用 2024-06-28 15:42:10 +08:00
钱涛 edddf5f557 处理8位小数问题 2024-06-28 14:42:23 +08:00
钱涛 9c7c6de614 核算信息快照 2024-06-27 16:10:30 +08:00
钱涛 ea07fe1a59 处理sqlserver 2100 个参数 2024-06-27 10:38:30 +08:00
Harryxzy b26663889d Merge branch 'fix/240603_薪资明细导出排序' into release/2.14.5.2406.03 2024-06-26 11:33:32 +08:00
Harryxzy 933fc8ae65 报表分享支持次账号 2024-06-26 11:33:12 +08:00
Harryxzy c1c8bae9da Merge branch 'fix/240603_薪资明细导出排序' into release/2.14.5.2406.03 2024-06-26 10:37:51 +08:00
Harryxzy 63c7477966 1、薪资明细导出根据显示列定制导出
2、薪资档案 高级搜索支持个税扣缴义务人多选
2024-06-26 10:35:05 +08:00
钱涛 993f21b448 Merge branch 'feature/人员信息快照' into release/2.14.5.2406.03
# Conflicts:
#	src/com/engine/salary/service/impl/SalarySendServiceImpl.java
2024-06-21 14:17:36 +08:00
钱涛 6d3af9d4ed wiki 2024-06-21 14:14:57 +08:00
钱涛 28536476d3 版本 2024-06-21 09:16:44 +08:00
钱涛 a90e32fbf4 map映射 2024-06-20 17:08:01 +08:00
Harryxzy 071130adb3 Merge remote-tracking branch 'origin/release/2.14.4.2406.02' into release/2.14.4.2406.02 2024-06-20 16:40:42 +08:00
Harryxzy b5f8e88a58 Merge branch 'feature/240502_薪资项目增加默认值设置' into release/2.14.4.2406.02 2024-06-20 16:40:07 +08:00
Harryxzy 537992187e update 设置了多个default_value 2024-06-20 16:39:48 +08:00
钱涛 2be7ec31de 修改工资单预览 2024-06-20 16:39:35 +08:00
Harryxzy 560fabe075 账套人员范围导入增加了一列,导致导入校验没通过 2024-06-20 16:28:48 +08:00
钱涛 8d65e5d501 版本记录 2024-06-20 14:48:35 +08:00
钱涛 e5d66373e6 默认值需要导致异动 2024-06-20 14:47:19 +08:00
Harryxzy 3f9bb23e80 Merge branch 'feature/240502_薪资项目增加默认值设置' into release/2.14.4.2406.02 2024-06-20 11:44:15 +08:00
Harryxzy e13c2b0cd0 薪资项目同步默认值 2024-06-20 11:43:57 +08:00
钱涛 fa26d3041a 默认算税sql 2024-06-20 11:08:52 +08:00
Harryxzy 4fbd7d7418 Merge branch 'feature/240502_薪资项目增加默认值设置' into release/2.14.4.2406.02 2024-06-20 10:44:41 +08:00