qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,996 Commits 293 Branches 39 Tags 49 MiB
Commit Graph

2996 Commits

Author SHA1 Message Date
Harryxzy 0acd0187a9 Merge branch 'release/2.14.4.2406.02' into custom/宁波精华 
# Conflicts:
#	src/com/engine/salary/service/impl/SalarySendServiceImpl.java
 2024-06-21 16:36:59 +08:00
Harryxzy 179112709f 宁波精华temp 2024-06-21 16:31:57 +08:00
钱涛 a90e32fbf4 map映射 2024-06-20 17:08:01 +08:00
Harryxzy b58a31fdd0 sum接口调整 2024-06-20 16:59:26 +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
Harryxzy caf5f5161e 宁波精华fix 2024-06-20 16:22:34 +08:00
Harryxzy fbc3ab008a Merge branch 'release/2.14.4.2406.02' into custom/宁波精华 2024-06-20 15:22:09 +08:00
Harryxzy e0060227c8 宁波精华报表1、2、3、4 2024-06-20 15:21: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
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
Harryxzy 7e7ff97e7a Merge remote-tracking branch 'origin/feature/人员信息快照' into custom/宁波精华 
# Conflicts:
#	resource/WEB-INF/prop/hrmSalary.properties
 2024-06-18 17:41:51 +08:00
钱涛 81c768b7b9 人员信息快照 2024-06-18 15:28:31 +08:00
Harryxzy a65098bfa1 宁波精华薪酬二开 2024-06-18 15:26:24 +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
钱涛 7a67253407 版本 2024-06-06 15:35:12 +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
钱涛 e4af4b8918 Merge branch 'release/2.14.2.2405.02' into release/2.14.3.2406.01 2024-06-03 09:33:02 +08:00
钱涛 6b164ece2a 处理隐藏bug 2024-05-31 11:39:08 +08:00
钱涛 abba78ead3 处理隐藏bug 2024-05-31 11:36:56 +08:00