Harryxzy
|
4b474f864f
|
累计专项附加扣除一键累计，能根据义务人进行累计
|
2024-04-30 14:43:37 +08:00 |
|
Harryxzy
|
8ae76f9b65
|
Merge branch 'release/2.13.1.2404.02' into feature/工资单审批
|
2024-04-30 10:26:58 +08:00 |
|
Harryxzy
|
1800c02e58
|
盛威
|
2024-04-29 16:08:18 +08:00 |
|
Harryxzy
|
d7de02696d
|
工资单审批，增加规则配置
|
2024-04-28 16:58:33 +08:00 |
 钱涛
|
7d7d2dc309
|
处理公式数组问题
|
2024-04-28 16:21:44 +08:00 |
|
Harryxzy
|
e7c46bc5e8
|
优化同步离职日期
|
2024-04-26 15:13:54 +08:00 |
|
Harryxzy
|
4f391a2159
|
工资单审批
|
2024-04-26 11:24:47 +08:00 |
|
Harryxzy
|
8ff315b341
|
工资单审批sql
|
2024-04-25 17:24:47 +08:00 |
|
Harryxzy
|
34fe103055
|
工资单审批
|
2024-04-25 15:30:25 +08:00 |
|
钱涛
|
4682866674
|
档案sql
|
2024-04-25 14:25:40 +08:00 |
|
Harryxzy
|
ea968c316e
|
解决数据透视薪资项目排序问题
|
2024-04-25 14:04:13 +08:00 |
|
钱涛
|
353a007149
|
Merge branch 'release/2.13.1.2404.02' into release/个税版本
|
2024-04-25 13:46:13 +08:00 |
|
钱涛
|
c9075058d5
|
跳过人员范围校验
|
2024-04-25 13:45:59 +08:00 |
|
钱涛
|
0661406c97
|
Merge branch 'release/2.13.1.2404.02' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
|
2024-04-25 11:47:47 +08:00 |
|
钱涛
|
c206538aa6
|
Merge remote-tracking branch 'origin/release/2.13.1.2404.02' into release/2.13.1.2404.02
|
2024-04-25 11:45:53 +08:00 |
|
钱涛
|
d802d890d6
|
处理解密问题
|
2024-04-25 11:45:37 +08:00 |
|
Harryxzy
|
f46a18fa27
|
薪资审批
|
2024-04-25 09:39:28 +08:00 |
|
Harryxzy
|
11304bebed
|
薪资审批
|
2024-04-24 15:55:41 +08:00 |
|
钱涛
|
591555fa8a
|
更新sql
|
2024-04-23 17:47:02 +08:00 |
|
Harryxzy
|
0bf4b8ed09
|
修复往期累计导入时未加密
|
2024-04-23 15:45:24 +08:00 |
|
钱涛
|
1c2f0f516a
|
删除重复sql
|
2024-04-23 11:39:41 +08:00 |
|
钱涛
|
8f76daf0d1
|
Merge branch 'feature/外籍人员' into release/个税版本
|
2024-04-23 11:15:37 +08:00 |
|
钱涛
|
794ed55c7d
|
版本
|
2024-04-22 15:03:28 +08:00 |
|
钱涛
|
a27ad1f070
|
并档案接口
|
2024-04-16 20:26:56 +08:00 |
|
钱涛
|
1496745488
|
作废人员接口
|
2024-04-16 20:12:48 +08:00 |
|
钱涛
|
95a7f26d60
|
Merge remote-tracking branch 'origin/release/2.13.1.2404.02' into release/2.13.1.2404.02
|
2024-04-16 16:05:53 +08:00 |
|
钱涛
|
68d0003f62
|
新增核算结果的代理
|
2024-04-16 16:05:42 +08:00 |
|
Harryxzy
|
916baf623c
|
fix导出文本
|
2024-04-16 09:57:12 +08:00 |
|
钱涛
|
6cfeb70f9c
|
Merge branch 'release/2.12.1.2403.02' into release/个税版本
|
2024-04-12 17:47:40 +08:00 |
|
钱涛
|
0e6449e1e2
|
外籍人员
|
2024-04-12 17:46:53 +08:00 |
|
Harryxzy
|
8d7d3c3ec3
|
非系统人员部门id、分部id删除失败
|
2024-04-12 15:06:32 +08:00 |
|
钱涛
|
4aa66ea587
|
外籍人员更新
|
2024-04-11 18:57:56 +08:00 |
|
钱涛
|
23eba4950b
|
处理pdf生成
|
2024-04-11 15:23:23 +08:00 |
|
钱涛
|
a2a18245bd
|
处理缴款反馈
|
2024-04-11 10:59:36 +08:00 |
|
钱涛
|
691f4c42ce
|
内置算税结果
|
2024-04-10 14:48:58 +08:00 |
|
钱涛
|
6a05269b2d
|
处理LIKE函数
|
2024-04-10 14:20:30 +08:00 |
|
钱涛
|
917c9f87c1
|
个税申报
|
2024-04-10 09:18:05 +08:00 |
|
钱涛
|
d1b6a78238
|
人员报送
|
2024-04-10 09:08:24 +08:00 |
|
Harryxzy
|
44ed332ed5
|
修复ecology的多语言导致乱码
|
2024-04-08 17:57:59 +08:00 |
|
Harryxzy
|
a9dd2c2cb3
|
Merge branch 'release/2.12.1.2403.02' into release/个税版本
|
2024-04-08 15:53:13 +08:00 |
|
钱涛
|
e994a61037
|
申报状态拆分
|
2024-04-08 14:40:47 +08:00 |
|
钱涛
|
be85c47a68
|
申报表状态更新主记录
|
2024-04-07 15:59:36 +08:00 |
|
Harryxzy
|
ff19e46ac2
|
fix
|
2024-04-07 15:52:07 +08:00 |
|
Harryxzy
|
93f9e9aca7
|
1、修复工资单员工信息分部显示问题
2、修复日志功能查询参数超1000导致的报错
|
2024-04-07 13:56:00 +08:00 |
|
钱涛
|
fbc9c1a187
|
申报表状态更新主记录
|
2024-04-07 11:29:09 +08:00 |
|
Harryxzy
|
2242723d3f
|
Merge branch 'feature/240302-薪资核算导出模板' into release/2.12.1.2403.02
|
2024-04-03 11:39:30 +08:00 |
|
钱涛
|
7f965c41c9
|
申报表状态更新主记录
|
2024-04-02 15:50:33 +08:00 |
|
钱涛
|
a06a54f574
|
去除objectUtil
|
2024-04-01 20:25:23 +08:00 |
|
钱涛
|
57a0030cc8
|
处理外籍人员
|
2024-04-01 17:07:36 +08:00 |
|
Harryxzy
|
4ccfac80f5
|
sql
|
2024-04-01 16:33:13 +08:00 |