sy
|
c9a5228f3e
|
Merge remote-tracking branch 'remotes/origin/feature/v4-siAcctImprove-0420' into release/2.7.4.2304.02
|
2023-04-23 13:36:28 +08:00 |
|
sy
|
d56e9aff82
|
薪酬系统，导出excel的title行背景置为灰色
|
2023-04-23 13:35:17 +08:00 |
 钱涛
|
36863c3695
|
报表
|
2023-04-23 10:14:32 +08:00 |
|
钱涛
|
ce8ca9cdb8
|
分部实现逻辑
|
2023-04-21 13:52:57 +08:00 |
|
钱涛
|
4a9df2276d
|
分部计算类
|
2023-04-21 11:25:16 +08:00 |
|
钱涛
|
d2b304e690
|
全量数据
|
2023-04-20 18:04:18 +08:00 |
|
钱涛
|
135530d3b7
|
全量数据
|
2023-04-20 17:55:37 +08:00 |
Harryxzy
|
3a555c1866
|
修复已发
|
2023-04-20 13:08:58 +08:00 |
|
钱涛
|
ef171db128
|
公式函数
|
2023-04-19 19:28:05 +08:00 |
|
钱涛
|
19d5e979bb
|
修复删除报表和维度分页
|
2023-04-19 16:32:27 +08:00 |
|
钱涛
|
9994ae3df9
|
公式
|
2023-04-19 15:22:42 +08:00 |
|
钱涛
|
34f33d21d8
|
公式
|
2023-04-19 13:35:35 +08:00 |
|
钱涛
|
a19b19e23d
|
公式
|
2023-04-19 10:15:01 +08:00 |
|
钱涛
|
95dd20dc7b
|
报表接口
|
2023-04-18 18:55:38 +08:00 |
|
sy
|
62af02522c
|
薪酬系统-福利台账，线下对比（列表、导入、导出）福利项字段根据正常缴纳中的核算字段获得
|
2023-04-18 14:21:05 +08:00 |
|
钱涛
|
aeab5c75f5
|
往期修复
|
2023-04-18 11:45:30 +08:00 |
|
钱涛
|
c5d9ea5421
|
累计个人养老金bug
|
2023-04-18 11:03:09 +08:00 |
|
钱涛
|
4c41b35b2b
|
外部人员档案优化
|
2023-04-17 15:31:56 +08:00 |
|
sy
|
f68981baac
|
薪酬系统-福利台账，福利核算、核算明细列表逻辑优化（取消对档案状态的过滤）
|
2023-04-17 10:27:31 +08:00 |
|
钱涛
|
f619878f2c
|
暂存
|
2023-04-17 10:10:39 +08:00 |
|
钱涛
|
6933d63cb1
|
自定义报表项目
|
2023-04-17 09:46:01 +08:00 |
|
钱涛
|
bc590b9ee8
|
自定义报表
|
2023-04-14 15:18:18 +08:00 |
|
钱涛
|
bc0b84ee4b
|
档案验证
|
2023-04-14 10:51:05 +08:00 |
|
钱涛
|
8a2ec10b65
|
Merge branch 'release/2.7.3.2304.01' into feature/外部人员
|
2023-04-14 10:31:41 +08:00 |
|
钱涛
|
abf255d03c
|
暂存
|
2023-04-14 10:31:20 +08:00 |
|
Harryxzy
|
b5d3acf418
|
Merge branch 'feature/salaryItemFieldsCanCopy_0420' into release/2.7.3.2304.01
|
2023-04-14 09:04:23 +08:00 |
|
钱涛
|
5cb6752c4c
|
Merge branch 'release/2.7.3.2304.01' into feature/外部人员
|
2023-04-13 17:32:17 +08:00 |
|
钱涛
|
a87c344581
|
个人养老金
|
2023-04-13 17:14:58 +08:00 |
|
钱涛
|
87701c7229
|
暂存
|
2023-04-13 15:13:05 +08:00 |
|
钱涛
|
2d8b538897
|
Merge remote-tracking branch 'origin/fix/employeeServiceFormat_0412' into feature/报表
|
2023-04-13 14:54:22 +08:00 |
|
钱涛
|
9549e75e00
|
Merge branch 'release/2.7.3.2304.01' into feature/外部人员
|
2023-04-13 14:48:43 +08:00 |
|
钱涛
|
15d6a63df6
|
薪酬上下文
|
2023-04-13 11:53:43 +08:00 |
|
钱涛
|
deb2e367f4
|
薪酬上下文
|
2023-04-13 11:53:08 +08:00 |
|
钱涛
|
59a38954bc
|
Merge branch 'feature/个人养老金' into release/2.7.3.2304.01
# Conflicts:
# src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java
|
2023-04-13 09:35:29 +08:00 |
|
钱涛
|
5ec4f9e649
|
暂存
|
2023-04-13 09:32:20 +08:00 |
|
Harryxzy
|
82ee707f16
|
employebiz改成employeeservice
|
2023-04-12 15:27:35 +08:00 |
|
钱涛
|
dc5c776d97
|
暂存
|
2023-04-12 15:03:19 +08:00 |
|
钱涛
|
f0eb9c8994
|
养老金最终版
|
2023-04-12 13:57:13 +08:00 |
|
钱涛
|
671bbc6bfb
|
养老金最终版
|
2023-04-12 10:51:52 +08:00 |
|
钱涛
|
58dbdb0d05
|
养老金
|
2023-04-12 09:39:53 +08:00 |
|
钱涛
|
1cbb889748
|
报表删除
|
2023-04-11 18:43:33 +08:00 |
|
钱涛
|
a4a829d201
|
年终奖数据
|
2023-04-11 17:24:31 +08:00 |
|
钱涛
|
0749fffcdb
|
统计维度
|
2023-04-11 14:00:41 +08:00 |
|
Harryxzy
|
e21b53c2df
|
Merge branch 'fix/deleteSalarySobAddCheck_0414' into release/2.7.3.2304.01
|
2023-04-11 14:00:26 +08:00 |
|
Harryxzy
|
bbe7edaa22
|
Merge branch 'feature/salaryBillAddSum-0323' into release/2.7.3.2304.01
|
2023-04-11 13:56:18 +08:00 |
|
钱涛
|
d7ab77dab1
|
暂存
|
2023-04-11 13:43:00 +08:00 |
|
Harryxzy
|
0bfe0b62a7
|
fix 字段重复无法保存
|
2023-04-11 11:43:32 +08:00 |
|
钱涛
|
e8ae952f18
|
Merge branch 'release/2.7.3.2304.01' into feature/外部人员
# Conflicts:
# src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveExcelBO.java
|
2023-04-11 11:41:30 +08:00 |
|
钱涛
|
95c8ee6a4f
|
修复mybatis
|
2023-04-11 11:31:20 +08:00 |
|
钱涛
|
bbcaa1a1e8
|
暂存
|
2023-04-11 11:02:03 +08:00 |