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 |
|
钱涛
|
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 |
|
钱涛
|
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 |
|
Harryxzy
|
4fbd7d7418
|
Merge branch 'feature/240502_薪资项目增加默认值设置' into release/2.14.4.2406.02
|
2024-06-20 10:44:41 +08:00 |
|
Harryxzy
|
5459729da2
|
Merge branch 'feature/240301-导出excel单元格格式' into release/2.14.4.2406.02
# Conflicts:
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
|
2024-06-20 10:44:12 +08:00 |
|
钱涛
|
0961071980
|
Merge remote-tracking branch 'origin/feature/240502_薪资项目增加默认值设置' into feature/240502_薪资项目增加默认值设置
# Conflicts:
# src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml
|
2024-06-19 11:23:43 +08:00 |
|
钱涛
|
fe8dcd0ccd
|
核算默认值
|
2024-06-19 11:21:00 +08:00 |
|
钱涛
|
f0fce26e8a
|
Merge branch 'release/2.14.4.2406.02' into feature/240502_薪资项目增加默认值设置
# Conflicts:
# src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml
# src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
|
2024-06-19 11:14:31 +08:00 |
|
钱涛
|
81c768b7b9
|
人员信息快照
|
2024-06-18 15:28:31 +08:00 |
|
钱涛
|
0c0c754a9d
|
人员信息快照
|
2024-06-18 11:01:58 +08:00 |
|
Harryxzy
|
216c4cee84
|
默认值temp
|
2024-06-17 17:58:01 +08:00 |
|
钱涛
|
5b7533e908
|
同步假期余额字段
|
2024-06-14 13:46:59 +08:00 |
|
钱涛
|
5c13f80034
|
Merge remote-tracking branch 'origin/release/2.14.4.2406.02' into release/2.14.4.2406.02
|
2024-06-13 17:46:55 +08:00 |
|
钱涛
|
64e34d6d08
|
工资单预览
|
2024-06-13 17:46:37 +08:00 |
|
Harryxzy
|
a27716ae72
|
Merge remote-tracking branch 'origin/release/2.14.4.2406.02' into release/2.14.4.2406.02
|
2024-06-13 14:14:38 +08:00 |
|
Harryxzy
|
6513c2b6e6
|
Merge branch 'fix/240601-补差导入模板bug' into release/2.14.4.2406.02
|
2024-06-13 14:14:21 +08:00 |
|
Harryxzy
|
1dd3439ce3
|
社保福利台账小数位优化
|
2024-06-13 13:59:43 +08:00 |
|
钱涛
|
db391f01c4
|
处理大数据内存溢出
|
2024-06-13 13:39:24 +08:00 |
|
钱涛
|
4798f5d4a6
|
处理大数据内存溢出
|
2024-06-12 17:35:06 +08:00 |
|
Harryxzy
|
e249de9a59
|
报表导出单元格格式
|
2024-06-12 16:01:09 +08:00 |
|
钱涛
|
1983ba968c
|
去除日志
系统薪资项目配置不需要重启
|
2024-06-12 15:35:40 +08:00 |
|
钱涛
|
7e988193c6
|
公式扩展获取月有多少天
|
2024-06-12 14:31:50 +08:00 |
|
钱涛
|
853482141f
|
小数位支持10位
|
2024-06-12 10:45:32 +08:00 |
|
钱涛
|
f073f6d90c
|
处理刷新非正常人员问题
|
2024-06-11 15:48:07 +08:00 |
|
钱涛
|
a1e7ec160c
|
处理复制异常
|
2024-06-11 10:10:45 +08:00 |
|
钱涛
|
789b77ba0b
|
档案导入模板注释
|
2024-06-06 14:54:58 +08:00 |
|
Harryxzy
|
91444e9495
|
修复薪资核算高级搜索ISNOTEMPTY 中文显示
|
2024-06-05 16:54:53 +08:00 |
|
Harryxzy
|
16f5ffcf29
|
优化 - 社保福利台账小数位数
|
2024-06-05 15:30:57 +08:00 |
|
Harryxzy
|
91b8809c03
|
修复薪资核算搜索，合并计税bug
|
2024-06-05 13:43:49 +08:00 |
|
Harryxzy
|
b6331b952c
|
修复
1、社保福利台账补差下载导入模板，显示的是补差数据；
2、报表分享不设置起始日期时oracle数据库兼容问题；
|
2024-06-05 11:02:59 +08:00 |
|
钱涛
|
abba78ead3
|
处理隐藏bug
|
2024-05-31 11:36:56 +08:00 |
|
钱涛
|
c86b53fd27
|
Merge branch 'feature/锁定人员' into release/2.14.3.2406.01
|
2024-05-30 17:06:57 +08:00 |
|
钱涛
|
9aa2a03425
|
Merge branch 'release/2.14.2.2405.02' into release/2.14.3.2406.01
|
2024-05-30 14:41:45 +08:00 |