 钱涛
|
e4d7b1dde4
|
取消如果薪资核算记录已经归档了，就不能继续核算
|
2025-03-25 16:00:45 +08:00 |
|
钱涛
|
45ecb77a44
|
京福二开，增加二次核算
|
2025-03-24 10:25:44 +08:00 |
|
钱涛
|
2f0c2b39ce
|
京福二开，增加二次核算
|
2025-03-24 09:53:37 +08:00 |
|
钱涛
|
45154c3fbf
|
京福报表格式修改
|
2025-03-18 11:45:49 +08:00 |
|
钱涛
|
1aea37a581
|
Merge branch 'release/2.19.1.2501.01' into custom/京贵投资
# Conflicts:
# src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
|
2025-03-18 11:31:41 +08:00 |
|
钱涛
|
a29f8b3da9
|
薪资明细模板导出根据项目类型设置单元格格式
|
2025-03-17 11:03:42 +08:00 |
Harryxzy
|
3fb29b2c3d
|
停薪action 增加日志
|
2025-03-12 18:21:04 +08:00 |
|
钱涛
|
9cee19397d
|
记录核算具体操作日志
|
2025-03-06 17:35:25 +08:00 |
|
钱涛
|
2118cbce86
|
配置排除账套配置
|
2025-02-24 18:33:32 +08:00 |
|
钱涛
|
1c0b58d95d
|
Merge branch 'release/2.19.1.2501.01' into custom/京贵投资
# Conflicts:
# src/com/engine/salary/report/wrapper/SalaryStatisticsEmployeeWrapper.java
|
2025-02-24 18:07:07 +08:00 |
|
Harryxzy
|
9c419f09bf
|
Merge remote-tracking branch 'origin/release/2.19.1.2501.01' into release/2.19.1.2501.01
|
2025-02-11 09:23:15 +08:00 |
|
钱涛
|
54559b198b
|
处理模板示例列合并问题
|
2025-02-08 15:12:42 +08:00 |
|
钱涛
|
e48c74b2e2
|
处理模板示例列合并问题
|
2025-02-08 15:12:21 +08:00 |
|
Harryxzy
|
06e117f3aa
|
Merge remote-tracking branch 'origin/release/2.19.1.2501.01' into release/2.19.1.2501.01
|
2025-02-08 11:29:23 +08:00 |
|
Harryxzy
|
be59482fc8
|
fix社保福利台账核算人员bug
|
2025-02-08 11:28:36 +08:00 |
|
钱涛
|
0988dd6d5a
|
下载excel模板示例
|
2025-02-08 09:52:32 +08:00 |
|
钱涛
|
5916cd63ef
|
支持根据税款所属期进行申报
|
2025-02-07 16:58:58 +08:00 |
|
钱涛
|
3394c92964
|
修复导出模板附件删除问题
|
2025-02-07 11:44:17 +08:00 |
|
钱涛
|
20f06e07da
|
修复导出模板附件删除问题
|
2025-02-07 11:42:31 +08:00 |
|
钱涛
|
8425a30aa0
|
模板显示附件名称
|
2025-02-07 10:13:29 +08:00 |
|
Harryxzy
|
c77ecf8d69
|
Merge branch 'feature/250101-社保福利台账不核算暂不缴纳人员' into release/2.19.1.2501.01
|
2025-02-07 09:16:18 +08:00 |
|
钱涛
|
d75979ed45
|
Merge remote-tracking branch 'origin/release/2.19.1.2501.01' into release/2.19.1.2501.01
|
2025-02-06 16:11:50 +08:00 |
|
钱涛
|
0dd98cf616
|
薪资excel模板导出
|
2025-02-06 16:11:39 +08:00 |
|
Harryxzy
|
d63702891d
|
fix 社保福利台账核算人数大于1000时sqlbug
|
2025-02-06 13:51:22 +08:00 |
|
Harryxzy
|
4875bd327c
|
社保福利台账勾选了暂不缴纳的不出现在台账中
|
2025-02-05 15:52:34 +08:00 |
|
钱涛
|
0aabf7df6c
|
处理sql异常
|
2025-01-22 15:06:03 +08:00 |
|
钱涛
|
076e3029b1
|
获取已归档的正常工资薪金所得人员
|
2025-01-21 15:03:36 +08:00 |
|
钱涛
|
7195dc7618
|
兼容0状态档案
|
2025-01-21 10:20:16 +08:00 |
|
钱涛
|
b206fd984c
|
考勤引用排除非系统人员
|
2025-01-20 15:05:04 +08:00 |
|
钱涛
|
5e95742508
|
人事信息快照表
|
2025-01-15 16:39:50 +08:00 |
|
钱涛
|
63522440b1
|
同步全勤奖标准的档案
|
2025-01-07 18:35:12 +08:00 |
|
钱涛
|
5a0ef67816
|
版本
|
2025-01-03 09:14:08 +08:00 |
|
钱涛
|
8f697eba36
|
版本
|
2025-01-02 15:00:21 +08:00 |
|
Harryxzy
|
d4a42e0ed6
|
修复人员确认页面“环比上月减少人员”搜索后，显示数据错误
|
2024-12-25 11:27:06 +08:00 |
|
Harryxzy
|
bbb02bcd81
|
fix 报表按照分部维度错误
fix 调薪记录导入生效日期格式错误
|
2024-12-24 15:39:58 +08:00 |
|
Harryxzy
|
7b82b570e4
|
获取token增加https配置
|
2024-12-19 16:59:38 +08:00 |
|
钱涛
|
bf8f55aaa9
|
是否引用班次给出按钮选择
|
2024-12-17 15:47:49 +08:00 |
|
钱涛
|
10266bf739
|
处理离职员工无法导入问题
|
2024-12-17 15:00:41 +08:00 |
|
Harryxzy
|
94da3d3a31
|
修复报表导出，单元格格式问题
|
2024-12-16 17:46:58 +08:00 |
|
钱涛
|
4d90d0d8f0
|
支持主账号查看次账号工资单
|
2024-12-16 10:38:08 +08:00 |
|
Harryxzy
|
ec88fc5b10
|
修复基数没有自动调整 日志调整
|
2024-12-13 16:29:24 +08:00 |
|
Harryxzy
|
874de98a91
|
修复基数没有自动调整
|
2024-12-13 16:19:56 +08:00 |
|
钱涛
|
c13cc9d0a2
|
处理薪资档案问题
|
2024-12-12 18:24:00 +08:00 |
|
Harryxzy
|
66912f62a4
|
社保基数自动调整 增加日志
|
2024-12-12 16:16:18 +08:00 |
|
Harryxzy
|
3d04414511
|
Merge remote-tracking branch 'origin/release/2.18.1.2412.01' into release/2.18.1.2412.01
|
2024-12-12 15:30:55 +08:00 |
|
Harryxzy
|
19a4385703
|
社保基数自动调整 增加日志
|
2024-12-12 15:30:26 +08:00 |
|
钱涛
|
83df05b763
|
控制下账号类型显示隐藏
|
2024-12-12 10:18:07 +08:00 |
|
Harryxzy
|
4ddb123b3d
|
移动端获取工资单列表优化
|
2024-12-11 15:22:08 +08:00 |
|
钱涛
|
bd3b815bcf
|
隐藏项目导入导出不显示
|
2024-12-11 11:04:42 +08:00 |
|
钱涛
|
b8fdc4dde6
|
隐藏项目导入导出不显示
|
2024-12-10 16:25:20 +08:00 |