sy
|
e5c31c3a71
|
薪酬系统-多语言，福利方案、档案、台账页中福利险种相关操作进行根据险种自带labelId多语言适配
|
2023-08-10 16:34:49 +08:00 |
|
sy
|
8b1b52a6f2
|
薪酬系统-多语言，适配部分中文表述、薪资项目中excel函数多语言
|
2023-08-09 16:20:32 +08:00 |
|
sy
|
ec5c4d1305
|
薪酬系统-多语言，修复调薪记录、新建薪资账套、工资单查看页面问题
|
2023-08-08 09:34:22 +08:00 |
|
sy
|
059d3982cc
|
薪酬系统-多语言，优化涉及多语言的pageInfo方法
|
2023-08-03 18:01:19 +08:00 |
|
sy
|
7c374a58f7
|
薪酬系统-多语言，适配中文表述
|
2023-08-03 11:08:15 +08:00 |
|
sy
|
24085186e8
|
薪酬系统-多语言，tableatitle注解添加labelId元素，并对使用该注解的对象配置labelId
|
2023-08-02 15:31:13 +08:00 |
|
sy
|
88325889c1
|
薪酬系统-多语言，合并最新release230702改动，并处理冲突，适配中文表述
|
2023-07-28 15:22:26 +08:00 |
|
sy
|
438b86e2e1
|
Merge remote-tracking branch 'remotes/origin/release/2.9.2.2307.02' into feature/salary_i18
# Conflicts:
# src/com/engine/salary/biz/SIAccountBiz.java
# src/com/engine/salary/biz/SICategoryBiz.java
# src/com/engine/salary/entity/salaryBill/param/SalaryBaseSetSaveParam.java
# src/com/engine/salary/entity/salaryBill/param/SalaryTemplateSaveParam.java
# src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveExcelBO.java
# src/com/engine/salary/enums/salaryarchive/SalaryArchiveListTypeEnum.java
# src/com/engine/salary/service/impl/SIAccountServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.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/SalarySendServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobRangeServiceImpl.java
# src/com/engine/salary/web/SalaryArchiveController.java
# src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java
# src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
|
2023-07-28 11:13:09 +08:00 |
Harryxzy
|
ee9697a4ad
|
修复sql中union异常字符问题
|
2023-07-25 18:27:19 +08:00 |
|
sy
|
74b8726d7a
|
薪酬系统-多语言，翻译部分中文表述
|
2023-07-20 15:57:35 +08:00 |
|
Harryxzy
|
79ef1941b2
|
删除个税扣缴义务人时校验社保福利
|
2023-07-20 15:14:43 +08:00 |
|
Harryxzy
|
ce32c6571c
|
系统薪资项目重名
|
2023-07-20 11:14:58 +08:00 |
|
sy
|
c7fe4fee23
|
Merge branches 'feature/230701-社保福利-核算记录的校验' and 'feature/230701-薪资核算-导出功能可选择字段导出' into release/2.9.2.2307.02
|
2023-07-20 10:19:40 +08:00 |
 钱涛
