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

1222 Commits

Author SHA1 Message Date
Harryxzy 5dc2dadd46 工资单自动确认 2023-07-11 17:28:15 +08:00
Harryxzy 33a0723ad2 Merge branch 'release/2.9.1.2307.01' into feature/230701-工资单反馈 2023-07-11 15:29:21 +08:00
Harryxzy be895829c2 工资单反馈 2023-07-11 15:29:13 +08:00
Harryxzy 5918de016e Merge branch 'feature/salalryItemAndFieldSort' into release/2.9.1.2307.01 
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryItemServiceImpl.java
 2023-07-11 13:24:37 +08:00
Harryxzy fa950fb4dd 薪资项目排序比较 2023-07-11 13:23:07 +08:00
钱涛 f53c904fde Merge branch 'fix/230701修复项目添加时名称校验问题' into release/2.9.1.2307.01 2023-07-11 11:08:39 +08:00
钱涛 bb6cf386cb 修复 2023-07-11 11:05:35 +08:00
Harryxzy 7a72ef28d1 Merge remote-tracking branch 'origin/release/2.9.1.2307.01' into release/2.9.1.2307.01 2023-07-11 10:14:46 +08:00
Harryxzy 7d9ad3d79e 不允许删除薪资档案校验 2023-07-11 10:14:28 +08:00
sy a55ca5182e Merge remote-tracking branch 'remotes/origin/fix/salaryExportBug-0706' into release/2.9.1.2307.01 2023-07-11 09:59:29 +08:00
sy b705161492 薪酬系统-薪资核算、薪资档案、福利档案，高级搜索功能问题修复 2023-07-10 14:33:43 +08:00
Harryxzy b7c58ecc11 Merge branch 'fix/累计专项附加扣除防抖动' into release/2.9.1.2307.01 2023-07-10 10:10:58 +08:00
Harryxzy 938f03946b Merge branch 'feature/230701-系统薪资项目可配置删除' into release/2.9.1.2307.01 2023-07-10 10:09:52 +08:00
Harryxzy 9b7ba19d64 Merge branch 'feature/230701-工资单定时发送' into release/2.9.1.2307.01 2023-07-10 10:09:45 +08:00
Harryxzy e90bd66489 Merge branch 'feature/230701-删除档案' into release/2.9.1.2307.01 2023-07-10 10:09:38 +08:00
Harryxzy 508e324dac 工资单定时发送 添加 发放周期 2023-07-05 10:36:02 +08:00
Harryxzy 896e0c9e34 工资单定时发送 添加 发放周期 2023-07-05 09:59:45 +08:00
Harryxzy c78839d8c0 工资单定时发送 添加 发放周期 2023-07-04 18:03:57 +08:00
钱涛 91859e5127 Merge branch 'feature/230701非系统算税' into release/2.9.1.2307.01 2023-07-04 15:38:55 +08:00
sy 0e8aa4995d Merge remote-tracking branch 'remotes/origin/fix/importTemplateRemarkRepair' into release/2.9.1.2307.01 2023-07-04 14:51:07 +08:00
sy 7f7e7cd453 薪酬系统-薪资档案，导入模板字段提示位置问题修复 2023-07-04 14:48:02 +08:00
Harryxzy a5a05aabda 工资单定时发送fix 2023-07-04 14:35:51 +08:00
Harryxzy c8cf6090ff 系统薪资项目可配置删除、工资单模板默认没有隐藏项目 2023-07-04 13:21:19 +08:00
钱涛 82ab6c1e11 非系统算税功能 2023-07-04 09:32:12 +08:00
Harryxzy 8dc3883168 工资单定时发送 2023-07-03 17:46:11 +08:00
钱涛 1403b22cf7 修复邮件保存 2023-07-03 14:02:34 +08:00
Harryxzy 5e4f32dbab 累计专项附加扣除更新插入时间修正 2023-07-03 10:34:30 +08:00
Harryxzy 2bf99d3ec1 累计专项附加扣除防抖动修复 2023-07-03 10:33:01 +08:00
Harryxzy 9842784297 工资单定时发送 - 模板保存 2023-06-30 15:58:55 +08:00
Harryxzy d10d5da364 Merge remote-tracking branch 'origin/release/2.8.4.2306.02' into release/2.8.4.2306.02 2023-06-29 15:14:10 +08:00
sy a429c271f4 Merge branch 'feature/230602-数据库适配-PG' into release/2.8.4.2306.02 2023-06-29 15:12:48 +08:00
Harryxzy eb0c59c0b9 累计专项附加扣除列表提速-2 2023-06-29 14:05:33 +08:00
Harryxzy 33593311df 累计专项附加扣除列表提速 2023-06-29 14:04:11 +08:00
Harryxzy e3e0bcd66b 累计专项附加扣除防抖动 2023-06-29 13:53:07 +08:00
钱涛 6a5304a605 修复进度条 2023-06-29 13:38:07 +08:00
Harryxzy 2735661b4a 删除薪资档案 2023-06-29 10:35:55 +08:00
Harryxzy 5d83326d23 listByAcctEmployeeIdsAndSalaryItemIds的分片问题 2023-06-28 16:26:20 +08:00
sy faee7160e3 Merge remote-tracking branch 'remotes/origin/release/2.8.4.2306.02' into feature/230602-数据库适配-PG 2023-06-28 09:46:11 +08:00
Harryxzy 2bb5d18b90 Merge branch 'fix/薪资核算页面查看权限校验' into release/2.8.4.2306.02 2023-06-28 09:16:51 +08:00
Harryxzy ea527d0e37 Merge branch 'fix/下载档案模板没有数据' into release/2.8.4.2306.02 2023-06-27 18:00:59 +08:00
Harryxzy 04f0528143 修复下载薪资档案模板没有带出档案数据 2023-06-27 18:00:39 +08:00
sy 041303275b Merge remote-tracking branch 'remotes/origin/release/2.8.4.2306.02' into feature/230602-数据库适配-PG 2023-06-27 15:09:12 +08:00
Harryxzy 822ad87451 薪资核算结果校验拦截 2023-06-27 14:58:33 +08:00
Harryxzy 6ae98ce50a Merge branch 'fix/新建定量维度时数据透视没有值' into release/2.8.4.2306.02 2023-06-26 14:23:27 +08:00
钱涛 6f3593f44b Merge branch 'feature/短信验证码' into release/2.8.4.2306.02 
# Conflicts:
#	src/com/engine/salary/service/impl/SalarySendServiceImpl.java
#	src/com/engine/salary/sys/constant/SalarySysConstant.java
 2023-06-26 13:54:56 +08:00
Harryxzy 7c44a2ad6b Merge branch 'feature/waterMark' into release/2.8.4.2306.02 
# Conflicts:
#	src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java
#	src/com/engine/salary/web/SalaryBillController.java
 2023-06-26 13:28:21 +08:00
Harryxzy a43123efc0 Merge branch 'fix/DBType修改' into release/2.8.4.2306.02 2023-06-26 13:26:27 +08:00
Harryxzy 3be6eaa16f Merge branch 'feature/核算人员匹配规则（是否包含停薪列）' into release/2.8.4.2306.02 2023-06-26 13:26:03 +08:00
Harryxzy 0117624dc4 Merge branch 'fix/回算后无法发放第二次工资单' into release/2.8.4.2306.02 2023-06-26 13:25:36 +08:00
Harryxzy 5ecba7fa3e Merge branch 'feature/taxDeclarationWithdraw' into release/2.8.4.2306.02 2023-06-26 13:25:01 +08:00