Commit Graph

20 Commits

Author SHA1 Message Date
钱涛 f848b74f28 薪酬流程日志 2023-05-12 11:51:42 +08:00
Harryxzy 82ee707f16 employebiz改成employeeservice 2023-04-12 15:27:35 +08:00
Harryxzy a286ac6f44 Merge branch 'fix/salaryArchiveImportByRuleBug_0407' into release/2.7.3.2304.01 2023-04-11 10:18:54 +08:00
sy 521db08cde Merge remote-tracking branch 'remotes/origin/feature/v4-salaryExcelFormat-0328' into release/2.7.3.2304.01
# Conflicts:
#	src/com/engine/salary/service/SalaryAcctExcelService.java
#	src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
2023-04-03 15:59:58 +08:00
Harryxzy f0c80f3287 薪资档案导入无法带出工号数据 2023-03-30 10:02:09 +08:00
Harryxzy 2fc4560488 薪资档案按照工号导入无效 2023-03-29 16:46:10 +08:00
Harryxzy 95cf271c80 修复薪资档案导入,重复数据报错行数少一 2023-03-28 09:31:00 +08:00
sy dc2cb5f448 薪酬系统-薪资核算,薪资核算和薪资档案导出excel通用格式改造 2023-03-16 13:51:41 +08:00
钱涛 ee5e5fa127 调薪说明 2023-02-22 19:12:53 +08:00
钱涛 41c56b1bd4 调薪说明 2023-02-22 19:07:13 +08:00
钱涛 30e8fd3733 流程中个税扣缴义务人已处理 2022-12-08 16:48:37 +08:00
钱涛 2c1421999b Merge branch 'feature/扩展sql字符' into release/2.3.2.2212.01 2022-12-08 11:32:03 +08:00
钱涛 399563088d 流程生成人员范围 2022-12-08 10:49:51 +08:00
钱涛 0d417f1e49 流程生成人员范围 2022-12-07 20:15:52 +08:00
钱涛 b39587e19d 单独调薪action 2022-12-06 18:08:50 +08:00
钱涛 23dd15a568 批量调薪action 2022-12-05 16:01:08 +08:00
Harryxzy 6fe28ec41c 定薪流程,放开个税扣缴义务人限制 2022-12-05 09:57:27 +08:00
钱涛 104213fc04 1、提示优化
2、导入模板
3、定薪流程
2022-10-27 15:17:22 +08:00
钱涛 d72362f7b7 档案模板注释 2022-10-26 18:05:04 +08:00
钱涛 7a817af154 档案导入 2022-10-26 13:46:36 +08:00