 钱涛
|
e2b341b675
|
Merge branch 'release/个税版本' into feature/个税2312版本功能
|
2023-12-28 15:49:28 +08:00 |
|
钱涛
|
4a2996e211
|
Merge branch 'release/2.9.10.2312.02' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java
# src/com/engine/salary/util/excel/ExcelUtil.java
|
2023-12-28 15:48:54 +08:00 |
|
钱涛
|
7e22711dcd
|
导入工具
|
2023-12-28 15:47:05 +08:00 |
|
钱涛
|
8b78ccd43b
|
Merge branch 'release/个税版本' into feature/个税2312版本功能
|
2023-12-28 09:51:34 +08:00 |
Harryxzy
|
2dc7e7f541
|
人员信息报送导入
|
2023-12-27 16:58:47 +08:00 |
|
Harryxzy
|
2797745448
|
人员信息报送-导入
|
2023-12-26 17:45:06 +08:00 |
|
钱涛
|
c581c8d74d
|
导出申报表明细
|
2023-12-20 17:21:46 +08:00 |
|
钱涛
|
d9c952e80c
|
申报表明细新增、编辑
|
2023-12-14 17:55:48 +08:00 |
|
Harryxzy
|
e97a35f158
|
新建补发工资单模板时，已发补发项目fix
|
2023-12-14 15:57:55 +08:00 |
|
钱涛
|
4810bfb73e
|
Merge branch 'release/个税版本' into feature/个税2312版本功能
|
2023-12-14 10:42:15 +08:00 |
|
钱涛
|
0856f63ca5
|
Merge branch 'release/2.9.10.2312.02' into release/个税版本
# Conflicts:
# src/com/engine/salary/util/page/SalaryPageUtil.java
|
2023-12-14 10:41:37 +08:00 |
|
钱涛
|
0a54fe5f80
|
新增申报
|
2023-12-14 10:35:10 +08:00 |
|
钱涛
|
a5ffe12509
|
身份证最后一位x转大写
|
2023-12-13 19:34:10 +08:00 |
|
钱涛
|
fa30083d07
|
人员报送导入模板
|
2023-12-13 17:52:51 +08:00 |
|
钱涛
|
f53922a3ab
|
去除作废接口限制
|
2023-12-12 17:18:56 +08:00 |
|
钱涛
|
b78f4302e0
|
小数位
|
2023-12-12 13:18:17 +08:00 |
|
Harryxzy
|
9c454623bc
|
Merge branch 'fix/核算、线下对比导出优化' into release/2.9.9.2312.01
|
2023-12-12 10:32:30 +08:00 |
|
Harryxzy
|
929bcc7877
|
薪资核算结果、线下对比下载导入模板优化
|
2023-12-12 10:18:10 +08:00 |
|
钱涛
|
e495c1799f
|
自定义
|
2023-12-11 09:52:47 +08:00 |
|
钱涛
|
942f6baa32
|
Merge branch 'release/个税版本' into feature/申报明细
# Conflicts:
# src/com/engine/salary/web/EmployeeDeclareController.java
|
2023-12-08 16:44:38 +08:00 |
|
钱涛
|
48f5d5ab0e
|
适配分部门企业注册
|
2023-12-07 15:48:06 +08:00 |
|
钱涛
|
e093c6aa7e
|
申报明细
|
2023-12-06 15:19:07 +08:00 |
|
钱涛
|
1a061aa346
|
同步所有人员报送发薪日期为入职日期
|
2023-12-05 17:08:35 +08:00 |
|
钱涛
|
791bc2ffca
|
Merge branch 'release/2.9.9.2312.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/SalaryArchiveService.java
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
|
2023-12-05 15:09:40 +08:00 |
|
Harryxzy
|
3687bdfcdc
|
Merge remote-tracking branch 'origin/release/2.9.9.2312.01' into release/2.9.9.2312.01
|
2023-12-05 11:30:04 +08:00 |
|
Harryxzy
|
b093717e46
|
Merge branch 'fix/231102_账套增加义务人筛选' into release/2.9.9.2312.01
|
2023-12-05 11:28:47 +08:00 |
sy
|
ce10204dab
|
Merge remote-tracking branch 'remotes/origin/feature/231102-福利台账，补差待编辑项扩充其他可缴纳福利项' into release/2.9.9.2312.01
|
2023-12-05 11:26:48 +08:00 |
|
Harryxzy
|
a0331112be
|
Merge branch 'fie/231102_线下对比列头改造' into release/2.9.9.2312.01
|
2023-12-05 11:26:22 +08:00 |
|
钱涛
|
121da2f7ad
|
个税云参数调整
|
2023-12-01 11:46:21 +08:00 |
|
钱涛
|
895da67d46
|
Merge branch 'release/2.9.8.2311.02' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
# src/com/engine/salary/util/SalaryDateUtil.java
|
2023-11-28 15:09:51 +08:00 |
|
sy
|
1bd20b2686
|
薪酬系统-福利台账，台账查询增加个税扣缴义务人
|
2023-11-27 11:20:36 +08:00 |
|
sy
|
c8e3d6312b
|
薪酬系统-福利核算，补差待编辑福利项列表功能接口，补缴第三种方式的待编辑福利项获取逻辑优化，补差编辑tab页待编辑福利项获取逻辑优化
|
2023-11-24 14:05:03 +08:00 |
|
钱涛
|
a143b4fba5
|
新增工资单模板短信字段
|
2023-11-23 09:31:09 +08:00 |
|
钱涛
|
f16f93fd43
|
过滤pdf中的空或0值
|
2023-11-22 14:06:34 +08:00 |
|
Harryxzy
|
805fb9ff3c
|
1、薪资账套页面增加义务人筛选条件
2、薪资核算页面增加义务人列表
|
2023-11-20 16:14:51 +08:00 |
|
钱涛
|
753eaa5b22
|
检查闭环
|
2023-11-17 16:00:59 +08:00 |
|
钱涛
|
a2f63dee2b
|
短信模板设置接口
|
2023-11-16 15:42:11 +08:00 |
|
钱涛
|
e1a4e275ff
|
短信模板设置接口
|
2023-11-16 15:41:29 +08:00 |
|
钱涛
|
3de1e62f6b
|
短信模板
|
2023-11-16 11:38:21 +08:00 |
|
Harryxzy
|
97a5d4ab91
|
线下对比表头改造成分组的样式
|
2023-11-15 17:12:52 +08:00 |
|
钱涛
|
d2127cccff
|
短信模板
|
2023-11-15 13:32:37 +08:00 |
|
钱涛
|
fcd5846d08
|
Merge branch 'release/3.0.0.2311.02' into release/个税版本
|
2023-11-13 17:13:28 +08:00 |
|
钱涛
|
f3bc735fae
|
短信发送
|
2023-11-13 16:52:19 +08:00 |
|
钱涛
|
75717871d0
|
Merge branch 'release/3.0.0.2311.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/SalaryEmployeeService.java
# src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
# src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
|
2023-11-08 16:20:31 +08:00 |
|
钱涛
|
00f806a8e9
|
Merge branch 'release/3.0.0.2311.01' into feature/报表支持自定义维度
|
2023-11-07 19:06:57 +08:00 |
|
钱涛
|
bcee3c5e5a
|
人员属性扩展
|
2023-11-07 19:06:43 +08:00 |
|
Harryxzy
|
f2a840576e
|
Merge branch 'fix/薪资核算导入下载模板bug' into release/3.0.0.2311.01
|
2023-11-07 11:24:25 +08:00 |
|
钱涛
|
68bc79ab0b
|
修改关键字
|
2023-11-07 11:00:00 +08:00 |
|
钱涛
|
74f7c71ffe
|
扩展维度属性
|
2023-11-06 11:19:00 +08:00 |
|
钱涛
|
0634a139b9
|
显示字符统计规则
|
2023-11-02 18:41:58 +08:00 |