 钱涛
|
663e8748ae
|
港湾日志
|
2025-11-11 09:18:04 +08:00 |
Harryxzy
|
5ef5921a6a
|
港湾报表bug
|
2025-03-05 17:04:10 +08:00 |
|
Harryxzy
|
c87b561b7a
|
sql
|
2025-02-26 15:44:55 +08:00 |
|
Harryxzy
|
e2e247523a
|
港湾，汇率逻辑变更
|
2025-02-24 13:43:46 +08:00 |
|
Harryxzy
|
533606d908
|
港湾，汇率逻辑变更
|
2025-02-24 11:36:34 +08:00 |
|
Harryxzy
|
4a620d0394
|
港湾币种优化
|
2025-02-14 14:55:50 +08:00 |
|
Harryxzy
|
1c9ec2b943
|
港湾批量调薪 逻辑调整支持多义务人
|
2025-02-10 14:40:13 +08:00 |
|
Harryxzy
|
8c194074e7
|
港湾批量调薪 逻辑调整支持多义务人
|
2025-02-10 11:21:25 +08:00 |
|
Harryxzy
|
1732d41275
|
港湾币种需求
|
2025-01-21 15:23:30 +08:00 |
|
Harryxzy
|
b604dcea7d
|
港湾 优化
|
2025-01-05 15:40:50 +08:00 |
|
Harryxzy
|
a3b9621ee4
|
港湾 优化调薪为0 不调薪
|
2025-01-04 23:54:01 +08:00 |
|
Harryxzy
|
e12450aa56
|
港湾 批量调薪明细表3存储
|
2025-01-04 23:25:45 +08:00 |
|
Harryxzy
|
024481fa9e
|
港湾批量调薪，替换岗位
|
2025-01-03 10:09:45 +08:00 |
|
Harryxzy
|
19f0a02090
|
港湾多语言
|
2024-09-26 17:56:59 +08:00 |
|
Harryxzy
|
6dffa32aae
|
Merge branch 'custom/上海港湾-多语言-240912' into custom/上海港湾-多语言
|
2024-09-25 11:24:44 +08:00 |
|
Harryxzy
|
c59cf6644c
|
港湾批量调薪处理历史数据接口
|
2024-09-25 11:24:19 +08:00 |
|
Harryxzy
|
e01fd9bca6
|
往期累计新建\导入加密
|
2024-09-13 17:34:06 +08:00 |
|
Harryxzy
|
fa59b58cd0
|
上海港湾公式 考勤多语言临时处理
|
2024-09-12 18:52:54 +08:00 |
|
Harryxzy
|
e7de9d7d1e
|
港湾新批量调薪
|
2024-09-10 18:09:33 +08:00 |
|
Harryxzy
|
2f42845578
|
港湾多语言
|
2024-09-05 15:50:27 +08:00 |
|
Harryxzy
|
f529143e62
|
港湾批量调薪性能优化
|
2024-07-29 16:06:48 +08:00 |
|
Harryxzy
|
52a0392be5
|
适配项目离开时间为空
|
2024-07-26 11:15:21 +08:00 |
|
Harryxzy
|
4f4b756efc
|
fix港湾bug
|
2024-07-24 13:47:10 +08:00 |
|
Harryxzy
|
0d7ee6c72d
|
fixbug
|
2024-07-10 16:51:26 +08:00 |
|
Harryxzy
|
c1bdcc94fe
|
港湾多语言修复
|
2024-07-10 14:38:54 +08:00 |
|
Harryxzy
|
490cc4f224
|
港湾薪酬二开
|
2024-07-09 14:57:06 +08:00 |
|
Harryxzy
|
ff33397326
|
港湾报表
|
2024-07-05 09:24:17 +08:00 |
|
Harryxzy
|
858f01c4e3
|
港湾多语言
|
2024-06-13 16:00:06 +08:00 |
|
Harryxzy
|
f99ee37b1a
|
港湾多语言新增：个税扣缴义务人：537996；薪资明细：547605
|
2024-06-12 10:08:35 +08:00 |
|
Harryxzy
|
4bfa63c3f7
|
Merge branch 'feature/240302-薪资核算导出模板' into custom/上海港湾-多语言
# Conflicts:
# src/com/engine/salary/service/SalaryAcctExcelService.java
# src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
|
2024-04-03 10:56:08 +08:00 |
|
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
|
7ed5e87d3f
|
港湾多语言
|
2024-04-03 10:32:03 +08:00 |
|
Harryxzy
|
c0562d9c6b
|
港湾多语言
|
2024-04-02 16:25:40 +08:00 |
|
钱涛
|
a06a54f574
|
去除objectUtil
|
2024-04-01 20:25:23 +08:00 |
|
Harryxzy
|
4ccfac80f5
|
sql
|
2024-04-01 16:33:13 +08:00 |
|
Harryxzy
|
f9d7c05190
|
核算导出模板修改表名
|
2024-04-01 10:17:45 +08:00 |
|
Harryxzy
|
7557c1b330
|
薪资核算导出模板优化
|
2024-03-29 15:45:45 +08:00 |
|
Harryxzy
|
47e0f5da52
|
fix冲突
|
2024-03-29 10:52:46 +08:00 |
|
Harryxzy
|
330d1363fc
|
Merge branch 'fix/240302-调薪前端保留位数优化' into release/2.12.1.2403.02
|
2024-03-29 10:49:58 +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
|
4e25dd4f0d
|
Merge branch 'feature/240302-报表明细导出' into release/2.12.1.2403.02
|
2024-03-29 10:47:44 +08:00 |
|
Harryxzy
|
582abc061a
|
薪资核算导出模板
|
2024-03-29 10:46:51 +08:00 |
|
Harryxzy
|
0d6bf4dfe3
|
薪资核算导出模板修复
|
2024-03-28 18:28:22 +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
|
130be31d99
|
薪资核算导出模板
|
2024-03-27 11:33:56 +08:00 |
|
Harryxzy
|
3c8d1dc6ee
|
薪资明细表
|
2024-03-27 09:35:47 +08:00 |
|
Harryxzy
|
1c40ed0ecd
|
薪资核算导出模板
|
2024-03-26 17:04:56 +08:00 |
|
Harryxzy
|
92ba8e8fcf
|
薪资明细合计接口
|
2024-03-26 13:49:37 +08:00 |
|
Harryxzy
|
ccc2744bee
|
薪资明细
|
2024-03-26 09:12:59 +08:00 |
|
Harryxzy
|
faabf1dad3
|
薪酬报表-人事状态
|
2024-03-25 17:29:40 +08:00 |