Commit Graph

652 Commits

Author SHA1 Message Date
钱涛 7a7030a91c 申报表税款所属期检索和申报 2025-04-23 17:39:30 +08:00
钱涛 eea9093cfd Merge branch 'release/2.17.1.2411.01' into release/2.19.1.2501.01 2025-03-24 15:03:09 +08:00
钱涛 b128f219f7 处理敏感信息泄露 2025-03-24 14:57:00 +08:00
钱涛 54559b198b 处理模板示例列合并问题 2025-02-08 15:12:42 +08:00
钱涛 0988dd6d5a 下载excel模板示例 2025-02-08 09:52:32 +08:00
钱涛 3e3350bcd6 删除模板功能 2024-12-04 10:14:39 +08:00
钱涛 c80d900339 模板管理列表 2024-12-04 09:13:41 +08:00
钱涛 79ed6a3226 定制列恢复默认设置 2024-11-26 13:50:10 +08:00
钱涛 de5a00f588 修改默认列设置功能 2024-11-25 16:04:19 +08:00
Harryxzy 8a06eaad93 Merge branch 'feature/工资单审批' into release/2.17.1.2411.01
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
#	src/com/engine/salary/service/impl/SalarySobServiceImpl.java
#	src/com/engine/salary/sys/constant/SalarySysConstant.java
#	src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
#	src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java
2024-11-13 18:36:20 +08:00
Harryxzy 32eabb25f0 Merge branch 'feature/241101_薪资档案增加调薪筛选' into release/2.16.1.2410.01 2024-11-08 16:30:40 +08:00
Harryxzy 058e7dcb3c 薪资档案增加调薪时间 筛选 2024-11-08 16:29:06 +08:00
钱涛 e537ffaa5a 薪资明细显示模板 2024-11-07 17:45:17 +08:00
Harryxzy 5953c2b938 薪酬token加解密 2024-11-06 13:37:03 +08:00
Harryxzy dbb332e07f Merge branch 'release/2.16.1.2410.01' into fix/240901_token加解密 2024-11-06 10:05:53 +08:00
钱涛 4cd0fbfe30 报表模板 2024-11-04 19:49:46 +08:00
钱涛 ad48063ca9 扣缴义务人和账套的人员范围支持编辑 2024-10-31 16:56:32 +08:00
钱涛 be2d6b693a 单元格锁定 2024-10-17 18:27:37 +08:00
Harryxzy 4c551dae87 Merge branch 'feature/240801-浮动薪资' into release/2.15.2.2409.01 2024-10-14 15:06:52 +08:00
Harryxzy dbd1b574e0 浮动薪酬优化 2024-10-14 15:05:22 +08:00
Harryxzy 49cbb7a7cc 浮动薪酬 2024-10-14 10:38:30 +08:00
钱涛 b6c7a7f2bd 自定义列全局设置 2024-10-11 17:04:13 +08:00
钱涛 64ac30c05f 自定义列全局设置 2024-10-11 15:34:17 +08:00
钱涛 861cda00fa 1、批量锁定、批量解锁选择人员的所在行的工资项目,需根据人员的选择来设置。
2、导入薪资项目时,优化下当前导入表头能否自动为上次选择的表头信息
2024-10-10 11:39:22 +08:00
钱涛 93d2980ad8 刷新核算人员功能 2024-09-29 10:37:38 +08:00
Harryxzy 3420c36448 人员id加密 2024-09-18 18:10:30 +08:00
Harryxzy 9e5810f173 Merge branch 'feature/240801-浮动薪资' into release/2.15.2.2409.01 2024-09-13 11:11:24 +08:00
Harryxzy 44c11c7dcc Merge branch 'feature/240801-社保方案上下限调整自动调整基数' into release/2.15.1.2407.01 2024-09-03 09:23:50 +08:00
钱涛 42e91e32da 改为通过快照信息搜索 2024-08-26 09:26:42 +08:00
Harryxzy 59820f6aca Merge branch 'fix/240801-核算导入支持vlookup' into release/2.15.1.2407.01 2024-08-20 14:03:58 +08:00
Harryxzy 2a58b4972b 薪资核算导入支持vlookup函数 2024-08-20 13:48:31 +08:00
钱涛 9fae93fcd7 Merge branch 'feature/导入工具' into release/2.15.1.2407.01 2024-08-20 11:40:33 +08:00
Harryxzy 6dc9650305 Merge branch 'release/2.15.1.2407.01' into feature/240801-社保方案上下限调整自动调整基数 2024-08-19 16:01:06 +08:00
Harryxzy 26d300299b 社保方案上下限 2024-08-19 12:07:03 +08:00
钱涛 e2b2b9071f Merge remote-tracking branch 'origin/feature/240801-浮动薪资' into feature/240801-浮动薪资 2024-08-16 14:04:31 +08:00
钱涛 1d388a1993 支持Vlookup 2024-08-16 14:04:20 +08:00
钱涛 659560550a Merge branch 'release/2.15.1.2407.01' into feature/240801-浮动薪资 2024-08-16 13:18:08 +08:00
钱涛 d23baeb940 支持Vlookup 2024-08-16 12:19:18 +08:00
钱涛 673699dfb8 导入工具明细 2024-08-16 11:18:27 +08:00
Harryxzy 2ee605df44 浮动薪酬优化 2024-08-15 13:56:41 +08:00
钱涛 5071c08d8c Merge branch 'release/2.15.1.2407.01' into feature/导入工具
# Conflicts:
#	src/com/engine/salary/service/impl/SalarySobServiceImpl.java
2024-08-15 13:41:52 +08:00
Harryxzy a05fb6fcf0 报表义务人、账套分权 2024-08-13 13:45:24 +08:00
钱涛 845f117d9c excel导入工具 2024-08-12 17:17:52 +08:00
Harryxzy 75fb15928a 浮动薪酬 2024-08-09 10:21:40 +08:00
钱涛 83a408afa2 迁移工具 2024-08-08 16:53:31 +08:00
钱涛 8611358c6c 配置 2024-08-08 11:03:55 +08:00
钱涛 080a69c929 全量迁移 2024-08-08 09:50:04 +08:00
钱涛 d30380e2e7 导入薪资项目、模板、预览 2024-08-07 14:23:35 +08:00
钱涛 48120f8e24 导入薪资项目 2024-08-07 09:06:09 +08:00
钱涛 bd6e30b63b 导入薪资项目 2024-08-06 14:24:08 +08:00