 钱涛
|
ef13d93fe1
|
Merge branch 'release/2.16.1.2410.01' into feature/权限
# Conflicts:
# src/com/engine/salary/entity/siaccount/po/InsuranceAccountBatchPO.java
|
2024-11-04 14:33:15 +08:00 |
|
钱涛
|
ad48063ca9
|
扣缴义务人和账套的人员范围支持编辑
|
2024-10-31 16:56:32 +08:00 |
|
钱涛
|
5ccee97429
|
新建账套携带各扣缴义务人人员范围
|
2024-09-04 13:59:00 +08:00 |
|
钱涛
|
f74ec99644
|
账套支持sql范围
|
2024-08-15 10:37:41 +08:00 |
|
钱涛
|
11802dad91
|
根据身份证导入
|
2024-05-28 11:18:19 +08:00 |
|
钱涛
|
1b3da7dfc0
|
身份证
|
2024-05-23 09:16:28 +08:00 |
Harryxzy
|
25c2e2f1c1
|
其他维度
|
2024-03-22 15:23:03 +08:00 |
|
Harryxzy
|
17428c621e
|
非系统人员范围操作日志
|
2024-03-07 14:23:12 +08:00 |
|
钱涛
|
f325674673
|
Merge branch 'release/2.11.1.2402.01' into feature/操作日志组件
|
2024-03-04 09:41:35 +08:00 |
|
钱涛
|
8ae06f27b8
|
fix导入性能，导入方法类型改完外层引用
|
2024-02-29 15:53:22 +08:00 |
|
Harryxzy
|
adff178a7c
|
义务人日志优化
|
2024-02-28 15:01:44 +08:00 |
|
Harryxzy
|
093cb34f77
|
操作日志fix some bugs
|
2024-02-23 15:11:56 +08:00 |
|
Harryxzy
|
dee20149bb
|
日志
|
2024-02-21 18:19:02 +08:00 |
|
钱涛
|
6fc8d8fdee
|
去除达梦驱动
|
2024-01-25 11:38:38 +08:00 |
|
Harryxzy
|
a3e281b3fe
|
修复非系统人员搜索不生效
|
2024-01-23 10:00:26 +08:00 |
sy
|
f6094cbc7a
|
薪酬系统-福利档案，非系统人员tab页列表
|
2023-09-06 10:04:58 +08:00 |
|
Harryxzy
|
bd1a6b7a9a
|
在个税扣缴义务人非系统人员添加人员时，会误删除正常人员范围在hrsa_tax_agent_emp中的数据
|
2023-08-28 22:22:00 +08:00 |
|
钱涛
|
89ecf0984d
|
fix外部人员
|
2023-07-12 09:45:00 +08:00 |
|
钱涛
|
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 |
|
钱涛
|
8612f0e5b2
|
Merge branch 'release/2.8.4.2306.02' into feature/短信验证码
|
2023-06-16 14:54:24 +08:00 |
|
钱涛
|
2480525fa6
|
修复同步档案bug
缓存公共接口
|
2023-06-15 10:44:31 +08:00 |
|
钱涛
|
57798a8e3e
|
短信验证码功能
|
2023-06-14 15:51:26 +08:00 |
|
Harryxzy
|
82ee707f16
|
employebiz改成employeeservice
|
2023-04-12 15:27:35 +08:00 |
|
钱涛
|
8430397d03
|
外部人员终极版
|
2023-03-16 16:10:29 +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 |
|
钱涛
|
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 |
|
钱涛
|
2d091dbd33
|
异步同步人员校验
|
2023-03-10 17:15:15 +08:00 |
|
钱涛
|
487dd9f972
|
非系统人员档案自动化
|
2023-03-08 16:36:47 +08:00 |
|
钱涛
|
a423790a35
|
获取人员信息
|
2023-03-06 17:57:20 +08:00 |
|
sy
|
0e164b7989
|
薪酬系统-社保福利，福利档案增量数据处理直接在个税扣缴义务人人员范围变更时触发，不需打开福利档案列表触发
|
2023-02-24 13:53:57 +08:00 |
|
Harryxzy
|
69dd9cc61c
|
个税扣缴义务人、薪资账套 导入添加员工状态导入功能
|
2023-02-08 17:48:14 +08:00 |
|
Harryxzy
|
6460edc013
|
去重
|
2023-01-11 09:47:57 +08:00 |
|
Harryxzy
|
fd470c56aa
|
薪资账套人员范围导入
|
2023-01-09 15:12:44 +08:00 |
|
Harryxzy
|
09ba495bf3
|
个税扣缴义务人批量导入功能
|
2023-01-09 10:01:47 +08:00 |
|
钱涛
|
fb39dbe0c4
|
流程生成人员范围
|
2022-12-07 20:16:14 +08:00 |
|
钱涛
|
0d417f1e49
|
流程生成人员范围
|
2022-12-07 20:15:52 +08:00 |
|
钱涛
|
1307f485eb
|
同步人员范围
|
2022-11-22 15:53:05 +08:00 |
|
钱涛
|
264edf1bf2
|
同步人员范围
|
2022-11-22 15:37:07 +08:00 |
|
Harryxzy
|
e3a2a52ab8
|
xzy-fix-薪资账套人员错误问题
|
2022-10-09 13:32:05 +08:00 |
|
钱涛
|
97763cc280
|
定时同步人员范围
|
2022-07-11 09:39:57 +08:00 |
|
钱涛
|
fc35eff75d
|
fix
|
2022-06-21 22:37:22 +08:00 |
|
钱涛
|
d09856c390
|
人员范围保存校验
|
2022-06-10 14:21:21 +08:00 |
|
钱涛
|
b8972bcd43
|
分权v3
|
2022-06-09 17:45:28 +08:00 |
|
钱涛
|
37a73b94df
|
同步人员
|
2022-06-01 17:45:49 +08:00 |
|
钱涛
|
e66c86d32c
|
fix
|
2022-06-01 15:18:10 +08:00 |
|
钱涛
|
efd31013cd
|
薪资账套分权
|
2022-05-31 21:05:59 +08:00 |