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
|
20a2d54139
|
Merge remote-tracking branch 'remotes/origin/release/2.9.9.2312.01' into feature/salary_i18
|
2023-12-14 16:24:12 +08:00 |
|
sy
|
7a2366a112
|
薪酬系统-多语言，工资单模板编辑暂时不支持薪资项目重命名
|
2023-12-14 16:23:13 +08:00 |
Harryxzy
|
e97a35f158
|
新建补发工资单模板时，已发补发项目fix
|
2023-12-14 15:57:55 +08:00 |
|
sy
|
46b0cefe08
|
薪酬系统-二开，上海港湾-多语言，翻译部分中文表述
|
2023-12-14 14:59:25 +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
|
ed1234ae49
|
sql
|
2023-12-13 10:39:57 +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
|
cfbddef42a
|
核算记录归档action
|
2023-12-13 09:58:00 +08:00 |
|
Harryxzy
|
640b076739
|
上海港湾临时
|
2023-12-12 16:08:18 +08:00 |
|
Harryxzy
|
5fba05bc43
|
Merge branch 'fix/核算、线下对比导出优化' into release/2.9.9.2312.01
|
2023-12-12 14:22:44 +08:00 |
|
Harryxzy
|
51022c0a16
|
薪资核算结果、线下对比下载导入模板优化fix
|
2023-12-12 14:22:18 +08:00 |
|
Harryxzy
|
d38ef4769b
|
Merge remote-tracking branch 'origin/release/2.9.9.2312.01' into release/2.9.9.2312.01
|
2023-12-12 14:12:19 +08:00 |
|
Harryxzy
|
5c50b61cd5
|
Merge branch 'fix/核算、线下对比导出优化' into release/2.9.9.2312.01
|
2023-12-12 14:12:14 +08:00 |
|
Harryxzy
|
9602e48e74
|
薪资核算结果、线下对比下载导入模板优化fix
|
2023-12-12 14:11:48 +08:00 |
 钱涛
|
b78f4302e0
|
小数位
|
2023-12-12 13:18:17 +08:00 |
|
Harryxzy
|
9c454623bc
|
Merge branch 'fix/核算、线下对比导出优化' into release/2.9.9.2312.01
|
2023-12-12 10:32:30 +08:00 |
|
Harryxzy
|
559ba88e9f
|
薪资核算结果、线下对比下载导入模板优化
|
2023-12-12 10:32:04 +08:00 |
|
Harryxzy
|
929bcc7877
|
薪资核算结果、线下对比下载导入模板优化
|
2023-12-12 10:18:10 +08:00 |
|
钱涛
|
04e3225c98
|
自适应
|
2023-12-12 10:07:31 +08:00 |
|
Harryxzy
|
324f312c38
|
港湾fix
|
2023-12-12 09:43:18 +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 |
|
钱涛
|
e495c1799f
|
自定义
|
2023-12-11 09:52:47 +08:00 |
|
Harryxzy
|
32984afaeb
|
Merge remote-tracking branch 'origin/release/2.9.9.2312.01' into release/2.9.9.2312.01
|
2023-12-08 11:44:07 +08:00 |
|
钱涛
|
bbe4b315cf
|
pg脚本异常
|
2023-12-08 11:43:19 +08:00 |
|
Harryxzy
|
8138b5297f
|
薪酬报表添加文本统计项目时，字符去值规则没有保存进去
|
2023-12-08 11:41:13 +08:00 |
|
Harryxzy
|
3099fb2eb1
|
发放时间 改为 工资单发放时间
|
2023-12-05 17:20:39 +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 |