|
b98fc4c527
|
非系统人员冲突
|
2023-07-20 10:17:20 +08:00 |
|
钱涛
|
01b02531ce
|
Merge branch 'feature/外部人员' into release/2.9.2.2307.02
# Conflicts:
# src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
# src/com/engine/salary/sys/service/SalarySysConfService.java
# src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
# src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java
|
2023-07-20 10:08:05 +08:00 |
|
钱涛
|
013137ba30
|
非系统人员状态是临时
|
2023-07-19 17:07:38 +08:00 |
|
Harryxzy
|
ca0d800bab
|
Merge branch 'feature/230701-工资单反馈' into release/2.9.2.2307.02
|
2023-07-19 16:18:52 +08:00 |
|
Harryxzy
|
311aa8f139
|
加上大括号
|
2023-07-19 16:17:40 +08:00 |
|
Harryxzy
|
a144b88f6c
|
Merge branch 'feature/230701-工资单反馈' into release/2.9.2.2307.02
|
2023-07-19 11:51:50 +08:00 |
|
Harryxzy
|
31a863c937
|
没有设置工资单模板时报错
|
2023-07-19 11:51:31 +08:00 |
|
Harryxzy
|
959aa83a21
|
Merge branch 'fix/230701-个税扣缴义务人前后空格' into release/2.9.2.2307.02
|
2023-07-19 11:11:58 +08:00 |
|
Harryxzy
|
0a4c19fb36
|
Merge branch 'feature/230702-薪资项目-核算时隐藏' into release/2.9.2.2307.02
|
2023-07-19 11:11:46 +08:00 |
|
Harryxzy
|
57f75d36a0
|
fix个税扣缴义务人保存过滤前后空格
|
2023-07-19 11:10:27 +08:00 |
|
钱涛
|
3cc0d412ce
|
修复导出外部人员名称不显示问题
|
2023-07-19 10:58:11 +08:00 |
|
sy
|
4b503513f2
|
Merge remote-tracking branch 'remotes/origin/release/2.9.2.2307.02' into feature/230701-薪资核算-导出功能可选择字段导出
|
2023-07-19 10:04:58 +08:00 |
|
钱涛
|
b77e7a737c
|
外部人员名称不可重复
|
2023-07-19 09:58:42 +08:00 |
|
Harryxzy
|
d551f5ae76
|
薪资项目核算时隐藏
|
2023-07-18 14:03:59 +08:00 |
|
sy
|
f93090b063
|
薪酬系统-薪资核算，自定义导出字段优化未分类字段识别逻辑
|
2023-07-17 17:53:59 +08:00 |
|
Harryxzy
|
3a1765b562
|
Merge branch 'feature/230701-工资单反馈' into release/2.9.2.2307.02
|
2023-07-17 15:02:33 +08:00 |
|
Harryxzy
|
1ea80b8fe9
|
工资单反馈
|
2023-07-17 15:01:14 +08:00 |
|
Harryxzy
|
e83302caac
|
工资单反馈
|
2023-07-17 12:11:31 +08:00 |
|
Harryxzy
|
8221d4da69
|
工资单反馈
|
2023-07-17 11:27:40 +08:00 |
|
钱涛
|
fbdf93cf5b
|
取消不用系统算税时一系列校验
|
2023-07-17 10:20:54 +08:00 |
|
sy
|
2e2954f706
|
薪酬系统-薪资核算，补缴和补差个人福利项明细核算失败问题修复
|
2023-07-14 14:43:30 +08:00 |
|
Harryxzy
|
faf9636a0d
|
薪资项目-核算时隐藏 temp
|
2023-07-14 11:34:53 +08:00 |
|
sy
|
5c99dddd00
|
薪酬系统-多语言，合并最新release230701改动，并处理冲突
|
2023-07-14 10:42:24 +08:00 |
|
Harryxzy
|
6279f0d8c9
|
工资单反馈
|
2023-07-14 09:55:36 +08:00 |
|
sy
|
70ff1295f0
|
Merge remote-tracking branch 'remotes/origin/release/2.9.2.2307.02' 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/bo/SalaryAcctRecordBO.java
# src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
# src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
# src/com/engine/salary/service/impl/SalaryItemServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobServiceImpl.java
# src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java
|
2023-07-14 09:42:34 +08:00 |
|
sy
|
3571797e12
|
薪酬系统-薪资核算，薪资项目函数中增加福利核算明细项根据缴纳状态的细分项
|
2023-07-14 09:13:19 +08:00 |
|
钱涛
|
942a3b2a97
|
修复工资单发送列表
|
2023-07-13 17:23:28 +08:00 |
|
钱涛
|
4901f79066
|
核算界面获取外部人员
|
2023-07-13 14:11:32 +08:00 |
|
Harryxzy
|
30d61e352f
|
工资单确认反馈
|
2023-07-13 11:50:02 +08:00 |
|
钱涛
|
23c0a78adc
|
修复外部人员初始化档案数据
|
2023-07-13 10:20:41 +08:00 |
|
sy
|
c78c8375f0
|
薪酬系统-薪资核算，自定义导出字段
|
2023-07-12 15:20:02 +08:00 |
|
Harryxzy
|
820d15d06f
|
工资单确认反馈
|
2023-07-12 15:17:59 +08:00 |
|
Harryxzy
|
58fe219cdb
|
fix 工资单反馈bug
|
2023-07-12 11:25:44 +08:00 |
|
钱涛
|
89ecf0984d
|
fix外部人员
|
2023-07-12 09:45:00 +08:00 |
|
sy
|
47dc9e35bd
|
薪酬系统-福利台账，已归档状态下重新核算按钮增加是否被薪资核算引用校验逻辑
|
2023-07-11 17:56:45 +08:00 |
|
Harryxzy
|
56c1666542
|
工资单发放
|
2023-07-11 17:51:52 +08:00 |
|
Harryxzy
|
5dc2dadd46
|
工资单自动确认
|
2023-07-11 17:28:15 +08:00 |