Harryxzy
|
82da1e3815
|
港湾-下级工资单状态筛选
|
2024-01-19 14:25:56 +08:00 |
|
Harryxzy
|
4c77a30051
|
港湾下级工资单人员状态筛选
|
2024-01-19 10:32:23 +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
|
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 |
|
Harryxzy
|
379e020879
|
港湾下级工资单改造
|
2023-12-11 14:48:09 +08:00 |
|
Harryxzy
|
b6f0c4a0b3
|
上海港湾 下级工资单树
|
2023-11-29 15:18:20 +08:00 |
|
Harryxzy
|
2fd1ef78f5
|
上海港湾 下级工资单根据层级结构展示
|
2023-11-29 13:41:55 +08:00 |
|
sy
|
40a0f2afba
|
薪酬系统-多语言，薪资项目、薪资项目分组更改名称获取逻辑（适配多语言）
|
2023-11-14 13:49:10 +08:00 |
|
Harryxzy
|
a8a0482221
|
上海港湾fix
|
2023-11-14 10:29:53 +08:00 |
|
Harryxzy
|
37d47c9b68
|
中江账套改造temp
|
2023-11-13 15:28:58 +08:00 |
|
sy
|
692a58fdfe
|
薪酬系统-多语言，工资单详情员工信息和薪资项分组多语言适配
|
2023-10-10 15:54:03 +08:00 |
|
sy
|
92b81923f4
|
Merge remote-tracking branch 'remotes/origin/release/2.9.6.2310.01' into feature/salary_i18
# Conflicts:
# src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
|
2023-10-09 18:00:40 +08:00 |
 钱涛
|
182e90676c
|
Merge branch 'feature/自定义筛选条件' into release/2.9.6.2310.01
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
|
2023-10-08 14:24:33 +08:00 |
|
sy
|
05fd1a0e71
|
Merge remote-tracking branch 'remotes/origin/release/2.9.6.2310.01' into feature/salary_i18
# Conflicts:
# src/com/engine/salary/biz/SIAccountBiz.java
# src/com/engine/salary/biz/SIArchivesBiz.java
# src/com/engine/salary/biz/SISchemeBiz.java
# src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java
# src/com/engine/salary/entity/salaryBill/param/SalaryBaseSetSaveParam.java
# src/com/engine/salary/enums/salaryformula/SalarySQLReferenceEnum.java
# src/com/engine/salary/enums/salarysob/SalaryEmployeeStatusEnum.java
# src/com/engine/salary/service/impl/ColumnBuildServiceImpl.java
# src/com/engine/salary/service/impl/ExtEmpServiceImpl.java
# src/com/engine/salary/service/impl/SIAComparisonResultServiceImpl.java
# src/com/engine/salary/service/impl/SIAccountServiceImpl.java
# src/com/engine/salary/service/impl/SICompensationServiceImpl.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/SalaryAcctResultServiceImpl.java
# src/com/engine/salary/service/impl/SalaryBillServiceImpl.java
# src/com/engine/salary/service/impl/SalaryFormulaServiceImpl.java
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
# src/com/engine/salary/wrapper/SalaryFormulaWrapper.java
# src/com/engine/salary/wrapper/SalaryItemWrapper.java
|
2023-10-08 12:11:06 +08:00 |
|
钱涛
|
138f832537
|
时效性过滤
|
2023-10-08 10:11:07 +08:00 |
|
钱涛
|
5241972151
|
工资单时效设置
|
2023-10-07 14:46:28 +08:00 |
|
钱涛
|
4c5bc5dda7
|
增加状态
|
2023-09-28 17:05:42 +08:00 |
|
钱涛
|
4ed4edc9ed
|
pdf按钮控制
|
2023-09-27 14:19:52 +08:00 |
|
Harryxzy
|
5bd66b626f
|
查看工资单后能够继续反馈、确认
|
2023-09-19 16:21:23 +08:00 |
|
sy
|
12b7b1d24c
|
薪酬系统-多语言，修复部分页面为翻译问题0814
|
2023-08-14 18:33:58 +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 |
|
sy
|
94972a589f
|
薪酬系统-多语言，薪资项目名称相关操作进行根据薪资项目自带labelId多语言适配
|
2023-08-11 18:06:09 +08:00 |
|
sy
|
ec5c4d1305
|
薪酬系统-多语言，修复调薪记录、新建薪资账套、工资单查看页面问题
|
2023-08-08 09:34:22 +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
|
da18b0f884
|
薪资账套项目页面改造temp
|
2023-07-25 16:46:57 +08:00 |
|
sy
|
74b8726d7a
|
薪酬系统-多语言，翻译部分中文表述
|
2023-07-20 15:57:35 +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 |
|
Harryxzy
|
311aa8f139
|
加上大括号
|
2023-07-19 16:17:40 +08:00 |
|
Harryxzy
|
31a863c937
|
没有设置工资单模板时报错
|
2023-07-19 11:51:31 +08:00 |
|
钱涛
|
3cc0d412ce
|
修复导出外部人员名称不显示问题
|
2023-07-19 10:58:11 +08:00 |
|
Harryxzy
|
e83302caac
|
工资单反馈
|
2023-07-17 12:11:31 +08:00 |
|
Harryxzy
|
8221d4da69
|
工资单反馈
|
2023-07-17 11:27:40 +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 |
|
钱涛
|
942a3b2a97
|
修复工资单发送列表
|
2023-07-13 17:23:28 +08:00 |
|
Harryxzy
|
30d61e352f
|
工资单确认反馈
|
2023-07-13 11:50:02 +08:00 |
|
Harryxzy
|
58fe219cdb
|
fix 工资单反馈bug
|
2023-07-12 11:25:44 +08:00 |
|
Harryxzy
|
56c1666542
|
工资单发放
|
2023-07-11 17:51:52 +08:00 |
|
Harryxzy
|
5dc2dadd46
|
工资单自动确认
|
2023-07-11 17:28:15 +08:00 |
|
钱涛
|
aec6918c12
|
Merge branch 'release/2.9.1.2307.01' into feature/外部人员
# Conflicts:
# src/com/engine/salary/biz/EmployBiz.java
# src/com/engine/salary/biz/SIAccountBiz.java
# src/com/engine/salary/entity/salaryBill/dto/SalarySendDetailListDTO.java
# src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java
# src/com/engine/salary/mapper/archive/SalaryArchiveMapper.java
# src/com/engine/salary/service/SalaryEmployeeService.java
# src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
# src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
# src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java
# src/com/engine/salary/service/impl/SIAccountServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
# src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
# src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
# src/com/engine/salary/service/impl/SalarySendRangeServiceImpl.java
# src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java
# src/com/engine/salary/web/SalarySobController.java
# src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
# src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
# src/com/engine/salary/wrapper/SalarySendWrapper.java
# src/com/engine/salary/wrapper/TaxAgentSubAdminWrapper.java
# src/com/engine/salary/wrapper/TaxDeclarationWrapper.java
|
2023-07-11 16:08:15 +08:00 |
|
Harryxzy
|
be895829c2
|
工资单反馈
|
2023-07-11 15:29:13 +08:00 |
|
sy
|
65da8930a1
|
薪酬系统-多语言，枚举类defaultLabel值获取多语言环境下的对应值的逻辑优化
|
2023-07-05 18:04:42 +08:00 |