sy
|
b27a378baa
|
薪酬系统-多语言，薪资项目默认系统分组适配多语言逻辑
|
2023-10-08 10:27:27 +08:00 |
|
sy
|
735f3870fa
|
薪酬系统-多语言，适配部分中文表述，待处理薪资项目分组名转义逻辑
|
2023-08-15 10:15:05 +08:00 |
|
sy
|
12b7b1d24c
|
薪酬系统-多语言，修复部分页面为翻译问题0814
|
2023-08-14 18:33:58 +08:00 |
|
sy
|
c8c0c9f13d
|
薪酬系统-多语言，修改部分表述中占位符的问题
|
2023-08-14 16:00:30 +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 |
Harryxzy
|
19cb2d9622
|
Merge branch 'feature/230703-薪资账套项目页面改造' into release/2.9.3.2308.01
|
2023-08-14 09:19:20 +08:00 |
|
Harryxzy
|
7ebb8d6618
|
Merge branch 'feature/230702-自定义工资项目展示名' into release/2.9.3.2308.01
|
2023-08-14 09:19:04 +08:00 |
|
sy
|
94972a589f
|
薪酬系统-多语言，薪资项目名称相关操作进行根据薪资项目自带labelId多语言适配
|
2023-08-11 18:06:09 +08:00 |
|
sy
|
e5c31c3a71
|
薪酬系统-多语言，福利方案、档案、台账页中福利险种相关操作进行根据险种自带labelId多语言适配
|
2023-08-10 16:34:49 +08:00 |
|
sy
|
0b8bb5e74e
|
薪酬系统-多语言，适配部分中文表述
|
2023-08-10 10:45:32 +08:00 |
|
sy
|
536465fbae
|
Merge remote-tracking branches 'remotes/origin/feature/230801-福利档案-同步非系统人员增量数据' and 'remotes/origin/fix/230801-福利台账-导入的年月格式校验逻辑优化' into release/2.9.3.2308.01
|
2023-08-09 18:08:40 +08:00 |
|
sy
|
8b1b52a6f2
|
薪酬系统-多语言，适配部分中文表述、薪资项目中excel函数多语言
|
2023-08-09 16:20:32 +08:00 |
|
sy
|
9f021b6d5e
|
薪酬系统-福利档案，修复非系统人员增量数据造成的bug
|
2023-08-08 15:03:52 +08:00 |
|
Harryxzy
|
6a01f0d785
|
Merge branch 'release/2.9.2.2307.02' into feature/230702-自定义工资项目展示名
|
2023-08-08 11:42:41 +08:00 |
|
Harryxzy
|
fa7eb0ee60
|
Merge branch 'release/2.9.2.2307.02' into feature/230703-薪资账套项目页面改造
|
2023-08-08 11:06:06 +08:00 |
|
sy
|
ec5c4d1305
|
薪酬系统-多语言，修复调薪记录、新建薪资账套、工资单查看页面问题
|
2023-08-08 09:34:22 +08:00 |
|
sy
|
9d0194acd3
|
薪酬系统-福利台账，优化福利台账补缴模板中账单月份和补缴月份校验逻辑
|
2023-08-07 16:46:17 +08:00 |
|
sy
|
95525d42d8
|
Merge remote-tracking branch 'remotes/origin/feature/230702-非系统人员导入功能' into release/2.9.3.2308.01
|
2023-08-04 16:55:56 +08:00 |
|
sy
|
14a944c60b
|
薪酬系统-非系统人员管理，非系统人员导入时，部门名称为null则置为空字符串
|
2023-08-04 16:55:19 +08:00 |
|
sy
|
d9caedbe5b
|
Merge remote-tracking branch 'remotes/origin/feature/230702-非系统人员导入功能' into release/2.9.3.2308.01
|
2023-08-04 16:34:16 +08:00 |
|
sy
|
2f6e221c9b
|
薪酬系统-非系统人员管理，非系统人员导入新增添加status值设置
|
2023-08-04 16:14:00 +08:00 |
|
sy
|
98e1574914
|
Merge remote-tracking branch 'remotes/origin/fix/230801-社保福利-停用自定义福利不显示在档案导入模板和台账导入自定义字段中' into release/2.9.3.2308.01
|
2023-08-04 15:27:34 +08:00 |
|
sy
|
8c9049f1f7
|
Merge remote-tracking branch 'remotes/origin/feature/230702-非系统人员导入功能' into release/2.9.3.2308.01
|
2023-08-04 15:26:24 +08:00 |
|
sy
|
4048d0998c
|
Merge remote-tracking branch 'remotes/origin/fix/230801-无法生成薪资、社保档案' into release/2.9.3.2308.01
|
2023-08-04 15:18:56 +08:00 |
|
sy
|
cedb49833c
|
Merge remote-tracking branch 'remotes/origin/fix/230801-无法生成薪资、社保档案' into release/2.9.2.2307.02
|
2023-08-04 15:18:10 +08:00 |
|
sy
|
6dd6eca3bf
|
薪酬系统-人员匹配，优化全量人力表人员查询sql
|
2023-08-04 15:07:41 +08:00 |
|
sy
|
d219d129a5
|
薪酬系统-福利台账，台账明细导入模板自定义导入字段列表优化
|
2023-08-04 14:14:44 +08:00 |
|
sy
|
c623d32609
|
Merge remote-tracking branch 'remotes/origin/fix/230801-福利档案-增量处理逻辑添加日志' into release/2.9.3.2308.01
|
2023-08-04 10:55:27 +08:00 |
|
sy
|
07eb966c18
|
薪酬系统-非系统人员管理，非系统人员导入逻辑优化
|
2023-08-04 10:02:06 +08:00 |
|
Harryxzy
|
190771037e
|
fixbug
|
2023-08-04 09:33:17 +08:00 |
|
sy
|
9488823307
|
Merge remote-tracking branch 'remotes/origin/fix/福利台账-线下对比导入分批' into release/2.9.2.2307.02
|
2023-08-04 09:11:26 +08:00 |
|
sy
|
059d3982cc
|
薪酬系统-多语言，优化涉及多语言的pageInfo方法
|
2023-08-03 18:01:19 +08:00 |
|
sy
|
7c374a58f7
|
薪酬系统-多语言，适配中文表述
|
2023-08-03 11:08:15 +08:00 |
|
Harryxzy
|
ebd2e8651f
|
Merge remote-tracking branch 'origin/release/2.9.3.2308.01' into release/2.9.3.2308.01
|
2023-08-03 09:27:05 +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
|
3f10c8eb96
|
Merge remote-tracking branch 'remotes/origin/fix/福利台账-线下对比导入分批' into release/2.9.3.2308.01
|
2023-08-02 15:41:33 +08:00 |
|
sy
|
f566193dcb
|
Merge remote-tracking branch 'remotes/origin/feature/230702-福利方案-自定义福利项删除功能' into release/2.9.3.2308.01
|
2023-08-02 15:41:00 +08:00 |
|
sy
|
24085186e8
|
薪酬系统-多语言，tableatitle注解添加labelId元素，并对使用该注解的对象配置labelId
|
2023-08-02 15:31:13 +08:00 |
|
Harryxzy
|
f6dc6d9257
|
fix个税扣缴义务人删除人员范围，档案不跳到停薪
|
2023-08-02 14:47:40 +08:00 |
|
Harryxzy
|
e655daf018
|
fix个税扣缴义务人人员范围，无法根据部门、分部维度生成数据
|
2023-08-02 10:34:04 +08:00 |
|
sy
|
293297ad7f
|
薪酬系统-福利台账，线下对比导入分批,列表逻辑优化
|
2023-08-01 15:37:32 +08:00 |
|
sy
|
98bbac3236
|
薪酬系统-福利台账，线下对比导入分批
|
2023-08-01 13:53:22 +08:00 |
|
sy
|
c11a8b7ea0
|
薪酬系统-多语言，适配中文表述
|
2023-08-01 13:49:40 +08:00 |
|
Harryxzy
|
3827c8963d
|
fix补发模板问题
|
2023-07-31 17:07:21 +08:00 |
|
sy
|
61b35eda1f
|
Merge remote-tracking branch 'remotes/origin/release/2.9.2.2307.02' into fix/230702-福利档案-不显示合同到期日期
|
2023-07-31 16:46:55 +08:00 |
|
sy
|
a8f9134418
|
Merge remote-tracking branch 'remotes/origin/release/2.9.2.2307.02' into feature/230702-非系统人员导入功能
|
2023-07-31 16:46:10 +08:00 |
|
sy
|
494156aeaf
|
Merge remote-tracking branch 'remotes/origin/release/2.9.2.2307.02' into feature/230702-福利方案-自定义福利项删除功能
|
2023-07-31 16:45:11 +08:00 |