 钱涛
|
5f3c5f82b8
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-06-18 13:33:24 +08:00 |
|
钱涛
|
a8c6e8e59e
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-06-18 13:32:41 +08:00 |
|
钱涛
|
de5caded9e
|
修复工资单性别问题
|
2025-06-18 13:32:12 +08:00 |
|
钱涛
|
f3577d3ddd
|
Merge branch 'feature/数据推送' into release/个税&业务线
# Conflicts:
# src/com/engine/salary/constant/SalaryDefaultTenantConstant.java
# src/com/engine/salary/entity/datacollection/po/OtherDeductionPO.java
# src/com/engine/salary/entity/salarysob/param/SalarySobListQueryParam.java
# src/com/engine/salary/mapper/datacollection/EmployMapper.java
# src/com/engine/salary/mapper/datacollection/EmployMapper.xml
# src/com/engine/salary/service/AddUpDeductionService.java
# src/com/engine/salary/service/OtherDeductionService.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/SalaryAcctRecordServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobServiceImpl.java
# src/com/engine/salary/web/SalarySobController.java
# src/com/engine/salary/wrapper/SalarySobWrapper.java
|
2025-02-12 14:00:43 +08:00 |
|
钱涛
|
ce098fcd89
|
Merge branch 'release/2.17.1.2411.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/SalarySobServiceImpl.java
# src/com/engine/salary/web/SalarySobController.java
# src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java
# src/com/engine/salary/wrapper/SalarySobItemWrapper.java
|
2024-11-19 13:29:22 +08:00 |
|
钱涛
|
5a520a367a
|
Merge branch 'release/2.17.1.2411.01' into feature/权限
# Conflicts:
# resource/wiki/常用查询.md
# src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java
# src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
# src/com/engine/salary/entity/salaryarchive/dto/SalaryArchiveListDTO.java
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
|
2024-11-13 11:10:27 +08:00 |
|
钱涛
|
fb8595ac00
|
次账号规则
|
2024-10-16 18:20:11 +08:00 |
|
钱涛
|
d3050117d1
|
支持次账号
|
2024-10-15 14:24:37 +08:00 |
|
钱涛
|
84cb57ccd7
|
Merge branch 'release/2.15.1.2407.01' into feature/权限
|
2024-08-05 17:23:47 +08:00 |
|
钱涛
|
4b85b447c5
|
Merge branch 'release/2.15.1.2407.01' into release/个税版本
|
2024-08-01 11:47:05 +08:00 |
Harryxzy
|
8bbf8f3ff6
|
核算时编辑职称bug
|
2024-08-01 10:52:44 +08:00 |
|
钱涛
|
a8b487c94b
|
Merge branch 'release/2.15.1.2407.01' into feature/权限
# Conflicts:
# src/com/engine/salary/mapper/datacollection/EmployMapper.java
# src/com/engine/salary/mapper/datacollection/EmployMapper.xml
# src/com/engine/salary/service/SalaryEmployeeService.java
# src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
|
2024-08-01 10:16:05 +08:00 |
|
钱涛
|
1473f72bd0
|
Merge branch 'release/2.15.1.2407.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/mapper/datacollection/EmployMapper.java
# src/com/engine/salary/mapper/datacollection/EmployMapper.xml
# src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.java
# src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
# src/com/engine/salary/service/SalaryAcctEmployeeService.java
# src/com/engine/salary/service/SalaryEmployeeService.java
# src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
# src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
|
2024-07-31 13:27:15 +08:00 |
|
钱涛
|
76543c6021
|
成员同步
|
2024-07-26 16:35:51 +08:00 |
|
Harryxzy
|
bdd27bcfc6
|
核算时编辑人员组织信息
|
2024-07-25 14:04:14 +08:00 |
|
钱涛
|
7db62ab647
|
Merge branch 'release/2.14.5.2406.03' into release/个税版本
# Conflicts:
# src/com/engine/salary/entity/salaryacct/bo/CalculateFormulaVarBO.java
# src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
|
2024-07-10 17:05:06 +08:00 |
|
Harryxzy
|
b26663889d
|
Merge branch 'fix/240603_薪资明细导出排序' into release/2.14.5.2406.03
|
2024-06-26 11:33:32 +08:00 |
|
Harryxzy
|
933fc8ae65
|
报表分享支持次账号
|
2024-06-26 11:33:12 +08:00 |
|
钱涛
|
0c0c754a9d
|
人员信息快照
|
2024-06-18 11:01:58 +08:00 |
|
钱涛
|
f595b1782a
|
Merge branch 'release/2.14.3.2406.01' into release/个税版本2.14.3.2406.01
|
2024-05-28 11:29:37 +08:00 |
|
钱涛
|
11802dad91
|
根据身份证导入
|
2024-05-28 11:18:19 +08:00 |
|
钱涛
|
04978dd8e6
|
Merge branch 'release/2.14.1.2405.01' into release/个税版本
|
2024-05-13 14:01:22 +08:00 |
|
钱涛
|
6d4265acf1
|
职称显示为中午
|
2024-05-08 15:31:36 +08:00 |
|
钱涛
|
ec27cf5a08
|
Merge branch 'release/2.13.1.2404.02' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/AddUpDeductionService.java
# src/com/engine/salary/wrapper/AddUpDeductionWrapper.java
|
2024-05-08 11:17:40 +08:00 |
|
Harryxzy
|
e7c46bc5e8
|
优化同步离职日期
|
2024-04-26 15:13:54 +08:00 |
|
钱涛
|
5f64acc269
|
Merge branch 'release/2.12.1.2403.02' into release/个税版本
# Conflicts:
# src/com/engine/salary/mapper/datacollection/EmployMapper.java
# src/com/engine/salary/mapper/datacollection/EmployMapper.xml
# src/com/engine/salary/mapper/extemp/ExternalEmployeeMapper.java
# src/com/engine/salary/service/ExtEmpService.java
# src/com/engine/salary/service/SalaryEmployeeService.java
# src/com/engine/salary/service/impl/ExtEmpServiceImpl.java
# src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
|
2024-03-29 14:37:00 +08:00 |
|
Harryxzy
|
5d2cc92bf8
|
Merge branch 'feature/240302-薪资明细表' into release/2.12.1.2403.02
# Conflicts:
# src/com/engine/salary/mapper/datacollection/EmployMapper.java
# src/com/engine/salary/mapper/datacollection/EmployMapper.xml
# src/com/engine/salary/service/SalaryEmployeeService.java
# src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
|
2024-03-29 10:49:39 +08:00 |
|
Harryxzy
|
e3c528c649
|
薪资明细表
|
2024-03-25 16:08:34 +08:00 |
|
Harryxzy
|
25c2e2f1c1
|
其他维度
|
2024-03-22 15:23:03 +08:00 |
|
Harryxzy
|
3a9b772cb9
|
人员信息报送增加模糊查询
|
2024-02-27 15:16:13 +08:00 |
sy
|
a8e118b33a
|
薪酬系统-非系统人员管理，导入时增加对多级部门的识别
|
2023-09-07 15:11:10 +08:00 |
|
sy
|
f6094cbc7a
|
薪酬系统-福利档案，非系统人员tab页列表
|
2023-09-06 10:04:58 +08:00 |
|
Harryxzy
|
64f64c4f89
|
自动同步离职人员结束发薪日期
|
2023-08-30 15:34:54 +08:00 |
|
Harryxzy
|
c1893f9152
|
自动同步结束发薪日期temp
|
2023-08-30 10:41:00 +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 |
|
sy
|
6dd6eca3bf
|
薪酬系统-人员匹配，优化全量人力表人员查询sql
|
2023-08-04 15:07:41 +08:00 |
|
sy
|
07eb966c18
|
薪酬系统-非系统人员管理，非系统人员导入逻辑优化
|
2023-08-04 10:02:06 +08:00 |
|
sy
|
007d6df3cd
|
薪酬系统-非系统人员管理，非系统人员导入
|
2023-07-28 10:12:59 +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 |
|
钱涛
|
2d8b4b07d0
|
Merge branch 'release/2.7.4.2304.02' into feature/报表
# Conflicts:
# src/com/engine/salary/biz/SIArchivesBiz.java
|
2023-04-28 10:49:33 +08:00 |
|
钱涛
|
d36cfe31b3
|
报表暂存
|
2023-04-27 16:05:03 +08:00 |
|
钱涛
|
14fca43e18
|
暂存
|
2023-04-26 15:17:08 +08:00 |
|
钱涛
|
36863c3695
|
报表
|
2023-04-23 10:14:32 +08:00 |
|
钱涛
|
d2b304e690
|
全量数据
|
2023-04-20 18:04:18 +08:00 |
|
钱涛
|
135530d3b7
|
全量数据
|
2023-04-20 17:55:37 +08:00 |
|
钱涛
|
a423790a35
|
获取人员信息
|
2023-03-06 17:57:20 +08:00 |
|
钱涛
|
0b2c01fb4c
|
人员信息获取
|
2022-11-25 15:54:31 +08:00 |
|
sy
|
75a7497a07
|
Merge remote-tracking branch 'remotes/origin/feature/v3-siAccountRecession-1117' into release/2.3.1.2211.04
# Conflicts:
# src/com/engine/salary/mapper/datacollection/EmployMapper.java
|
2022-11-25 13:55:29 +08:00 |
|
钱涛
|
264edf1bf2
|
同步人员范围
|
2022-11-22 15:37:07 +08:00 |
|
sy
|
96a440a9a7
|
薪酬系统-福利台账，退差数据新增时的可选择人员列表v1
|
2022-11-21 15:27:15 +08:00 |