Harryxzy
|
7ed5e87d3f
|
港湾多语言
|
2024-04-03 10:32:03 +08:00 |
|
Harryxzy
|
c0562d9c6b
|
港湾多语言
|
2024-04-02 16:25:40 +08:00 |
|
Harryxzy
|
bfec936bc4
|
Merge branch 'release/2.12.1.2403.02' into custom/上海港湾-多语言
# Conflicts:
# src/com/engine/salary/biz/AddUpDeductionBiz.java
# src/com/engine/salary/biz/AddUpSituationBiz.java
# src/com/engine/salary/biz/OtherDeductionBiz.java
# src/com/engine/salary/biz/SIArchivesBiz.java
# src/com/engine/salary/biz/SICategoryBiz.java
# src/com/engine/salary/biz/SalaryArchiveItemBiz.java
# src/com/engine/salary/biz/SpecialAddDeductionBiz.java
# src/com/engine/salary/cmd/siarchives/SIArchivesTipsCmd.java
# src/com/engine/salary/entity/datacollection/AddUpDeduction.java
# src/com/engine/salary/entity/datacollection/AddUpSituation.java
# src/com/engine/salary/entity/datacollection/DataCollectionEmployee.java
# src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java
# src/com/engine/salary/entity/datacollection/po/OtherDeductionPO.java
# src/com/engine/salary/entity/extemp/po/ExtEmpPO.java
# src/com/engine/salary/entity/salaryBill/dto/SalaryTemplateListDTO.java
# src/com/engine/salary/entity/salaryBill/param/SalarySendInfoQueryParam.java
# src/com/engine/salary/entity/salaryBill/param/SalaryTemplateCopyParam.java
# src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java
# src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
# src/com/engine/salary/entity/salaryacct/po/SalaryAcctEmployeePO.java
# src/com/engine/salary/entity/salaryarchive/dto/SalaryArchiveListDTO.java
# src/com/engine/salary/entity/salarysob/dto/SalarySobItemDTO.java
# src/com/engine/salary/entity/siaccount/bo/InsuranceComparisonResultBO.java
# src/com/engine/salary/entity/sicategory/dto/ICategoryListDTO.java
# src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationDetailBO.java
# src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationAnnualListDTO.java
# src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationLaborListDTO.java
# src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationWageListDTO.java
# src/com/engine/salary/enums/OperateTypeEnum.java
# src/com/engine/salary/enums/salaryarchive/SalaryArchiveItemAdjustReasonEnum.java
# src/com/engine/salary/enums/salaryarchive/SalaryArchiveStatusEnum.java
# src/com/engine/salary/mapper/datacollection/EmployMapper.java
# src/com/engine/salary/mapper/datacollection/EmployMapper.xml
# src/com/engine/salary/report/service/impl/SalaryStatisticsItemServiceImpl.java
# src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java
# src/com/engine/salary/report/wrapper/SalaryStatisticsDimensionWrapper.java
# src/com/engine/salary/service/SalaryAcctResultService.java
# src/com/engine/salary/service/SalaryEmployeeService.java
# src/com/engine/salary/service/SalarySendService.java
# src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
# src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
# src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java
# src/com/engine/salary/service/impl/AttendQuoteServiceImpl.java
# src/com/engine/salary/service/impl/ColumnBuildServiceImpl.java
# src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java
# src/com/engine/salary/service/impl/SIAComparisonResultServiceImpl.java
# src/com/engine/salary/service/impl/SIAccountServiceImpl.java
# src/com/engine/salary/service/impl/SIArchivesServiceImpl.java
# src/com/engine/salary/service/impl/SIBalanceServiceImpl.java
# src/com/engine/salary/service/impl/SICategoryServiceImpl.java
# src/com/engine/salary/service/impl/SIExportServiceImpl.java
# src/com/engine/salary/service/impl/SIImportServiceImpl.java
# src/com/engine/salary/service/impl/SISchemeServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
# src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
# src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
# src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
# src/com/engine/salary/service/impl/SalaryItemServiceImpl.java
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobAdjustRuleServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobCheckRuleServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobRangeServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobServiceImpl.java
# src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java
# src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java
# src/com/engine/salary/service/impl/SysSalaryItemServiceImpl.java
# src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java
# src/com/engine/salary/service/impl/TaxAgentServiceImpl.java
# src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java
# src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
# src/com/engine/salary/util/SalaryI18nUtil.java
# src/com/engine/salary/util/page/SalaryPageUtil.java
# src/com/engine/salary/web/SIExportController.java
# src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java
# src/com/engine/salary/wrapper/SalaryFormulaWrapper.java
# src/com/engine/salary/wrapper/SalarySendWrapper.java
# src/com/engine/salary/wrapper/SalaryTemplateWrapper.java
|
2024-03-28 15:47:11 +08:00 |
|
Harryxzy
|
0c42e1cb35
|
同步社保、薪资档案起始发薪日为入职日定时任务
|
2024-03-14 14:05:36 +08:00 |
 钱涛
