 钱涛
|
fdc1df3dba
|
个税对接v6
|
2023-08-22 17:48:23 +08:00 |
|
钱涛
|
bb2d2d64e6
|
在线申报接口
|
2023-08-21 19:35:14 +08:00 |
|
钱涛
|
215e25fa31
|
申报表分页问题
|
2023-08-21 10:30:13 +08:00 |
|
钱涛
|
2f59f8283a
|
人员报送接口
|
2023-08-20 14:03:43 +08:00 |
|
钱涛
|
988139610b
|
Merge branch 'release/2.9.4.2308.02' into release/230803对接个税
# Conflicts:
# src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml
# src/com/engine/salary/web/SalarySobController.java
|
2023-08-18 09:36:26 +08:00 |
|
钱涛
|
d88c43c3c6
|
人员报送接口
|
2023-08-18 09:27:16 +08:00 |
|
钱涛
|
0d8606c956
|
在线申报接口
|
2023-08-17 19:04:20 +08:00 |
|
钱涛
|
914963135a
|
个税对接辅助缴款
|
2023-08-17 14:55:32 +08:00 |
sy
|
63023ae8e6
|
薪酬系统-福利档案、台账，档案增加分部字段、tab计数过滤非系统人员、补差取消部分字段展示
|
2023-08-17 11:31:38 +08:00 |
|
钱涛
|
414f960346
|
账套-个税字段对应、累计字段对应
|
2023-08-17 09:22:09 +08:00 |
|
钱涛
|
cf22685fca
|
账套-个税字段对应、累计字段对应
|
2023-08-15 20:48:09 +08:00 |
|
钱涛
|
81dae66ea2
|
个税对接，个税申报接口
|
2023-08-14 21:03:40 +08:00 |
|
钱涛
|
b1817142b0
|
个税对接，个税申报接口
|
2023-08-14 20:07:29 +08:00 |
Harryxzy
|
19cb2d9622
|
Merge branch 'feature/230703-薪资账套项目页面改造' into release/2.9.3.2308.01
|
2023-08-14 09:19:20 +08:00 |
|
Harryxzy
|
7ebb8d6618
|
Merge branch 'feature/230702-自定义工资项目展示名' into release/2.9.3.2308.01
|
2023-08-14 09:19:04 +08:00 |
|
钱涛
|
dc63897165
|
个税对接，个税申报接口
|
2023-08-11 14:20:14 +08:00 |
|
钱涛
|
615813c478
|
个税对接，人员报送相关接口
|
2023-08-09 18:35:09 +08:00 |
|
钱涛
|
827420c2bd
|
个税对接，人员报送相关接口
|
2023-08-08 19:39:53 +08:00 |
|
sy
|
9f021b6d5e
|
薪酬系统-福利档案，修复非系统人员增量数据造成的bug
|
2023-08-08 15:03:52 +08:00 |
|
Harryxzy
|
6a01f0d785
|
Merge branch 'release/2.9.2.2307.02' into feature/230702-自定义工资项目展示名
|
2023-08-08 11:42:41 +08:00 |
|
Harryxzy
|
fa7eb0ee60
|
Merge branch 'release/2.9.2.2307.02' into feature/230703-薪资账套项目页面改造
|
2023-08-08 11:06:06 +08:00 |
|
Harryxzy
|
58eaddc33e
|
人员信息报送temp
|
2023-08-08 09:21:14 +08:00 |
|
sy
|
8c9049f1f7
|
Merge remote-tracking branch 'remotes/origin/feature/230702-非系统人员导入功能' into release/2.9.3.2308.01
|
2023-08-04 15:26:24 +08:00 |
|
Harryxzy
|
190771037e
|
fixbug
|
2023-08-04 09:33:17 +08:00 |
|
sy
|
3f10c8eb96
|
Merge remote-tracking branch 'remotes/origin/fix/福利台账-线下对比导入分批' into release/2.9.3.2308.01
|
2023-08-02 15:41:33 +08:00 |
|
sy
|
293297ad7f
|
薪酬系统-福利台账，线下对比导入分批,列表逻辑优化
|
2023-08-01 15:37:32 +08:00 |
|
Harryxzy
|
3827c8963d
|
fix补发模板问题
|
2023-07-31 17:07:21 +08:00 |
|
Harryxzy
|
b7203625c1
|
自定义工资项目展示名fix 添加
|
2023-07-31 10:47:00 +08:00 |
|
Harryxzy
|
f282f1a3ab
|
自定义工资项目展示名
|
2023-07-28 17:51:50 +08:00 |
|
Harryxzy
|
02628d8224
|
薪资账套-薪资项目编辑fixBUG
|
2023-07-28 17:43:14 +08:00 |
|
sy
|
007d6df3cd
|
薪酬系统-非系统人员管理，非系统人员导入
|
2023-07-28 10:12:59 +08:00 |
|
sy
|
80f4f7d43b
|
薪酬系统-非系统人员管理，非系统人员导入模板
|
2023-07-27 09:39:03 +08:00 |
|
Harryxzy
|
7763f16c0f
|
薪资账套薪资项目编辑功能
|
2023-07-26 13:43:53 +08:00 |
|
Harryxzy
|
da18b0f884
|
薪资账套项目页面改造temp
|
2023-07-25 16:46:57 +08:00 |
|
Harryxzy
|
a8a414a48b
|
薪资账套项目页面改造temp
|
2023-07-24 17:11:19 +08:00 |
|
sy
|
ea4b603c36
|
薪酬系统-薪资档案、核算，列表不要显示离职日期、核算人员确认页面范围列表不要显示离职日期
|
2023-07-24 11:26:36 +08:00 |
|
Harryxzy
|
ad6a571310
|
自定义工资项目展示名fix
|
2023-07-21 11:08:54 +08:00 |
|
Harryxzy
|
19c297dfe9
|
自定义工资项目展示名fix补发
|
2023-07-20 15:57:27 +08:00 |
|
Harryxzy
|
fd3abc7f65
|
自定义工资项目展示名
|
2023-07-20 14:12:33 +08:00 |
|
钱涛
|
38f3461c64
|
v1
|
2023-07-20 14:05:19 +08:00 |
|
Harryxzy
|
b95663ada8
|
自定义工资项目展示名
|
2023-07-20 10:42:16 +08:00 |
|
钱涛
|
e75d5ab427
|
v1
|
2023-07-20 10:36:29 +08:00 |
|
钱涛
|
c0660e5476
|
暂存
|
2023-07-20 10:36:28 +08:00 |
|
sy
|
c7fe4fee23
|
Merge branches 'feature/230701-社保福利-核算记录的校验' and 'feature/230701-薪资核算-导出功能可选择字段导出' into release/2.9.2.2307.02
|
2023-07-20 10:19:40 +08:00 |
|
钱涛
|
01b02531ce
|
Merge branch 'feature/外部人员' into release/2.9.2.2307.02
# Conflicts:
# src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
# src/com/engine/salary/sys/service/SalarySysConfService.java
# src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
# src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java
|
2023-07-20 10:08:05 +08:00 |
|
Harryxzy
|
8e6bd24d0d
|
自定义工资项目展示名
|
2023-07-19 16:14:25 +08:00 |
|
Harryxzy
|
0a4c19fb36
|
Merge branch 'feature/230702-薪资项目-核算时隐藏' into release/2.9.2.2307.02
|
2023-07-19 11:11:46 +08:00 |
|
sy
|
4b503513f2
|
Merge remote-tracking branch 'remotes/origin/release/2.9.2.2307.02' into feature/230701-薪资核算-导出功能可选择字段导出
|
2023-07-19 10:04:58 +08:00 |
|
Harryxzy
|
78e5d37cf3
|
薪资项目-核算时隐藏
|
2023-07-18 17:22:42 +08:00 |
|
Harryxzy
|
db9a0e22eb
|
薪资项目-核算时隐藏fixbug
|
2023-07-18 17:00:09 +08:00 |