 钱涛
|
855effccc5
|
修改系统公式异常
|
2023-10-13 16:54:33 +08:00 |
|
钱涛
|
4a59859fa8
|
调薪记录
|
2023-10-12 17:34:09 +08:00 |
Harryxzy
|
f70a7e6c96
|
Merge branch 'fix/231002_变量返回双引号或0' into release/2.9.6.2310.01
|
2023-10-12 14:28:10 +08:00 |
|
Harryxzy
|
07c1785714
|
Merge remote-tracking branch 'origin/release/2.9.6.2310.01' into release/2.9.6.2310.01
|
2023-10-12 14:27:57 +08:00 |
|
Harryxzy
|
8e8a502738
|
prop
|
2023-10-12 14:26:28 +08:00 |
|
钱涛
|
db71ba0e5f
|
fix null
|
2023-10-12 14:13:25 +08:00 |
|
Harryxzy
|
fbc49bff98
|
公式变量为文本时返回””number返回0
|
2023-10-12 13:47:18 +08:00 |
|
Harryxzy
|
c83539460c
|
薪酬token
|
2023-10-11 15:54:08 +08:00 |
|
Harryxzy
|
b71633d744
|
token
|
2023-10-11 15:28:58 +08:00 |
|
Harryxzy
|
03d3befbdd
|
token
|
2023-10-11 14:07:23 +08:00 |
|
钱涛
|
e570c1879e
|
账套保存异常
|
2023-10-09 15:35:20 +08:00 |
|
Harryxzy
|
e25ea296e8
|
Merge remote-tracking branch 'origin/release/2.9.6.2310.01' into release/2.9.6.2310.01
|
2023-10-09 14:34:32 +08:00 |
|
Harryxzy
|
2766ceb276
|
自动同步考勤定时任务
|
2023-10-09 14:34:18 +08:00 |
|
钱涛
|
61b80e3ad1
|
Merge remote-tracking branch 'origin/release/2.9.6.2310.01' into release/2.9.6.2310.01
|
2023-10-09 14:17:25 +08:00 |
|
钱涛
|
39520346dc
|
解密
|
2023-10-09 14:17:15 +08:00 |
|
Harryxzy
|
d69aa46e33
|
自动同步考勤定时任务
|
2023-10-09 14:10:09 +08:00 |
|
钱涛
|
dada3a0633
|
去除objectuutil
|
2023-10-09 10:43:43 +08:00 |
|
钱涛
|
5f152a991b
|
核算自定义其他搜索条件
|
2023-10-08 15:44:09 +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 |
|
钱涛
|
8166e76081
|
账套增加状态字段
|
2023-10-08 13:38:37 +08:00 |
sy
|
26e9fc90e1
|
薪酬系统-福利台账，修复未设置基数情况下存在的核算失败问题
|
2023-10-08 11:12:16 +08:00 |
|
钱涛
|
138f832537
|
时效性过滤
|
2023-10-08 10:11:07 +08:00 |
|
钱涛
|
b6508067f1
|
过滤枚举
|
2023-10-08 09:16:54 +08:00 |
|
钱涛
|
37e9b3c33c
|
sql可以使用薪资项目作为变量
|
2023-10-07 17:00:02 +08:00 |
|
钱涛
|
d98933832a
|
Merge branch 'feature/生成签名pdf' into release/2.9.6.2310.01
# Conflicts:
# src/com/engine/salary/web/SalaryBillController.java
|
2023-10-07 15:19:38 +08:00 |
|
钱涛
|
67a9d45630
|
工资单时效设置
|
2023-10-07 14:47:32 +08:00 |
|
钱涛
|
5241972151
|
工资单时效设置
|
2023-10-07 14:46:28 +08:00 |
|
钱涛
|
6fe4b855ec
|
Merge branch 'fix/核算效率' into release/2.9.6.2310.01
|
2023-10-07 10:05:49 +08:00 |
|
钱涛
|
4c5bc5dda7
|
增加状态
|
2023-09-28 17:05:42 +08:00 |
|
钱涛
|
6e889ccc70
|
同步字段名称到项目公式
|
2023-09-27 17:17:56 +08:00 |
|
钱涛
|
4ed4edc9ed
|
pdf按钮控制
|
2023-09-27 14:19:52 +08:00 |
|
钱涛
|
7562b4e4a3
|
Merge branch 'feature/生成签名pdf' into feature/自定义筛选条件
|
2023-09-27 14:01:32 +08:00 |
|
钱涛
|
07291fb20a
|
取消sqlserver自动分片
|
2023-09-27 10:50:05 +08:00 |
|
钱涛
|
568c62122a
|
取消sqlserver自动分片
|
2023-09-27 10:49:55 +08:00 |
|
钱涛
|
763393983c
|
工资单pdf
|
2023-09-26 17:52:46 +08:00 |
|
钱涛
|
309e89ceaa
|
异步处理核算报表数据
|
2023-09-26 17:35:23 +08:00 |
|
钱涛
|
a7e8498b98
|
取消核算报表数据
|
2023-09-26 17:18:27 +08:00 |
|
钱涛
|
f99bb21bab
|
修复核算效率
|
2023-09-26 14:29:12 +08:00 |
|
钱涛
|
e37922c52f
|
工资单pdf
|
2023-09-26 10:26:12 +08:00 |
|
钱涛
|
1de83a57c2
|
工资单pdf
|
2023-09-26 10:00:00 +08:00 |
|
钱涛
|
5d203b0783
|
自定义搜索
|
2023-09-25 16:53:01 +08:00 |
|
钱涛
|
faeafbe5ad
|
暂存
|
2023-09-25 15:38:14 +08:00 |
|
Harryxzy
|
bf8ae9fd09
|
Merge branch 'fix/230902-导出报表为数值类型' into release/2.9.5.2309.01
|
2023-09-21 16:03:38 +08:00 |
|
Harryxzy
|
bc7d7b3326
|
Merge branch 'feature/230902_报表共享' into release/2.9.5.2309.01
|
2023-09-21 15:06:04 +08:00 |
|
Harryxzy
|
7a57849a25
|
报表fixbug
|
2023-09-21 15:05:39 +08:00 |
|
sy
|
f4883ad87c
|
Merge remote-tracking branch 'remotes/origin/feature/230901-社保福利方案搜索功能' into release/2.9.5.2309.01
|
2023-09-21 14:10:06 +08:00 |
|
sy
|
5f84ed451b
|
Merge remote-tracking branch 'remotes/origin/feature/230901-福利台账-调差，支持一个人存在多个调差记录' into release/2.9.5.2309.01
|
2023-09-21 14:09:54 +08:00 |
|
Harryxzy
|
efa818f8b9
|
核算结果导出数值项excel格式为数值
|
2023-09-21 13:36:23 +08:00 |
|
Harryxzy
|
cdefb1d310
|
Merge branch 'feature/230902_报表共享' into release/2.9.5.2309.01
|
2023-09-21 11:45:34 +08:00 |
|
Harryxzy
|
443368bdb3
|
Merge branch 'fix/230902-账套中从公式改为输入，核算公式展示错误' into release/2.9.5.2309.01
|
2023-09-21 11:44:23 +08:00 |