Harryxzy
|
0bbdfd7ab2
|
Merge branch 'release/2.12.1.2403.02' into custom/上海港湾-多语言
# Conflicts:
# src/com/engine/salary/report/service/impl/SalaryStatisticsPushServiceImpl.java
# src/com/engine/salary/report/wrapper/SalaryStatisticsEmployeeWrapper.java
# src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
# src/com/engine/salary/service/impl/SIAccountServiceImpl.java
# src/com/engine/salary/service/impl/SIRepairServiceImpl.java
# src/com/engine/salary/service/impl/SalaryBillServiceImpl.java
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
# src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java
|
2024-04-03 10:47:53 +08:00 |
|
Harryxzy
|
c0562d9c6b
|
港湾多语言
|
2024-04-02 16:25:40 +08:00 |
 钱涛
|
a06a54f574
|
去除objectUtil
|
2024-04-01 20:25:23 +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
|
649dd8f7d5
|
社保福利台账补缴新增
|
2024-03-19 17:23:53 +08:00 |
|
钱涛
|
836947725f
|
切换了elog位置
|
2024-03-12 14:34:44 +08:00 |
|
Harryxzy
|
20d7266db9
|
Merge branch 'feature/240201_社保福利台账导入字段缓存' into release/2.11.1.2402.01
# Conflicts:
# src/com/engine/salary/service/impl/SIAccountServiceImpl.java
|
2024-03-06 13:50:56 +08:00 |
|
钱涛
|
f325674673
|
Merge branch 'release/2.11.1.2402.01' into feature/操作日志组件
|
2024-03-04 09:41:35 +08:00 |
|
Harryxzy
|
5485f7d260
|
社保福利台账导入，表单字段缓存
|
2024-03-01 17:40:19 +08:00 |
|
钱涛
|
8ae06f27b8
|
fix导入性能，导入方法类型改完外层引用
|
2024-02-29 15:53:22 +08:00 |
|
钱涛
|
f11d6a035c
|
去除pagehelper jar包
|
2024-02-26 15:40:52 +08:00 |
sy
|
624c7db09f
|
薪酬系统-福利台账，核算功能操作日志逻辑添加
|
2024-02-23 16:11:11 +08:00 |
|
sy
|
dce7f684a5
|
薪酬系统-福利台账，列表分权问题修复
|
2024-02-23 11:34:48 +08:00 |
|
sy
|
75dd4235af
|
薪酬系统-福利台账，补缴、补差、退差页相关功能操作日志添加
|
2024-02-22 09:33:35 +08:00 |
|
sy
|
088a5c1d72
|
薪酬系统-福利台账，正常缴纳页相关功能操作日志添加
|
2024-02-20 16:50:45 +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
|
78f96c5008
|
薪酬系统，拉取20240101分支更新内容，并处理冲突
|
2024-01-25 13:37:35 +08:00 |
|
sy
|
56c9557b3a
|
Merge remote-tracking branch 'remotes/origin/release/2.10.1.2401.01' into feature/240101工资单模板复制优化及福利基数调整记录优化
# Conflicts:
# src/com/engine/salary/service/impl/SIAccountServiceImpl.java
|
2024-01-25 11:43:11 +08:00 |
|
钱涛
|
6fc8d8fdee
|
去除达梦驱动
|
2024-01-25 11:38:38 +08:00 |
|
sy
|
4da07b9e80
|
薪酬系统-福利档案、台账，基数调整记录列表查询增加分权，台账查询条件支持个税扣缴义务人多选
|
2024-01-24 14:35:55 +08:00 |
|
sy
|
f236b8e655
|
薪酬系统-福利台账，核算相关方法梳理和优化
|
2024-01-19 11:35:11 +08:00 |
|
sy
|
29e5c27ffb
|
薪酬系统-福利台账，自动核算并归档任务类开发
|
2024-01-17 16:07:27 +08:00 |
|
sy
|
a5eb86ab06
|
薪酬系统-福利台账，线下对比导入功能优化，适配福利基数个人和公司导入
|
2023-12-21 13:33:21 +08:00 |
|
sy
|
8b0f04c020
|
薪酬系统-多语言，合并231201产品分支代码，并处理冲突，更新多语言译文脚本，将多个脚本合并为一个
|
2023-12-13 16:43:51 +08:00 |
|
sy
|
538633ece0
|
Merge remote-tracking branch 'remotes/origin/release/2.9.9.2312.01' into feature/salary_i18
# Conflicts:
# src/com/engine/salary/biz/SIAccountBiz.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/dto/SalaryAcctRecordListDTO.java
# src/com/engine/salary/entity/salarysob/bo/SalarySobItemAggregateBO.java
# src/com/engine/salary/service/impl/SIAccountServiceImpl.java
# src/com/engine/salary/service/impl/SIRepairServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
# src/com/engine/salary/util/page/SalaryPageUtil.java
# src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
|
2023-12-13 11:43:53 +08:00 |
|
sy
|
9d0d7a00fc
|
薪酬系统-福利台账，线下对比列表、导入、导出，适配拆分福利档案个人和公司基数逻辑
|
2023-12-08 18:06:54 +08:00 |
|
sy
|
1c5249c76e
|
薪酬系统-福利台账，福利核算、明细列表、导出数据，适配拆分福利档案个人和公司基数逻辑
|
2023-12-08 11:16:18 +08:00 |
|
sy
|
362c4d4459
|
薪酬系统-福利台账，正常缴纳和补缴中未设置缴纳的福利项导入校验优化，忽略为null的福利类缴纳map
|
2023-12-05 10:21:47 +08:00 |
|
sy
|
cecbd16508
|
薪酬系统-福利台账，正常缴纳和补缴中未设置缴纳的福利项，不允许导入核算数据
|
2023-12-04 15:10:46 +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
|
eaa8a45376
|
薪酬系统-福利台账，编辑功能带出福利项数据逻辑优化，增加缴纳对象（公司或个人）标志字段
|
2023-11-29 13:50:25 +08:00 |
|
sy
|
ce8ac2c125
|
薪酬系统-福利台账，编辑功能带出福利项数据逻辑优化，增加福利类别标志字段
|
2023-11-29 11:04:14 +08:00 |
|
sy
|
bf99fd81c6
|
薪酬系统-福利核算，补差数据新增功能接口
|
2023-11-24 17:42:34 +08:00 |
|
sy
|
c8e3d6312b
|
薪酬系统-福利核算，补差待编辑福利项列表功能接口，补缴第三种方式的待编辑福利项获取逻辑优化，补差编辑tab页待编辑福利项获取逻辑优化
|
2023-11-24 14:05:03 +08:00 |
|
sy
|
8c514ffd7d
|
薪酬系统-多语言，福利险种更改险种名称获取逻辑（适配多语言）
|
2023-11-13 16:47:44 +08:00 |
|
sy
|
f8f5ea7782
|
薪酬系统-福利档案，薪资核算时调用福利核算数据查询时人员ids分片
|
2023-10-20 09:50:44 +08:00 |
|
sy
|
9c24559db8
|
薪酬系统-多语言，翻译部分中文表述，并更新多语言译文sql脚本，修复工资单详情页显示，修复薪酬报表显示
|
2023-10-11 17:17:19 +08:00 |
|
sy
|
b168a5770d
|
薪酬系统-多语言，适配部分中文表述20231009-02
|
2023-10-09 17:55:42 +08:00 |
|
sy
|
7b0c332802
|
薪酬系统-多语言，拉取release231001分支改动，并处理冲突
|
2023-10-09 13:26:28 +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
|
f4883ad87c
|
Merge remote-tracking branch 'remotes/origin/feature/230901-社保福利方案搜索功能' into release/2.9.5.2309.01
|
2023-09-21 14:10:06 +08:00 |
|
sy
|
dc93a96c8d
|
薪酬系统-薪资核算，获取福利核算数据逻辑优化
|
2023-09-20 14:13:00 +08:00 |
|
sy
|
b276066b52
|
薪酬系统-福利台账，导入模板带出核算数据
|
2023-09-12 11:05:46 +08:00 |
|
sy
|
a8e118b33a
|
薪酬系统-非系统人员管理，导入时增加对多级部门的识别
|
2023-09-07 15:11:10 +08:00 |
|
sy
|
f6094cbc7a
|
薪酬系统-福利档案，非系统人员tab页列表
|
2023-09-06 10:04:58 +08:00 |
|
sy
|
4a7b04152b
|
薪酬系统-薪资核算，薪资项目函数增加福利基数信息
|
2023-08-18 13:30:42 +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
|
94972a589f
|
薪酬系统-多语言，薪资项目名称相关操作进行根据薪资项目自带labelId多语言适配
|
2023-08-11 18:06:09 +08:00 |