Harryxzy
|
12aae3c56d
|
港湾temp
|
2024-01-05 11:13:20 +08:00 |
|
Harryxzy
|
c7a67f5621
|
港湾过滤逻辑调整
|
2024-01-04 17:45:33 +08:00 |
|
Harryxzy
|
bb4b520140
|
港湾
|
2024-01-04 15:50:14 +08:00 |
sy
|
d9b87f0f5b
|
Merge remote-tracking branch 'origin/custom/上海港湾-多语言' into custom/上海港湾-多语言
|
2024-01-03 17:08:25 +08:00 |
|
sy
|
107df29229
|
薪酬系统-二开，上海港湾-多语言，薪资项目、自定义福利名称重名校验逻辑优化
|
2024-01-03 17:08:15 +08:00 |
|
Harryxzy
|
8c6a9e192d
|
港湾fix无档案bug
|
2024-01-03 15:38:40 +08:00 |
|
Harryxzy
|
22d3b629a1
|
Merge branch 'custom/上海港湾' into custom/上海港湾-多语言
|
2023-12-25 18:21:46 +08:00 |
|
Harryxzy
|
00b376b924
|
港湾，义务人fix
|
2023-12-25 18:21:26 +08:00 |
|
Harryxzy
|
9404f066d0
|
Merge branch 'custom/上海港湾' into custom/上海港湾-多语言
|
2023-12-22 16:05:39 +08:00 |
|
Harryxzy
|
cdc77ea801
|
港湾fix
|
2023-12-22 16:05:14 +08:00 |
|
Harryxzy
|
540aec23ae
|
Merge branch 'custom/上海港湾' into custom/上海港湾-多语言
|
2023-12-22 15:44:50 +08:00 |
|
Harryxzy
|
02f8da3a81
|
港湾fix
|
2023-12-22 15:44:28 +08:00 |
|
Harryxzy
|
253403668c
|
Merge remote-tracking branch 'origin/custom/上海港湾-多语言' into custom/上海港湾-多语言
|
2023-12-15 16:45:19 +08:00 |
|
Harryxzy
|
32cc4bb602
|
Merge branch 'custom/上海港湾' into custom/上海港湾-多语言
|
2023-12-15 16:31:07 +08:00 |
|
Harryxzy
|
9191e00d33
|
港湾temp
|
2023-12-15 15:17:28 +08:00 |
|
sy
|
be4fccd5c2
|
Merge remote-tracking branch 'remotes/origin/feature/salary_i18' into custom/上海港湾-多语言
|
2023-12-14 17:10:27 +08:00 |
|
sy
|
19ce3e8146
|
薪酬系统-多语言，工资单模板编辑支持薪资项目分组重命名
|
2023-12-14 17:09:53 +08:00 |
|
sy
|
7a2366a112
|
薪酬系统-多语言，工资单模板编辑暂时不支持薪资项目重命名
|
2023-12-14 16:23:13 +08:00 |
|
sy
|
7207be9278
|
Merge remote-tracking branch 'remotes/origin/feature/salary_i18' into custom/上海港湾-多语言
|
2023-12-14 14:10:34 +08:00 |
|
sy
|
54542c9a94
|
薪酬系统-多语言，工资单模板编辑优化，薪资项目支持多语言编辑
|
2023-12-14 13:47:53 +08:00 |
|
sy
|
5b41809853
|
Merge remote-tracking branch 'remotes/origin/feature/salary_i18' into custom/上海港湾-多语言
|
2023-12-14 09:52:57 +08:00 |
|
sy
|
97b30d5a73
|
薪酬系统-多语言，补缴、薪资核算导出、补差编辑显示功能修复
|
2023-12-14 09:51:26 +08:00 |
|
sy
|
f5494986cd
|
薪酬系统-二开，上海港湾-多语言，处理冲突
|
2023-12-13 17:20:13 +08:00 |
|
sy
|
be3ad3b47b
|
薪酬系统-二开，上海港湾-多语言，拉取多语言1201分支，处理冲突
|
2023-12-13 17:17:57 +08:00 |
|
sy
|
6c5e4ec456
|
Merge remote-tracking branch 'remotes/origin/feature/salary_i18' into custom/上海港湾-多语言
# Conflicts:
# src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java
# src/com/engine/salary/entity/salaryacct/dto/SalaryAcctRecordListDTO.java
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
# src/com/engine/salary/web/SalaryBillController.java
# src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
# src/com/engine/salary/wrapper/SalarySendWrapper.java
|
2023-12-13 16:59:22 +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 |
|
Harryxzy
|
10d60295bb
|
Merge branch 'feature/231202_核算记录归档action' into custom/上海港湾
# Conflicts:
# src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java
# src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
|
2023-12-13 10:26:59 +08:00 |
|
Harryxzy
|
640b076739
|
上海港湾临时
|
2023-12-12 16:08:18 +08:00 |
|
Harryxzy
|
51022c0a16
|
薪资核算结果、线下对比下载导入模板优化fix
|
2023-12-12 14:22:18 +08:00 |
|
Harryxzy
|
9602e48e74
|
薪资核算结果、线下对比下载导入模板优化fix
|
2023-12-12 14:11:48 +08:00 |
|
Harryxzy
|
559ba88e9f
|
薪资核算结果、线下对比下载导入模板优化
|
2023-12-12 10:32:04 +08:00 |
|
Harryxzy
|
929bcc7877
|
薪资核算结果、线下对比下载导入模板优化
|
2023-12-12 10:18:10 +08:00 |
|
Harryxzy
|
379e020879
|
港湾下级工资单改造
|
2023-12-11 14:48:09 +08:00 |
|
sy
|
fd848ea267
|
薪酬系统-多语言，补缴逻辑优化，自定义福利名称、薪资项目名称重名校验逻辑优化
|
2023-12-11 14:24:45 +08:00 |
|
Harryxzy
|
85b18d659e
|
港湾
|
2023-12-11 13:30:36 +08:00 |
|
Harryxzy
|
6c8aded0da
|
港湾审批流程
|
2023-12-11 11:35:21 +08:00 |
|
Harryxzy
|
eb5c5c1b26
|
审批流程合计列
|
2023-12-11 11:08:30 +08:00 |
 钱涛
