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 |
 钱涛
|
f23b23cd92
|
优化IF解释
|
2024-03-14 10:25:39 +08:00 |
|
钱涛
|
83a41da11d
|
日志组件
|
2023-12-21 14:30:21 +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 |
|
钱涛
|
4bf60c0370
|
公式负数符号特殊处理
|
2023-10-31 09:41:02 +08:00 |
|
钱涛
|
0ecb3a3977
|
短路处理
|
2023-10-18 16:01:37 +08:00 |
|
sy
|
9c24559db8
|
薪酬系统-多语言，翻译部分中文表述，并更新多语言译文sql脚本，修复工资单详情页显示，修复薪酬报表显示
|
2023-10-11 17:17:19 +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 |
|
钱涛
|
d9c56a0da4
|
修复switchs函数数据问题
|
2023-09-19 11:24:41 +08:00 |
|
钱涛
|
283485929f
|
超时提醒
|
2023-08-31 15:31:34 +08:00 |
|
钱涛
|
feeb3d21f2
|
公式检测
|
2023-08-31 14:39:58 +08:00 |
|
钱涛
|
c1db3883b0
|
核算时暴露日期解析异常
|
2023-08-27 20:10:31 +08:00 |
|
sy
|
8b1b52a6f2
|
薪酬系统-多语言，适配部分中文表述、薪资项目中excel函数多语言
|
2023-08-09 16:20:32 +08:00 |
|
钱涛
|
0472c7b757
|
显示字段管理默认使用列
报表空数据处理
|
2023-06-01 11:05:15 +08:00 |
|
钱涛
|
0734b5ce01
|
公式des
|
2023-05-26 15:40:08 +08:00 |
|
钱涛
|
ff8dcf1769
|
核算异常信息
|
2023-05-17 17:38:12 +08:00 |
|
钱涛
|
fb271f435a
|
公式方法改造
|
2023-05-15 10:00:59 +08:00 |
|
钱涛
|
d51c89bb82
|
公式方法改造
|
2023-05-15 09:28:22 +08:00 |
|
钱涛
|
3840f26464
|
公式异常处理
|
2023-05-10 18:55:23 +08:00 |
|
钱涛
|
197506b72b
|
适配if
|
2023-05-08 14:12:33 +08:00 |
|
钱涛
|
ccec800a75
|
公式升级
|
2023-05-08 11:21:09 +08:00 |
|
钱涛
|
3e8ac01049
|
公式描述
|
2023-05-04 18:07:35 +08:00 |
|
钱涛
|
ef171db128
|
公式函数
|
2023-04-19 19:28:05 +08:00 |
|
钱涛
|
9994ae3df9
|
公式
|
2023-04-19 15:22:42 +08:00 |
|
钱涛
|
34f33d21d8
|
公式
|
2023-04-19 13:35:35 +08:00 |
|
钱涛
|
a19b19e23d
|
公式
|
2023-04-19 10:15:01 +08:00 |
|
钱涛
|
5ec4f9e649
|
暂存
|
2023-04-13 09:32:20 +08:00 |
|
钱涛
|
c4831a1612
|
支持外部数据源
|
2022-08-03 10:08:43 +08:00 |
|
钱涛
|
38a4c524f3
|
公式
|
2022-04-18 15:38:27 +08:00 |