Harryxzy
|
e976c7aaec
|
oracle工资单模板保存异常
|
2023-12-27 09:32:31 +08:00 |
|
Harryxzy
|
2ed856ac18
|
Merge branch 'fix/231202-个税扣缴以为人根据名称查询' into release/2.9.10.2312.02
|
2023-12-25 16:32:11 +08:00 |
|
Harryxzy
|
e67cb5bf83
|
个税扣缴义务人like分成3个
|
2023-12-25 16:31:36 +08:00 |
 钱涛
|
e8223a832b
|
缓存识别条件
|
2023-12-16 12:40:33 +08:00 |
|
钱涛
|
bda3d7080b
|
缓存识别条件
|
2023-12-16 12:36:56 +08:00 |
|
钱涛
|
4f8606b00e
|
缓存识别条件
|
2023-12-16 12:35:24 +08:00 |
|
Harryxzy
|
14cb45f4bc
|
Merge remote-tracking branch 'origin/release/2.9.10.2312.02' into release/2.9.10.2312.02
|
2023-12-14 16:00:46 +08:00 |
|
Harryxzy
|
85f009984c
|
Merge branch 'fix/231202_补发工资单回算项' into release/2.9.10.2312.02
|
2023-12-14 16:00:24 +08:00 |
|
Harryxzy
|
e97a35f158
|
新建补发工资单模板时，已发补发项目fix
|
2023-12-14 15:57:55 +08:00 |
|
钱涛
|
d53897d147
|
Merge remote-tracking branch 'origin/release/2.9.10.2312.02' into release/2.9.10.2312.02
|
2023-12-14 10:40:06 +08:00 |
|
钱涛
|
96d37b1b68
|
修复申报表明细
|
2023-12-14 10:39:49 +08:00 |
|
Harryxzy
|
cfbddef42a
|
核算记录归档action
|
2023-12-13 09:58:00 +08:00 |
|
Harryxzy
|
5fba05bc43
|
Merge branch 'fix/核算、线下对比导出优化' into release/2.9.9.2312.01
|
2023-12-12 14:22:44 +08:00 |
|
Harryxzy
|
51022c0a16
|
薪资核算结果、线下对比下载导入模板优化fix
|
2023-12-12 14:22:18 +08:00 |
|
Harryxzy
|
d38ef4769b
|
Merge remote-tracking branch 'origin/release/2.9.9.2312.01' into release/2.9.9.2312.01
|
2023-12-12 14:12:19 +08:00 |
|
Harryxzy
|
5c50b61cd5
|
Merge branch 'fix/核算、线下对比导出优化' into release/2.9.9.2312.01
|
2023-12-12 14:12:14 +08:00 |
|
Harryxzy
|
9602e48e74
|
薪资核算结果、线下对比下载导入模板优化fix
|
2023-12-12 14:11:48 +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
|
559ba88e9f
|
薪资核算结果、线下对比下载导入模板优化
|
2023-12-12 10:32:04 +08:00 |
|
Harryxzy
|
929bcc7877
|
薪资核算结果、线下对比下载导入模板优化
|
2023-12-12 10:18:10 +08:00 |
|
钱涛
|
04e3225c98
|
自适应
|
2023-12-12 10:07:31 +08:00 |
|
钱涛
|
e495c1799f
|
自定义
|
2023-12-11 09:52:47 +08:00 |
|
Harryxzy
|
32984afaeb
|
Merge remote-tracking branch 'origin/release/2.9.9.2312.01' into release/2.9.9.2312.01
|
2023-12-08 11:44:07 +08:00 |
|
钱涛
|
bbe4b315cf
|
pg脚本异常
|
2023-12-08 11:43:19 +08:00 |
|
Harryxzy
|
8138b5297f
|
薪酬报表添加文本统计项目时，字符去值规则没有保存进去
|
2023-12-08 11:41:13 +08:00 |
|
钱涛
|
390251bd63
|
Merge remote-tracking branch 'origin/release/2.9.9.2312.01' into release/2.9.9.2312.01
|
2023-12-05 15:08:44 +08:00 |
|
钱涛
|
dd48bff747
|
同步所有档案起始发薪日期为入职日期
|
2023-12-05 15:08:37 +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 |
|
sy
|
362c4d4459
|
薪酬系统-福利台账，正常缴纳和补缴中未设置缴纳的福利项导入校验优化，忽略为null的福利类缴纳map
|
2023-12-05 10:21:47 +08:00 |
|
sy
|
cecbd16508
|
薪酬系统-福利台账，正常缴纳和补缴中未设置缴纳的福利项，不允许导入核算数据
|
2023-12-04 15:10:46 +08:00 |
|
钱涛
|
3f61807401
|
修复核算结果可能为0
|
2023-11-29 17:45:16 +08:00 |
|
Harryxzy
|
df25f99544
|
薪资核算固定列头
|
2023-11-29 16:48:09 +08:00 |
|
sy
|
eaa8a45376
|
薪酬系统-福利台账，编辑功能带出福利项数据逻辑优化，增加缴纳对象（公司或个人）标志字段
|
2023-11-29 13:50:25 +08:00 |
|
sy
|
ce8ac2c125
|
薪酬系统-福利台账，编辑功能带出福利项数据逻辑优化，增加福利类别标志字段
|
2023-11-29 11:04:14 +08:00 |
|
sy
|
22d749dcb3
|
Merge remote-tracking branch 'remotes/origin/fix/231101-福利档案及模板导出后文件损坏问题修复' into feature/231102-福利台账，补差待编辑项扩充其他可缴纳福利项
|
2023-11-28 16:05:29 +08:00 |
|
sy
|
1bd20b2686
|
薪酬系统-福利台账，台账查询增加个税扣缴义务人
|
2023-11-27 11:20:36 +08:00 |
|
sy
|
bf99fd81c6
|
薪酬系统-福利核算，补差数据新增功能接口
|
2023-11-24 17:42:34 +08:00 |
|
钱涛
|
3ab8840ccd
|
增加搜索条件颗粒度
|
2023-11-24 16:49:54 +08:00 |
|
sy
|
c8e3d6312b
|
薪酬系统-福利核算，补差待编辑福利项列表功能接口，补缴第三种方式的待编辑福利项获取逻辑优化，补差编辑tab页待编辑福利项获取逻辑优化
|
2023-11-24 14:05:03 +08:00 |
|
钱涛
|
f77b4c063b
|
去除文化遗产
|
2023-11-23 10:25:33 +08:00 |
|
钱涛
|
a143b4fba5
|
新增工资单模板短信字段
|
2023-11-23 09:31:09 +08:00 |
|
sy
|
9876bc49cf
|
薪酬系统-福利核算，对于处于在缴员工列表，但是不在起始缴纳月和最后缴纳月区间的核算月的人员，不生成核算记录
|
2023-11-22 16:47:36 +08:00 |
|
钱涛
|
e0f7ec3256
|
申报表提示日期优化
|
2023-11-22 16:37:48 +08:00 |
|
钱涛
|
f16f93fd43
|
过滤pdf中的空或0值
|
2023-11-22 14:06:34 +08:00 |
|
sy
|
9f8c5f9c07
|
薪酬系统-福利档案，福利档案列表显示、导入导出数据中不带出福利方案中停止缴费的福利数据
|
2023-11-22 11:32:32 +08:00 |
|
钱涛
|
afabde3b18
|
短信模板配置
|
2023-11-22 10:54:32 +08:00 |