sy
|
b5eeb97d3d
|
Merge remote-tracking branch 'remotes/origin/master' into feature/salary_i18
# Conflicts:
# src/com/engine/salary/biz/SIAccountBiz.java
# src/com/engine/salary/biz/SIArchivesBiz.java
# src/com/engine/salary/entity/salaryBill/bo/SalaryTemplateBO.java
# src/com/engine/salary/entity/salaryBill/param/SalarySendWithdrawParam.java
# src/com/engine/salary/entity/salaryBill/param/SalaryTemplateSaveParam.java
# src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java
# src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
# src/com/engine/salary/entity/salaryitem/bo/SalaryItemBO.java
# src/com/engine/salary/entity/taxagent/bo/TaxAgentBO.java
# src/com/engine/salary/enums/salaryformula/SalaryFormulaReferenceEnum.java
# src/com/engine/salary/maintainer/salaryacct/SalaryAcctManager.java
# src/com/engine/salary/report/enums/UnitTypeEnum.java
# src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java
# src/com/engine/salary/report/wrapper/SalaryStatisticsDimensionWrapper.java
# src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
# src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
# src/com/engine/salary/service/impl/ColumnBuildServiceImpl.java
# src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java
# src/com/engine/salary/service/impl/SISchemeServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctProgressServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
# src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
# src/com/engine/salary/service/impl/SalaryFormulaServiceImpl.java
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
# src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java
# src/com/engine/salary/web/SalaryAcctController.java
# src/com/engine/salary/web/SalaryFormulaController.java
# src/com/engine/salary/web/SalaryProgressController.java
# src/com/engine/salary/web/SalarySobController.java
# src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java
# src/com/engine/salary/wrapper/SalarySobItemWrapper.java
|
2023-06-30 11:37:39 +08:00 |
|
sy
|
c24572d911
|
薪酬系统-国际化，转义调用使用带有language字段的方法，并处理相关逻辑
|
2023-06-21 14:51:41 +08:00 |
|
sy
|
12b4977067
|
薪酬系统-福利台账，退差新增逻辑优化
|
2023-06-13 15:43:10 +08:00 |
|
sy
|
b92cc5564f
|
薪酬系统-多语言配置，适配部分中文字符串0427
|
2023-04-27 18:00:04 +08:00 |
|
sy
|
7ec54ea909
|
薪酬系统-多语言配置，适配部分中文字符串0424，调整福利台账线下对比导入相关逻辑
|
2023-04-24 18:22:31 +08:00 |
fcli
|
eabc983100
|
feat: 加密统一，社保福利档案&薪资核算结果
|
2022-12-13 10:15:31 +08:00 |
|
sy
|
8bc16ae470
|
Merge branch 'master' into feature/v3-siAccountCompensation-1201
|
2022-11-28 14:58:23 +08:00 |
 钱涛
|
4b75ba67e9
|
人员分片
|
2022-11-25 14:48:49 +08:00 |
|
sy
|
366c1a8367
|
薪酬系统-福利台账，退差数据保存优化，分批查询
|
2022-11-25 14:43:45 +08:00 |
|
sy
|
eeea00a408
|
薪酬系统-福利台账，退差保存数据功能优化
|
2022-11-25 10:17:35 +08:00 |
|
sy
|
bc20d37797
|
薪酬系统-福利台账，退差保存数据来源增加个税扣缴义务人筛选
|
2022-11-24 20:35:51 +08:00 |
|
sy
|
e412be8d5e
|
薪酬系统-福利台账，退差数据编辑、删除后，刷新bill_batch表中统计数据
|
2022-11-24 14:19:58 +08:00 |
|
sy
|
a631ecc3d9
|
Merge branch 'feature/v3-siAccountRecession-1117' into feature/v3-siAccountCompensation-1201
|
2022-11-24 09:48:30 +08:00 |
|
sy
|
d976ede775
|
薪酬系统-福利台账，退差数据新增后，刷新bill_batch表中统计数据
|
2022-11-24 09:46:06 +08:00 |
|
sy
|
f1bd574c81
|
薪酬系统-福利台账，调差v2
|
2022-11-23 15:39:42 +08:00 |
|
sy
|
2b29813f6b
|
薪酬系统-福利台账，退差数据导出
|
2022-11-22 13:35:09 +08:00 |
|
sy
|
15477cc8d5
|
薪酬系统-福利台账，退差数据新增v3
|
2022-11-21 17:52:28 +08:00 |
|
sy
|
955f8c255e
|
薪酬系统-福利台账，退差数据新增v2
|
2022-11-21 16:25:26 +08:00 |
|
sy
|
96a440a9a7
|
薪酬系统-福利台账，退差数据新增时的可选择人员列表v1
|
2022-11-21 15:27:15 +08:00 |
|
sy
|
b647089eaf
|
薪酬系统-福利台账，退差数据新增功能v1
|
2022-11-15 17:58:37 +08:00 |