Harryxzy
|
8a06eaad93
|
Merge branch 'feature/工资单审批' into release/2.17.1.2411.01
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobServiceImpl.java
# src/com/engine/salary/sys/constant/SalarySysConstant.java
# src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
# src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java
|
2024-11-13 18:36:20 +08:00 |
 钱涛
|
158e7dd20c
|
Merge branch 'feature/次账号' into release/2.17.1.2411.01
# Conflicts:
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
# src/com/engine/salary/sys/constant/SalarySysConstant.java
|
2024-11-12 18:05:42 +08:00 |
|
钱涛
|
e537ffaa5a
|
薪资明细显示模板
|
2024-11-07 17:45:17 +08:00 |
|
Harryxzy
|
dbb332e07f
|
Merge branch 'release/2.16.1.2410.01' into fix/240901_token加解密
|
2024-11-06 10:05:53 +08:00 |
|
Harryxzy
|
e9b347c07c
|
前端增加薪资审批按钮的显隐控制
|
2024-11-01 16:03:51 +08:00 |
|
钱涛
|
94bb1ede32
|
Merge branch 'release/2.16.1.2410.01' into feature/次账号
# Conflicts:
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
|
2024-10-24 10:34:56 +08:00 |
|
钱涛
|
8c5c3d5949
|
工资单查看限制类型约束
|
2024-10-22 15:00:19 +08:00 |
|
钱涛
|
070a2a75ac
|
Merge branch 'release/2.15.2.2409.01' into feature/次账号
|
2024-10-16 17:19:43 +08:00 |
|
Harryxzy
|
fc88f03904
|
浮动薪酬加解密
|
2024-10-16 15:47:18 +08:00 |
|
钱涛
|
53ce7c7b43
|
核算人员显示次账号
|
2024-10-16 15:25:48 +08:00 |
|
钱涛
|
a40188659f
|
报表快照
|
2024-10-09 13:21:28 +08:00 |
|
钱涛
|
edb07052b5
|
员工明细排序
|
2024-10-08 14:36:18 +08:00 |
|
钱涛
|
b4050e4ee8
|
报表快照搜索
|
2024-09-29 16:58:41 +08:00 |
|
钱涛
|
b732430562
|
支持根据工号排序
|
2024-09-25 15:40:36 +08:00 |
|
Harryxzy
|
3420c36448
|
人员id加密
|
2024-09-18 18:10:30 +08:00 |
|
钱涛
|
cd8d4601af
|
全量迁移配置
|
2024-08-19 09:49:49 +08:00 |
|
钱涛
|
673699dfb8
|
导入工具明细
|
2024-08-16 11:18:27 +08:00 |
|
钱涛
|
9d26e1228f
|
薪酬迁移工具
|
2024-08-13 18:15:04 +08:00 |
|
钱涛
|
845f117d9c
|
excel导入工具
|
2024-08-12 17:17:52 +08:00 |
|
钱涛
|
b83d45efa0
|
下载系统配置
|
2024-08-12 10:02:46 +08:00 |
|
钱涛
|
83a408afa2
|
迁移工具
|
2024-08-08 16:53:31 +08:00 |
|
钱涛
|
11802dad91
|
根据身份证导入
|
2024-05-28 11:18:19 +08:00 |
|
Harryxzy
|
d7de02696d
|
工资单审批，增加规则配置
|
2024-04-28 16:58:33 +08:00 |
|
Harryxzy
|
b17d2b70de
|
Merge branch 'feature/240301_阅后即焚' into release/3.0.0.2403.01
|
2024-03-15 09:19:03 +08:00 |
|
Harryxzy
|
8543d70a66
|
社保加解密
|
2024-03-14 11:07:01 +08:00 |
|
Harryxzy
|
26a3199b1e
|
社保线下对比加解密
|
2024-03-13 17:58:24 +08:00 |
|
Harryxzy
|
78d4f5e2ae
|
阅后即焚
|
2024-03-11 10:35:56 +08:00 |
|
Harryxzy
|
6c2d20a5a7
|
Merge branch 'feature/240101_我的薪资福利显示页签支持配置' into release/2.11.1.2402.01
|
2024-03-05 14:24:19 +08:00 |
|
Harryxzy
|
a39806bb92
|
我的薪资福利显示页签支持配置
|
2024-02-23 11:04:14 +08:00 |
|
Harryxzy
|
b4f36ab101
|
Merge branch 'feature/240102_工资单确认和反馈按钮分开' into release/2.10.1.2401.01
|
2024-02-20 09:51:00 +08:00 |
|
Harryxzy
|
e75cfae309
|
Merge branch 'feature/240101_工资单反馈区分pc和移动端' into release/2.10.1.2401.01
|
2024-01-31 16:13:27 +08:00 |
|
Harryxzy
|
2331ef354e
|
工资单确认和反馈按钮分开
|
2024-01-30 15:53:55 +08:00 |
|
钱涛
|
6fc8d8fdee
|
去除达梦驱动
|
2024-01-25 11:38:38 +08:00 |
|
Harryxzy
|
71f90882d3
|
工资单反馈区分pc和移动端
|
2024-01-23 16:45:09 +08:00 |
sy
|
3b761341fc
|
薪酬系统-福利档案，档案导入功能优化，增加基数自动调整逻辑
|
2024-01-10 11:20:36 +08:00 |
|
sy
|
451c9fb07b
|
薪酬系统-福利档案，档案明细获取逻辑改造，根据应用设置中的区分开关，判定后将公司的福利基数信息单独区分返回
|
2023-12-06 09:51:07 +08:00 |
|
Harryxzy
|
df25f99544
|
薪资核算固定列头
|
2023-11-29 16:48:09 +08:00 |
|
钱涛
|
d86b00e5f7
|
清除加解密状态
|
2023-11-09 17:01:08 +08:00 |
|
钱涛
|
9ec0daa3f6
|
加密描述
|
2023-11-09 16:40:30 +08:00 |
|
钱涛
|
b9d119bcf0
|
修改关闭解密方法
|
2023-11-07 10:00:51 +08:00 |
|
钱涛
|
5241972151
|
工资单时效设置
|
2023-10-07 14:46:28 +08:00 |
|
钱涛
|
a7e8498b98
|
取消核算报表数据
|
2023-09-26 17:18:27 +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 |
|
钱涛
|
888938f150
|
系统设置接口
|
2023-07-13 11:33:58 +08:00 |
|
Harryxzy
|
820d15d06f
|
工资单确认反馈
|
2023-07-12 15:17:59 +08:00 |
|
Harryxzy
|
5dc2dadd46
|
工资单自动确认
|
2023-07-11 17:28:15 +08:00 |
|
Harryxzy
|
be895829c2
|
工资单反馈
|
2023-07-11 15:29:13 +08:00 |
|
Harryxzy
|
467746f7df
|
Merge branch 'release/2.9.1.2307.01' into feature/230701-工资单反馈
|
2023-07-10 11:12:03 +08:00 |
|
Harryxzy
|
584ebbc562
|
暂存
|
2023-07-10 11:11:52 +08:00 |
|
Harryxzy
|
0e2a6c8368
|
Merge branch 'feature/taxDeclarationWithdraw' into release/2.9.1.2307.01
# Conflicts:
# src/com/engine/salary/sys/constant/SalarySysConstant.java
# src/com/engine/salary/sys/entity/vo/AppSettingVO.java
# src/com/engine/salary/sys/service/SalarySysConfService.java
# src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
# src/com/engine/salary/web/SalarySystemConfigController.java
# src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java
|
2023-07-10 11:10:10 +08:00 |