Commit Graph

25 Commits

Author SHA1 Message Date
Harryxzy 83297993cd 专项附加扣除业务线bug修复 2025-09-09 18:44:18 +08:00
钱涛 05690a81fa 替换listAllTaxAgentsAsAdmin方法 2025-02-14 15:13:40 +08:00
钱涛 6e7ccb2339 浮动薪资档案分权 2024-09-18 18:19:58 +08:00
钱涛 d23baeb940 支持Vlookup 2024-08-16 12:19:18 +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
钱涛 1b3da7dfc0 身份证 2024-05-23 09:16:28 +08:00
Harryxzy 5d0b8e7759 导出excel单元格格式 2024-03-18 14:01:08 +08:00
钱涛 0a7334ddef 考勤导入,多语言 2024-03-14 18:16:20 +08:00
钱涛 29e81e03c2 优化公式不显示未启用的考勤字段 2024-03-14 16:08:16 +08:00
钱涛 417c9f703d 下载模板时带出数据 2024-03-14 15:28:14 +08:00
钱涛 836947725f 切换了elog位置 2024-03-12 14:34:44 +08:00
钱涛 f325674673 Merge branch 'release/2.11.1.2402.01' into feature/操作日志组件 2024-03-04 09:41:35 +08:00
钱涛 8ae06f27b8 fix导入性能,导入方法类型改完外层引用 2024-02-29 15:53:22 +08:00
Harryxzy 066222400b 操作日志修复 2024-02-28 16:44:52 +08:00
Harryxzy dee20149bb 日志 2024-02-21 18:19:02 +08:00
Harryxzy 5067d50722 EmployeeBiz修改调用方式-2 2023-03-07 17:20:30 +08:00
Harryxzy 068f7e6535 EmployeeBiz修改调用方式 2023-03-07 17:14:25 +08:00
fcli dea2353ef2 Merge branch 'feature/变更分页' into feature/加密方法&分页merge
# Conflicts:
#	src/com/engine/salary/biz/SIAccountBiz.java
#	src/com/engine/salary/biz/SalaryArchiveItemBiz.java
#	src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
#	src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
#	src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java
#	src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java
2022-12-14 10:57:41 +08:00
fcli d3de862d11 feat: 加密统一,薪资项目&社保档案详情... 2022-12-13 17:14:27 +08:00
fcli b58e71989d feat: 统一修改到内存分页 2022-12-12 10:25:55 +08:00
fcli eb7311f0f3 fix: 管理员可以编辑该扣缴义务人数据,其他人可以编辑本人数据&一键累计所有个税扣缴义务人下的人员 2022-11-09 10:40:55 +08:00
fcli 07a07d2be8 feat: 专项附加扣除模块, 权限限制,导入导出优化,添加一键累计 2022-11-09 10:40:48 +08:00
fcli 9b77bf7139 feat: 专项附加扣除模块, 一键清空、分页bug等 2022-11-09 10:40:38 +08:00
fcli 92a6512dc8 feat: 专项附加扣除模块,去除月份,添加普通用户登录查看本人记录功能 2022-11-09 10:40:28 +08:00
fcli 171f726bd3 feat: 专项附加扣除模块 2022-11-09 10:40:01 +08:00