|
836947725f
|
切换了elog位置
|
2024-03-12 14:34:44 +08:00 |
|
Harryxzy
|
8984369343
|
薪资档案、社保档案查看日志
|
2024-03-05 15:15:20 +08:00 |
|
Harryxzy
|
efa556ddd9
|
操作日志修复
|
2024-02-29 11:31:18 +08:00 |
|
Harryxzy
|
89787332e3
|
操作日志修复
|
2024-02-28 18:03:55 +08:00 |
sy
|
1654e041b9
|
薪酬系统-福利档案，相关功能操作日志逻辑优化
|
2024-02-22 15:23:59 +08:00 |
|
sy
|
75dd4235af
|
薪酬系统-福利台账，补缴、补差、退差页相关功能操作日志添加
|
2024-02-22 09:33:35 +08:00 |
|
sy
|
cfb82cb9b2
|
薪酬系统-福利方案、档案、台账，相关实现类代码梳理，去除sqlsession形式的mpper调用
|
2024-02-19 17:27:42 +08:00 |
|
sy
|
6a79b22c17
|
薪酬系统-福利档案，增加操作日志
|
2024-02-07 17:39:26 +08:00 |
|
sy
|
306af48291
|
薪酬系统-福利档案，SICategoryBiz、SISchemeBiz方法迁移到对应是实现类，并修改调用方相关代码
|
2024-02-04 10:11:10 +08:00 |
|
sy
|
9074fb46fc
|
薪酬系统-福利档案，SIArchivesBiz方法迁移到对应是实现类，并修改调用方相关代码
|
2024-02-02 15:23:26 +08:00 |
|
sy
|
f5d21042c8
|
Merge remote-tracking branch 'remotes/origin/feature/240101-减员action优化以及福利档案拷贝action开发' into release/2.10.1.2401.01
|
2024-01-31 16:32:45 +08:00 |
|
sy
|
b1d3d2c445
|
薪酬系统-福利档案，复制action开发
|
2024-01-30 14:31:21 +08:00 |
|
sy
|
c4adecf436
|
薪酬系统-福利档案，减员action优化
|
2024-01-29 11:30:04 +08:00 |
|
sy
|
4da07b9e80
|
薪酬系统-福利档案、台账，基数调整记录列表查询增加分权，台账查询条件支持个税扣缴义务人多选
|
2024-01-24 14:35:55 +08:00 |
|
sy
|
1287a97fe5
|
薪酬系统-福利档案，导入模板下载、导入、基数调整记录功能，根据区分个人和公司福利基数逻辑改造
|
2023-12-07 09:41:46 +08:00 |
|
sy
|
ec8cb6214d
|
薪酬系统-福利档案，档案明细编辑保存功能改造，适配福利档案福利基数拆分个人和公司需求
|
2023-12-06 14:04:12 +08:00 |
|
sy
|
329f9e85bf
|
薪酬系统-多语言， 合并231102产品分支代码，并处理冲突
|
2023-12-01 12:46:43 +08:00 |
|
sy
|
efadc32622
|
Merge remote-tracking branch 'remotes/origin/release/2.9.8.2311.02' into feature/salary_i18
# Conflicts:
# src/com/engine/salary/biz/AddUpDeductionBiz.java
# src/com/engine/salary/biz/AddUpSituationBiz.java
# src/com/engine/salary/biz/OtherDeductionBiz.java
# src/com/engine/salary/biz/SalaryArchiveItemBiz.java
# src/com/engine/salary/entity/salaryBill/param/SalaryTemplateSaveParam.java
# src/com/engine/salary/entity/salaryformula/dto/SalaryFormulaEmployeeDTO.java
# src/com/engine/salary/report/entity/bo/SalaryStatisticsReportBO.java
# src/com/engine/salary/report/enums/UnitTypeEnum.java
# src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
# src/com/engine/salary/service/impl/SISchemeServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
# src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java
# src/com/engine/salary/service/impl/SalaryBillServiceImpl.java
# src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
# src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
# src/com/engine/salary/util/excel/ExcelUtilPlus.java
# src/com/engine/salary/web/SIArchivesController.java
# src/com/engine/salary/web/SISchemeController.java
# src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java
# src/com/engine/salary/wrapper/SalaryTemplateWrapper.java
|
2023-11-30 16:48:22 +08:00 |
|
sy
|
1c0b00d163
|
薪酬系统-福利档案，福利档案基数调整记录列表查询入参调整
|
2023-10-23 18:07:37 +08:00 |
|
sy
|
96bc325b43
|
薪酬系统-福利档案，福利档案基数调整记录列表查询入参和返回数据调整
|
2023-10-18 15:13:08 +08:00 |
|
sy
|
9ac549c06a
|
薪酬系统-福利档案，福利档案基数调整记录列表查询
|
2023-10-18 13:34:05 +08:00 |
|
sy
|
05fd1a0e71
|
Merge remote-tracking branch 'remotes/origin/release/2.9.6.2310.01' into feature/salary_i18
# Conflicts:
# src/com/engine/salary/biz/SIAccountBiz.java
# src/com/engine/salary/biz/SIArchivesBiz.java
# src/com/engine/salary/biz/SISchemeBiz.java
# src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java
# src/com/engine/salary/entity/salaryBill/param/SalaryBaseSetSaveParam.java
# src/com/engine/salary/enums/salaryformula/SalarySQLReferenceEnum.java
# src/com/engine/salary/enums/salarysob/SalaryEmployeeStatusEnum.java
# src/com/engine/salary/service/impl/ColumnBuildServiceImpl.java
# src/com/engine/salary/service/impl/ExtEmpServiceImpl.java
# src/com/engine/salary/service/impl/SIAComparisonResultServiceImpl.java
# src/com/engine/salary/service/impl/SIAccountServiceImpl.java
# src/com/engine/salary/service/impl/SICompensationServiceImpl.java
# src/com/engine/salary/service/impl/SIExportServiceImpl.java
# src/com/engine/salary/service/impl/SIImportServiceImpl.java
# src/com/engine/salary/service/impl/SISchemeServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
# src/com/engine/salary/service/impl/SalaryBillServiceImpl.java
# src/com/engine/salary/service/impl/SalaryFormulaServiceImpl.java
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
# src/com/engine/salary/wrapper/SalaryFormulaWrapper.java
# src/com/engine/salary/wrapper/SalaryItemWrapper.java
|
2023-10-08 12:11:06 +08:00 |
|
sy
|
3e7180a25e
|
Merge remote-tracking branch 'remotes/origin/feature/230901-福利档案-非系统人员tab' into feature/230901-福利台账-调差，支持一个人存在多个调差记录
|
2023-09-08 16:57:32 +08:00 |
|
sy
|
ec406b7f8a
|
薪酬系统-福利档案，福利档案编辑并减员、编辑并增员action
|
2023-09-08 16:57:09 +08:00 |
|
sy
|
f6094cbc7a
|
薪酬系统-福利档案，非系统人员tab页列表
|
2023-09-06 10:04:58 +08:00 |
|
sy
|
bf48341655
|
薪酬系统-福利档案，全量增减员过滤掉非系统人员
|
2023-08-30 15:10:25 +08:00 |
|
sy
|
63023ae8e6
|
薪酬系统-福利档案、台账，档案增加分部字段、tab计数过滤非系统人员、补差取消部分字段展示
|
2023-08-17 11:31:38 +08:00 |
|
sy
|
e4f0746650
|
薪酬系统-多语言，拉取0801分支改动，适配部分中文表述
|
2023-08-14 11:29:36 +08:00 |
|
sy
|
baf1da3edd
|
Merge remote-tracking branch 'remotes/origin/release/2.9.3.2308.01' into feature/salary_i18
# Conflicts:
# src/com/engine/salary/biz/SIArchivesBiz.java
# src/com/engine/salary/entity/salaryBill/param/SalaryTemplateSaveParam.java
# src/com/engine/salary/entity/salaryacct/dto/SalaryAccEmployeeListDTO.java
# src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveBO.java
# src/com/engine/salary/entity/salaryitem/bo/SalaryItemBO.java
# src/com/engine/salary/entity/salaryitem/dto/SalaryItemSobListDTO.java
# src/com/engine/salary/entity/salarysob/bo/SalarySobItemAggregateBO.java
# src/com/engine/salary/entity/salarysob/dto/SalarySobItemDTO.java
# src/com/engine/salary/enums/SalaryValueTypeEnum.java
# src/com/engine/salary/service/impl/SIAccountServiceImpl.java
# src/com/engine/salary/service/impl/SIImportServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
# src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java
|
2023-08-14 10:01:21 +08:00 |
|
sy
|
5925bd5600
|
薪酬系统-福利档案，增量数据处理-新增福利档案相关日志添加开关
|
2023-08-02 16:39:20 +08:00 |
|
sy
|
0749ab9d5b
|
薪酬系统-福利档案，增量数据处理中相关日志添加开关
|
2023-08-02 16:31:59 +08:00 |
|
sy
|
109028e645
|
薪酬系统-福利档案，增量数据处理添加日志若干
|
2023-08-02 16:08:12 +08:00 |
|
sy
|
f2091cbba5
|
薪酬系统-福利档案，新增档案逻辑添加日志2
|
2023-07-31 09:54:48 +08:00 |
|
sy
|
4b1b1077db
|
薪酬系统-福利档案，新增档案逻辑添加日志
|
2023-07-28 15:42:37 +08:00 |
|
sy
|
70ff1295f0
|
Merge remote-tracking branch 'remotes/origin/release/2.9.2.2307.02' into feature/salary_i18
# Conflicts:
# src/com/engine/salary/biz/SIArchivesBiz.java
# src/com/engine/salary/entity/salaryBill/param/SalaryTemplateSaveParam.java
# src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java
# src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
# src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
# src/com/engine/salary/service/impl/SalaryItemServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobServiceImpl.java
# src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java
|
2023-07-14 09:42:34 +08:00 |
|
sy
|
a55ca5182e
|
Merge remote-tracking branch 'remotes/origin/fix/salaryExportBug-0706' into release/2.9.1.2307.01
|
2023-07-11 09:59:29 +08:00 |
|
sy
|
b705161492
|
薪酬系统-薪资核算、薪资档案、福利档案，高级搜索功能问题修复
|
2023-07-10 14:33:43 +08:00 |
|
sy
|
65da8930a1
|
薪酬系统-多语言，枚举类defaultLabel值获取多语言环境下的对应值的逻辑优化
|
2023-07-05 18:04:42 +08:00 |
|
Harryxzy
|
2735661b4a
|
删除薪资档案
|
2023-06-29 10:35:55 +08:00 |
|
sy
|
c24572d911
|
薪酬系统-国际化，转义调用使用带有language字段的方法，并处理相关逻辑
|
2023-06-21 14:51:41 +08:00 |
|
sy
|
eb7014663e
|
Merge remote-tracking branch 'remotes/origin/master' into feature/salary_i18
# Conflicts:
# src/com/engine/salary/biz/SIArchivesBiz.java
# src/com/engine/salary/entity/siaccount/bo/InsuranceComparisonResultBO.java
# src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
# src/com/engine/salary/service/impl/SIAccountServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
# src/com/engine/salary/wrapper/TaxAgentSubAdminWrapper.java
|
2023-05-06 17:00:00 +08:00 |
|
sy
|
c8fd57aaad
|
薪酬系统-多语言配置，适配部分中文字符串0426
|
2023-04-26 17:57:53 +08:00 |
|
sy
|
49c499e7d6
|
薪酬系统-多语言配置，适配部分中文字符串0425
|
2023-04-25 18:03:11 +08:00 |
|
sy
|
7ec54ea909
|
薪酬系统-多语言配置，适配部分中文字符串0424，调整福利台账线下对比导入相关逻辑
|
2023-04-24 18:22:31 +08:00 |
|
sy
|
1f7c271519
|
薪酬系统-福利档案，待减员tab页删除待办，添加个税扣缴义务人范围过滤
|
2023-04-24 14:47:28 +08:00 |
|
sy
|
eb8964624a
|
薪酬系统-多语言配置，调整实现类文件中复杂中文表述的拼接细节
|
2023-04-20 17:06:23 +08:00 |