 钱涛
|
fdfeae9344
|
合并1101
|
2023-11-08 16:21:53 +08:00 |
|
钱涛
|
75717871d0
|
Merge branch 'release/3.0.0.2311.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/SalaryEmployeeService.java
# src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
# src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
|
2023-11-08 16:20:31 +08:00 |
|
钱涛
|
d2ac1aec23
|
修改维度展示
|
2023-11-08 09:38:24 +08:00 |
|
钱涛
|
61d0e0f659
|
去除无效代码
|
2023-11-07 20:14:23 +08:00 |
|
钱涛
|
fbd19ecf75
|
缓存
|
2023-11-07 19:11:16 +08:00 |
|
钱涛
|
00f806a8e9
|
Merge branch 'release/3.0.0.2311.01' into feature/报表支持自定义维度
|
2023-11-07 19:06:57 +08:00 |
|
钱涛
|
bcee3c5e5a
|
人员属性扩展
|
2023-11-07 19:06:43 +08:00 |
|
钱涛
|
5f371a8e58
|
报表复制
|
2023-11-07 15:55:03 +08:00 |
|
钱涛
|
27255932de
|
数据库表
|
2023-11-07 15:12:10 +08:00 |
|
钱涛
|
b30c9b1ca9
|
Merge branch 'feature/扩展人员维度属性' into feature/报表支持自定义维度
|
2023-11-07 14:45:27 +08:00 |
Harryxzy
|
3353cd67ce
|
Merge remote-tracking branch 'origin/release/3.0.0.2311.01' into release/3.0.0.2311.01
|
2023-11-07 11:24:59 +08:00 |
|
Harryxzy
|
f2a840576e
|
Merge branch 'fix/薪资核算导入下载模板bug' into release/3.0.0.2311.01
|
2023-11-07 11:24:25 +08:00 |
|
钱涛
|
68bc79ab0b
|
修改关键字
|
2023-11-07 11:00:00 +08:00 |
|
钱涛
|
b9d119bcf0
|
修改关闭解密方法
|
2023-11-07 10:00:51 +08:00 |
|
钱涛
|
36a77a8e0f
|
自定义报表维度
|
2023-11-06 18:46:49 +08:00 |
|
钱涛
|
43d627c23a
|
扩展维度属性
|
2023-11-06 11:32:25 +08:00 |
|
钱涛
|
74f7c71ffe
|
扩展维度属性
|
2023-11-06 11:19:00 +08:00 |
|
钱涛
|
0634a139b9
|
显示字符统计规则
|
2023-11-02 18:41:58 +08:00 |
|
Harryxzy
|
f85f0af44a
|
下载核算导入模板，直接从缓存拿选的字段
|
2023-11-02 16:39:58 +08:00 |
|
钱涛
|
83f38d1d74
|
显示字符统计规则
|
2023-11-02 14:43:15 +08:00 |
|
钱涛
|
8f333c4ad4
|
优化核算校验日期提示
|
2023-11-01 16:44:37 +08:00 |
|
钱涛
|
22a946d9ad
|
报表支持文本
|
2023-11-01 16:09:19 +08:00 |
|
钱涛
|
7fa3c31aac
|
报表支持文本
|
2023-11-01 09:54:09 +08:00 |
|
钱涛
|
b050888b7b
|
Merge branch 'release/3.0.0.2311.01' into release/个税版本
|
2023-10-31 17:19:09 +08:00 |
|
钱涛
|
4c11c54973
|
统一解密位置
|
2023-10-31 17:16:48 +08:00 |
|
钱涛
|
0c77031e46
|
报表功能暂存
|
2023-10-31 17:08:28 +08:00 |
|
钱涛
|
3d8919da25
|
账套增加证件号码字段
|
2023-10-31 15:08:43 +08:00 |
|
钱涛
|
e70a17cd19
|
捕获社保模块导出异常
|
2023-10-31 11:21:48 +08:00 |
|
钱涛
|
4bf60c0370
|
公式负数符号特殊处理
|
2023-10-31 09:41:02 +08:00 |
|
钱涛
|
2b4ded9dd0
|
修复合计没有根据自定义字段过滤
|
2023-10-30 19:19:07 +08:00 |
|
钱涛
|
49f949b673
|
Merge branch 'release/3.0.0.2311.01' into release/个税版本
|
2023-10-30 10:34:33 +08:00 |
|
钱涛
|
321a565c35
|
fix个税sql错误
|
2023-10-26 14:40:56 +08:00 |
|
钱涛
|
872ca0a805
|
恢复档案pageid
|
2023-10-26 13:45:38 +08:00 |
|
钱涛
|
16f46ae2da
|
报表人员维度增加部门和工号
|
2023-10-25 14:33:19 +08:00 |
|
钱涛
|
b08d3bdd2c
|
修复报表多部门查询
|
2023-10-25 11:19:47 +08:00 |
|
钱涛
|
adc8bce395
|
薪资档案改个pageid
|
2023-10-25 10:14:33 +08:00 |
|
钱涛
|
61c72a2587
|
Merge branch 'release/3.0.0.2311.01' into release/个税版本
|
2023-10-24 17:33:49 +08:00 |
sy
|
05b2c1868b
|
Merge remote-tracking branch 'remotes/origin/feature/231001-福利档案基数调整记录' into release/2.9.6.2310.01
|
2023-10-24 14:11:22 +08:00 |
|
钱涛
|
cf2d2552a2
|
Merge branch 'feature/假期余额' into release/3.0.0.2311.01
|
2023-10-24 11:44:01 +08:00 |
|
钱涛
|
bf67fe17fc
|
年假余额
|
2023-10-24 11:43:14 +08:00 |
|
钱涛
|
7249c749c0
|
年假余额
|
2023-10-24 10:24:10 +08:00 |
|
sy
|
1c0b00d163
|
薪酬系统-福利档案，福利档案基数调整记录列表查询入参调整
|
2023-10-23 18:07:37 +08:00 |
|
钱涛
|
fe4e138317
|
个税调差累计字段对应
|
2023-10-23 14:44:26 +08:00 |
|
钱涛
|
026fa54a0e
|
Merge branch 'release/2.9.6.2310.01' into release/个税版本
|
2023-10-23 10:07:24 +08:00 |
|
钱涛
|
328158204d
|
个税调差累计字段对应
|
2023-10-23 10:03:04 +08:00 |
|
钱涛
|
05b9a2a57e
|
Merge branch 'feature/公式短路' into release/2.9.6.2310.01
|
2023-10-20 14:19:54 +08:00 |
|
钱涛
|
35550aa788
|
假期余额
|
2023-10-20 13:26:25 +08:00 |
|
钱涛
|
1f5edd039a
|
Merge branch 'release/2.9.6.2310.01' into release/个税版本
|
2023-10-20 10:56:07 +08:00 |
|
钱涛
|
a19f86c624
|
一键累计bug修复
|
2023-10-20 10:29:46 +08:00 |
|
sy
|
1db16d6fa6
|
Merge remote-tracking branch 'remotes/origin/fix/231001-福利档案导入bug修复，档案主表查询人员ids分片' into release/2.9.6.2310.01
|
2023-10-20 09:51:39 +08:00 |