 钱涛
|
aec6918c12
|
Merge branch 'release/2.9.1.2307.01' into feature/外部人员
# Conflicts:
# src/com/engine/salary/biz/EmployBiz.java
# src/com/engine/salary/biz/SIAccountBiz.java
# src/com/engine/salary/entity/salaryBill/dto/SalarySendDetailListDTO.java
# src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java
# src/com/engine/salary/mapper/archive/SalaryArchiveMapper.java
# src/com/engine/salary/service/SalaryEmployeeService.java
# src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
# src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
# src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java
# src/com/engine/salary/service/impl/SIAccountServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
# src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
# src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
# src/com/engine/salary/service/impl/SalarySendRangeServiceImpl.java
# src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java
# src/com/engine/salary/web/SalarySobController.java
# src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
# src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
# src/com/engine/salary/wrapper/SalarySendWrapper.java
# src/com/engine/salary/wrapper/TaxAgentSubAdminWrapper.java
# src/com/engine/salary/wrapper/TaxDeclarationWrapper.java
|
2023-07-11 16:08:15 +08:00 |
Harryxzy
|
2735661b4a
|
删除薪资档案
|
2023-06-29 10:35:55 +08:00 |
|
钱涛
|
8bde871286
|
档案返回列表状态
|
2023-06-12 15:36:27 +08:00 |
|
Harryxzy
|
74c5b4f19f
|
薪资项目 和 字段管理的排序
|
2023-06-01 17:52:31 +08:00 |
|
Harryxzy
|
601b90d188
|
薪资档案薪资项目排序
|
2023-05-31 09:55:24 +08:00 |
|
钱涛
|
220848e92d
|
档案项目正序排列
|
2023-05-26 11:15:40 +08:00 |
|
Harryxzy
|
82ee707f16
|
employebiz改成employeeservice
|
2023-04-12 15:27:35 +08:00 |
|
钱涛
|
62d124efb1
|
外部人员终极版
|
2023-03-15 22:48:01 +08:00 |
|
钱涛
|
ace15ca7a1
|
非系统人员
|
2023-03-15 18:03:46 +08:00 |
|
钱涛
|
a61b7ac7bc
|
外部人员
|
2023-03-13 16:04:19 +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 |
|
钱涛
|
1c93dab9f0
|
获取人员档案
|
2023-02-14 15:41:03 +08:00 |
|
钱涛
|
8b594c1882
|
自发起调薪流程
|
2023-02-13 14:53:35 +08:00 |
fcli
|
da47210b22
|
fix: 薪资档案根据薪资项目分权展示
|
2023-01-31 14:05:40 +08:00 |
|
钱涛
|
b39587e19d
|
单独调薪action
|
2022-12-06 18:08:50 +08:00 |
|
钱涛
|
d8f99abb18
|
调薪，调薪校验流程接口
|
2022-11-30 11:23:58 +08:00 |
|
钱涛
|
457fe51239
|
处理薪资档案重复数据
|
2022-11-07 17:05:50 +08:00 |
|
钱涛
|
2da0455c46
|
修复薪资档案个税扣缴义务人不显示的问题
处理历史数据改为异步
|
2022-11-07 15:11:24 +08:00 |
|
钱涛
|
104213fc04
|
1、提示优化
2、导入模板
3、定薪流程
|
2022-10-27 15:17:22 +08:00 |
|
钱涛
|
7a817af154
|
档案导入
|
2022-10-26 13:46:36 +08:00 |
|
钱涛
|
1f48539e1c
|
删除待定薪代办
删除待停薪代办
|
2022-10-18 16:44:31 +08:00 |
|
钱涛
|
4b37775f78
|
档案发薪设置
|
2022-10-18 09:43:58 +08:00 |
|
钱涛
|
77fc944491
|
获取保存档案配置表单
保存档案配置
|
2022-10-14 16:18:55 +08:00 |
|
钱涛
|
0e05185599
|
操作接口
|
2022-10-13 16:24:59 +08:00 |
|
钱涛
|
68076fc724
|
fix sqlserver增量数据空
|
2022-10-13 14:57:52 +08:00 |
|
钱涛
|
816885609d
|
薪资列表
|
2022-10-10 15:15:23 +08:00 |
|
钱涛
|
41203342d0
|
薪资列表
|
2022-10-10 14:58:29 +08:00 |
|
钱涛
|
90c18ec201
|
定薪
|
2022-09-20 18:02:45 +08:00 |
|
钱涛
|
243d8e0d6b
|
批量调薪前置校验
|
2022-09-07 16:35:57 +08:00 |
|
钱涛
|
8ff4e9e231
|
停薪操作
|
2022-09-07 09:45:37 +08:00 |
|
钱涛
|
3ced92cfc5
|
修复福利核算
|
2022-07-21 17:28:47 +08:00 |
|
钱涛
|
77ca4c2848
|
Merge branch 'develop' into feature/personIn2taxAgent
# Conflicts:
# src/com/engine/salary/service/SalaryArchiveService.java
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
# src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
|
2022-07-21 09:43:02 +08:00 |
|
钱涛
|
a721898d3d
|
薪资档案增加起始发薪和最后发薪
|
2022-07-18 18:08:59 +08:00 |
 liuliang
|
b9528442f9
|
薪酬档案导入对接流程-liuliang
|
2022-07-18 16:19:15 +08:00 |
|
liuliang
|
758a78996d
|
导入薪酬档案对接流程功能
|
2022-07-13 18:59:30 +08:00 |
|
钱涛
|
e66c86d32c
|
fix
|
2022-06-01 15:18:10 +08:00 |
|
钱涛
|
7ffc241b0a
|
管理
|
2022-05-31 21:48:00 +08:00 |
|
钱涛
|
efd31013cd
|
薪资账套分权
|
2022-05-31 21:05:59 +08:00 |
|
钱涛
|
99b5c36864
|
暂存
|
2022-05-31 16:41:11 +08:00 |
|
钱涛
|
f066d1ef64
|
fix档案分页
|
2022-05-25 13:13:03 +08:00 |
|
钱涛
|
5c2bb1bf58
|
入职日期改为String
|
2022-04-28 10:05:27 +08:00 |
|
钱涛
|
c537b7d944
|
补充列
|
2022-04-19 15:13:08 +08:00 |
MustangDeng
|
775b39074d
|
工资单发放-工资单发放信息列表
|
2022-04-14 16:11:44 +08:00 |
|
钱涛
|
70f3239e98
|
查询条件
|
2022-04-07 20:05:58 +08:00 |
|
钱涛
|
77229d18a0
|
列表
|
2022-04-01 14:13:04 +08:00 |
|
钱涛
|
f95d8a7d0d
|
暂存
|
2022-04-01 13:50:24 +08:00 |
|
钱涛
|
163963d463
|
fix bug
|
2022-03-31 18:41:41 +08:00 |
|
钱涛
|
a8732708a8
|
薪资档案导入
|
2022-03-31 15:41:55 +08:00 |
|
钱涛
|
4167cb55ee
|
限制薪资项目的删除
|
2022-03-30 20:27:17 +08:00 |