|
390251bd63
|
Merge remote-tracking branch 'origin/release/2.9.9.2312.01' into release/2.9.9.2312.01
|
2023-12-05 15:08:44 +08:00 |
|
钱涛
|
dd48bff747
|
同步所有档案起始发薪日期为入职日期
|
2023-12-05 15:08:37 +08:00 |
|
Harryxzy
|
3687bdfcdc
|
Merge remote-tracking branch 'origin/release/2.9.9.2312.01' into release/2.9.9.2312.01
|
2023-12-05 11:30:04 +08:00 |
|
Harryxzy
|
b093717e46
|
Merge branch 'fix/231102_账套增加义务人筛选' into release/2.9.9.2312.01
|
2023-12-05 11:28:47 +08:00 |
|
sy
|
ce10204dab
|
Merge remote-tracking branch 'remotes/origin/feature/231102-福利台账，补差待编辑项扩充其他可缴纳福利项' into release/2.9.9.2312.01
|
2023-12-05 11:26:48 +08:00 |
|
Harryxzy
|
a0331112be
|
Merge branch 'fie/231102_线下对比列头改造' into release/2.9.9.2312.01
|
2023-12-05 11:26:22 +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
|
51c15df43f
|
薪酬系统-多语言，翻译部分中文表述，并整理疑问sql脚本
|
2023-12-04 14:14:56 +08:00 |
|
sy
|
10da1845b2
|
薪酬系统-多语言，自定义险种、薪资项目、薪资项目分组名称新建或修改功能，名称返回进行base64加密
|
2023-12-04 10:19:43 +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 |