 钱涛
|
ecdfc0c957
|
Merge remote-tracking branch 'origin/release/2.8.3.2306.01' into release/2.8.3.2306.01
|
2023-05-26 11:15:49 +08:00 |
|
钱涛
|
220848e92d
|
档案项目正序排列
|
2023-05-26 11:15:40 +08:00 |
Harryxzy
|
af07cfd930
|
Merge remote-tracking branch 'origin/release/2.8.3.2306.01' into release/2.8.3.2306.01
|
2023-05-25 17:12:15 +08:00 |
|
Harryxzy
|
b26e6069ad
|
Merge branch 'fix/salaryAcctResultEdit' into release/2.8.3.2306.01
|
2023-05-25 17:11:58 +08:00 |
|
Harryxzy
|
25ffd06dd4
|
修复编辑薪资核算没有未分类
|
2023-05-25 17:06:03 +08:00 |
|
钱涛
|
399a615be6
|
人员明细
|
2023-05-25 13:51:27 +08:00 |
sy
|
91a06a93a3
|
Merge remote-tracking branch 'remotes/origin/feature/v4-siTermDateRename-0525' into release/2.8.3.2306.01
|
2023-05-24 10:04:47 +08:00 |
|
sy
|
a44f6bf3af
|
薪酬系统-福利档案，列表表头中的离职日期改为合同到期日期
|
2023-05-24 10:02:49 +08:00 |
|
钱涛
|
74c4305b9d
|
优化核算异常提示
|
2023-05-23 15:15:55 +08:00 |
|
Harryxzy
|
5768da7099
|
Merge remote-tracking branch 'origin/release/2.8.2.2305.02' into release/2.8.2.2305.02
|
2023-05-22 14:03:51 +08:00 |
|
Harryxzy
|
1525cf89c7
|
Merge branch 'feature/initSalaryArchiveAction' into release/2.8.2.2305.02
|
2023-05-22 14:03:32 +08:00 |
|
Harryxzy
|
a916e061d8
|
Merge branch 'fix/deleteBackCalcRecordBUG' into release/2.8.2.2305.02
|
2023-05-22 14:03:22 +08:00 |
|
Harryxzy
|
c7bdbe7b85
|
Merge branch 'feature/V3-salaryAcctResultLog' into release/2.8.2.2305.02
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
|
2023-05-22 14:03:07 +08:00 |
|
Harryxzy
|
20262169c9
|
Merge branch 'fix/salaryAcctResutAutoLock' into release/2.8.2.2305.02
|
2023-05-22 14:02:28 +08:00 |
|
钱涛
|
64be49c61c
|
工资单适配微信
|
2023-05-22 10:12:23 +08:00 |
|
Harryxzy
|
ebf966517b
|
修复保存日志获取不到id
|
2023-05-18 14:28:31 +08:00 |
|
钱涛
|
ff8dcf1769
|
核算异常信息
|
2023-05-17 17:38:12 +08:00 |
|
钱涛
|
404db31695
|
薪资项目系统项目排序靠后
|
2023-05-17 16:57:37 +08:00 |
|
钱涛
|
1534b0257d
|
Merge branch 'feature/公式v2' into release/2.8.2.2305.02
|
2023-05-17 15:08:16 +08:00 |
|
钱涛
|
7ccf8cf607
|
字段管理不显示默认使用列
|
2023-05-17 14:59:12 +08:00 |
|
Harryxzy
|
72f2ca4439
|
修复核算编辑保存
|
2023-05-17 14:49:53 +08:00 |
|
钱涛
|
df07a8c9d1
|
Merge remote-tracking branch 'origin/release/2.8.2.2305.02' into release/2.8.2.2305.02
|
2023-05-17 14:10:25 +08:00 |
|
钱涛
|
8ad88b1e97
|
我的工资接口修改
|
2023-05-17 14:10:12 +08:00 |
|
钱涛
|
a7cc99fdd3
|
公式异常信息
|
2023-05-16 18:01:38 +08:00 |
|
Harryxzy
|
083916eb0c
|
薪资核算编辑 带上公式
|
2023-05-16 15:41:11 +08:00 |
|
Harryxzy
|
a3ee91db15
|
回算后不允许删除薪资核算记录
|
2023-05-16 15:05:02 +08:00 |
|
Harryxzy
|
a6fc40a084
|
薪资核算 编辑列改造
|
2023-05-16 14:12:49 +08:00 |
|
Harryxzy
|
7c74149184
|
薪资核算导入 选择字段根据分类分组
|
2023-05-15 18:02:22 +08:00 |
|
Harryxzy
|
6fcfc2db9b
|
定薪action
|
2023-05-15 16:47:00 +08:00 |
|
sy
|
e28ca6a2d0
|
薪酬系统-福利档案，生成福利档案列表表头过程中，过滤源数据中人员id为空的数据v2
|
2023-05-15 14:45:06 +08:00 |
|
sy
|
cf6b35f6a0
|
薪酬系统-福利档案，生成福利档案列表表头过程中，过滤源数据中人员id为空的数据
|
2023-05-15 13:58:06 +08:00 |
|
Harryxzy
|
4ff15ca651
|
薪资核算结果编辑导入 记录
|
2023-05-15 10:28:17 +08:00 |
|
钱涛
|
fb271f435a
|
公式方法改造
|
2023-05-15 10:00:59 +08:00 |
|
钱涛
|
d0e5a3a643
|
Merge branch 'feature/报表v2' into release/2.8.2.2305.02
|
2023-05-15 09:29:00 +08:00 |
|
钱涛
|
d51c89bb82
|
公式方法改造
|
2023-05-15 09:28:22 +08:00 |
|
钱涛
|
f848b74f28
|
薪酬流程日志
|
2023-05-12 11:51:42 +08:00 |
|
钱涛
|
eaaf6359af
|
Merge branch 'feature/公式' into release/2.8.2.2305.02
|
2023-05-12 09:16:54 +08:00 |
|
Harryxzy
|
b0084cad9c
|
薪资核算编辑 手动编辑后自动锁定
|
2023-05-11 14:40:10 +08:00 |
|
Harryxzy
|
54ca46c653
|
薪资核算导入项自动锁定
|
2023-05-11 10:51:43 +08:00 |
|
钱涛
|
53f2c1ebb6
|
修复提示行号
|
2023-05-11 10:21:21 +08:00 |
|
Harryxzy
|
d08a329000
|
Merge branch 'feature/维护工具' into release/2.8.2.2305.02
|
2023-05-11 10:09:10 +08:00 |
|
钱涛
|
6ec0b53fe5
|
默认档案起始发薪是入职时间
|
2023-05-11 10:00:21 +08:00 |
|
钱涛
|
3840f26464
|
公式异常处理
|
2023-05-10 18:55:23 +08:00 |
|
钱涛
|
c87db92ee8
|
公式扩展核算基本信息和核算日期
|
2023-05-10 14:26:39 +08:00 |
|
钱涛
|
2941b5f304
|
删除报表同时删除项目
|
2023-05-09 17:37:05 +08:00 |
|
钱涛
|
ecd037424b
|
去除异常分页
|
2023-05-09 14:28:46 +08:00 |
|
钱涛
|
797d5095eb
|
适配if
|
2023-05-09 10:43:51 +08:00 |
|
sy
|
bbba7f314d
|
薪酬系统-福利，福利档案、核算明细列表获取员工状态逻辑调整
|
2023-05-08 17:58:17 +08:00 |
|
钱涛
|
197506b72b
|
适配if
|
2023-05-08 14:12:33 +08:00 |
|
钱涛
|
6b19445a1a
|
Merge branch 'release/2.8.2.2305.02' into feature/公式
# Conflicts:
# src/com/engine/salary/service/impl/TaxDeclarationDetailServiceImpl.java
|
2023-05-08 11:22:23 +08:00 |