 钱涛
|
8430397d03
|
外部人员终极版
|
2023-03-16 16:10:29 +08:00 |
Harryxzy
|
e1b4927eaa
|
删除多余代码
|
2023-03-16 14:52:08 +08:00 |
sy
|
dc2cb5f448
|
薪酬系统-薪资核算，薪资核算和薪资档案导出excel通用格式改造
|
2023-03-16 13:51:41 +08:00 |
|
Harryxzy
|
b9c40955ac
|
Merge branch 'fix/AddUpSituationCantImport_0316' into release/2.7.1.2303.02
|
2023-03-16 11:38:38 +08:00 |
|
Harryxzy
|
cdf7dd916b
|
往期累计情况编辑
|
2023-03-16 11:37:43 +08:00 |
|
Harryxzy
|
6a7e5eacdc
|
社保福利台账合计列
|
2023-03-16 11:17:18 +08:00 |
|
Harryxzy
|
521de26b51
|
Merge branch 'fix/AddUpSituationCantImport_0316' into release/2.7.1.2303.02
|
2023-03-16 09:54:49 +08:00 |
|
Harryxzy
|
16cfe18b90
|
往期累计情况导入BUG
|
2023-03-16 09:53:46 +08:00 |
|
钱涛
|
62d124efb1
|
外部人员终极版
|
2023-03-15 22:48:01 +08:00 |
|
钱涛
|
81650888c7
|
非系统人员
|
2023-03-15 18:21:04 +08:00 |
|
钱涛
|
ace15ca7a1
|
非系统人员
|
2023-03-15 18:03:46 +08:00 |
|
Harryxzy
|
ca03e0785e
|
工资单发放详情导出没有部门信息
|
2023-03-15 17:09:02 +08:00 |
|
钱涛
|
50c15989c6
|
Merge branch 'release/2.7.1.2303.02' into feature/外部人员
|
2023-03-15 16:15:48 +08:00 |
|
Harryxzy
|
712f30ddfa
|
工资单发放详情合计列
|
2023-03-15 16:00:37 +08:00 |
|
Harryxzy
|
1f9597195f
|
外部人员-个税扣缴义务人service获取人员信息改变写法
|
2023-03-15 15:49:20 +08:00 |
|
Harryxzy
|
a9fb24145d
|
修复往期累计情况，无法导入编辑
|
2023-03-15 14:14:53 +08:00 |
|
Harryxzy
|
6418e4ad6e
|
往期累计情况，获取当月税款所属期数据无法导入bug，
|
2023-03-15 13:38:13 +08:00 |
|
钱涛
|
db09f8047e
|
注释
|
2023-03-15 11:04:54 +08:00 |
|
钱涛
|
6bb6e350a8
|
冲突
|
2023-03-15 10:43:05 +08:00 |
|
sy
|
3059829619
|
Merge remote-tracking branch 'remotes/origin/release/2.7.1.2303.02' into feature/v4-salaryExcelFormat-0328
|
2023-03-15 10:22:37 +08:00 |
|
sy
|
acc382b835
|
薪酬系统-薪资核算，核算导出excel格式改造
|
2023-03-15 10:20:46 +08:00 |
|
钱涛
|
c9f6b62b5a
|
Merge branch 'release/2.7.1.2303.02' into feature/外部人员
# Conflicts:
# src/com/engine/salary/biz/SIAccountBiz.java
# src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java
|
2023-03-15 10:15:49 +08:00 |
|
钱涛
|
6f9769bae2
|
手机号
|
2023-03-15 10:07:40 +08:00 |
|
钱涛
|
5b88cda35c
|
账套外部人员接入
|
2023-03-15 09:13:29 +08:00 |
|
钱涛
|
5f465aa914
|
外部人员范围列表和删除接口
|
2023-03-14 15:22:50 +08:00 |
|
钱涛
|
5c75b3cf8e
|
去除无用代码
|
2023-03-14 14:22:45 +08:00 |
|
钱涛
|
b54d754c4b
|
删除个税扣缴义务人人员范围改异步
|
2023-03-14 11:04:25 +08:00 |
|
钱涛
|
767fbe36f5
|
外部人员
|
2023-03-14 10:52:48 +08:00 |
|
Harryxzy
|
0c409c627c
|
employeeService查询外部 fixBug
|
2023-03-13 16:16:05 +08:00 |
|
Harryxzy
|
362f5abdf6
|
Merge remote-tracking branch 'origin/feature/外部人员' into feature/外部人员
|
2023-03-13 16:12:51 +08:00 |
|
Harryxzy
|
d5a97c8192
|
employeeService查询外部 fixBug
|
2023-03-13 16:12:10 +08:00 |
|
钱涛
|
ad616f80d3
|
Merge remote-tracking branch 'origin/feature/外部人员' into feature/外部人员
|
2023-03-13 16:04:28 +08:00 |
|
钱涛
|
a61b7ac7bc
|
外部人员
|
2023-03-13 16:04:19 +08:00 |
|
Harryxzy
|
7b0e1cb1f3
|
employeeService查询外部 fixBug
|
2023-03-13 15:57:12 +08:00 |
|
Harryxzy
|
32b1a2db48
|
employeeService查询外部
|
2023-03-13 15:53:56 +08:00 |
|
钱涛
|
2d091dbd33
|
异步同步人员校验
|
2023-03-10 17:15:15 +08:00 |
|
Harryxzy
|
351d892281
|
Merge branch 'fix/CancelSetPayEndDate' into release/2.7.1.2303.02
|
2023-03-10 15:43:24 +08:00 |
|
Harryxzy
|
7de5c1e175
|
Merge branch 'fix/V3_listShowChange_0309' into release/2.7.1.2303.02
|
2023-03-10 15:42:42 +08:00 |
|
Harryxzy
|
8dabfb28b9
|
个税扣缴义务人删除人员范围时，不设置最后发薪日期
|
2023-03-10 13:50:52 +08:00 |
|
钱涛
|
d8c13b70d2
|
内外部人员匹配标识
|
2023-03-08 18:01:19 +08:00 |
|
钱涛
|
cb6b53c6af
|
Merge remote-tracking branch 'origin/release/2.7.1.2303.02' into release/2.7.1.2303.02
|
2023-03-08 17:53:20 +08:00 |
|
钱涛
|
ff4dfe4dad
|
fix日期转换，申报表所属月不显示
|
2023-03-08 17:53:13 +08:00 |
|
sy
|
dbf9e878e5
|
Merge remote-tracking branch 'remotes/origin/feature/v4-addSiAcctLog-0309' into release/2.7.1.2303.02
|
2023-03-08 17:52:09 +08:00 |
|
Harryxzy
|
401947fabc
|
Merge branch 'fix/mySalaryBillNoWorkCode' into release/2.7.1.2303.02
|
2023-03-08 17:50:01 +08:00 |
|
钱涛
|
160116e946
|
Merge remote-tracking branch 'origin/feature/外部人员' into feature/外部人员
|
2023-03-08 16:37:11 +08:00 |
|
钱涛
|
487dd9f972
|
非系统人员档案自动化
|
2023-03-08 16:36:47 +08:00 |
|
钱涛
|
2c13c138a6
|
校验每次只能申报一个扣缴义务人
|
2023-03-07 17:44:21 +08:00 |
|
Harryxzy
|
4ce79438e6
|
工资单没有工号BUG
|
2023-03-07 17:43:51 +08:00 |
|
Harryxzy
|
5067d50722
|
EmployeeBiz修改调用方式-2
|
2023-03-07 17:20:30 +08:00 |
|
Harryxzy
|
068f7e6535
|
EmployeeBiz修改调用方式
|
2023-03-07 17:14:25 +08:00 |