 钱涛
|
addd937b7b
|
Merge branch 'feature/支持工资单短信' into release/2.9.8.2311.02
|
2023-11-22 10:40:30 +08:00 |
Harryxzy
|
a237f75d79
|
核算结果超过1000导入bug
|
2023-11-20 11:21:58 +08:00 |
|
Harryxzy
|
c8838f2528
|
Merge branch 'fix/薪资核算编辑保存BUG' into fix/核算结果导入超过1000
|
2023-11-20 11:21:14 +08:00 |
|
Harryxzy
|
301144214a
|
薪资核算编辑保存时删除了隐藏项目
|
2023-11-20 11:09:43 +08:00 |
|
Harryxzy
|
2656ce7c90
|
薪资核算结果导入超过1000报错
|
2023-11-20 10:56:03 +08:00 |
|
钱涛
|
c0e311bf57
|
不使用系统算税支持重新核算之前月份
|
2023-11-16 11:42:02 +08:00 |
|
钱涛
|
3de1e62f6b
|
短信模板
|
2023-11-16 11:38:21 +08:00 |
|
钱涛
|
d2127cccff
|
短信模板
|
2023-11-15 13:32:37 +08:00 |
|
钱涛
|
443f2a749e
|
Merge branch 'release/3.0.0.2311.01' into release/2.9.8.2311.01
|
2023-11-13 17:20:04 +08:00 |
|
钱涛
|
2c12b10171
|
1、减少人员bug
2、档案项目输入bug
|
2023-11-13 17:12:25 +08:00 |
|
钱涛
|
f3bc735fae
|
短信发送
|
2023-11-13 16:52:19 +08:00 |
|
钱涛
|
8eefec2e57
|
跳过考勤报表假期余额权限
|
2023-11-13 11:15:49 +08:00 |
|
Harryxzy
|
c88db43e55
|
Merge remote-tracking branch 'origin/release/3.0.0.2311.01' into release/3.0.0.2311.01
|
2023-11-09 16:19:35 +08:00 |
|
Harryxzy
|
025cb73a21
|
Merge branch 'feature/231101_返聘action' into release/3.0.0.2311.01
|
2023-11-09 16:18:00 +08:00 |
|
钱涛
|
675e5d7972
|
扩展人员属性
|
2023-11-09 11:34:00 +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 |
|
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 |
|
钱涛
|
74f7c71ffe
|
扩展维度属性
|
2023-11-06 11:19:00 +08:00 |
|
Harryxzy
|
0048001c54
|
返聘
|
2023-11-03 16:53:23 +08:00 |
|
Harryxzy
|
e018ec629f
|
返聘
|
2023-11-03 16:37:09 +08:00 |
|
Harryxzy
|
44233d74a8
|
返聘
|
2023-11-03 15:28:04 +08:00 |
|
钱涛
|
0634a139b9
|
显示字符统计规则
|
2023-11-02 18:41:58 +08:00 |
|
Harryxzy
|
f85f0af44a
|
下载核算导入模板，直接从缓存拿选的字段
|
2023-11-02 16:39:58 +08:00 |
|
钱涛
|
4c11c54973
|
统一解密位置
|
2023-10-31 17:16:48 +08:00 |
|
钱涛
|
2b4ded9dd0
|
修复合计没有根据自定义字段过滤
|
2023-10-30 19:19:07 +08:00 |
|
钱涛
|
b08d3bdd2c
|
修复报表多部门查询
|
2023-10-25 11:19:47 +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 |
|
sy
|
1c0b00d163
|
薪酬系统-福利档案，福利档案基数调整记录列表查询入参调整
|
2023-10-23 18:07:37 +08:00 |
|
钱涛
|
35550aa788
|
假期余额
|
2023-10-20 13:26:25 +08:00 |
|
钱涛
|
a19f86c624
|
一键累计bug修复
|
2023-10-20 10:29:46 +08:00 |
|
sy
|
f8f5ea7782
|
薪酬系统-福利档案，薪资核算时调用福利核算数据查询时人员ids分片
|
2023-10-20 09:50:44 +08:00 |
|
sy
|
d0e0195709
|
薪酬系统-福利档案，导入时档案主表查询时人员ids分片
|
2023-10-19 14:30:58 +08:00 |
|
sy
|
96bc325b43
|
薪酬系统-福利档案，福利档案基数调整记录列表查询入参和返回数据调整
|
2023-10-18 15:13:08 +08:00 |
|
sy
|
9ac549c06a
|
薪酬系统-福利档案，福利档案基数调整记录列表查询
|
2023-10-18 13:34:05 +08:00 |
|
钱涛
|
5d7a6bc241
|
调薪记录
|
2023-10-17 18:04:47 +08:00 |
|
sy
|
0225e40e57
|
薪酬系统-福利档案，福利档案编辑保存逻辑中增加基数调整记录
|
2023-10-17 17:46:54 +08:00 |
|
sy
|
e80a3497d9
|
薪酬系统-福利档案，福利档案导入逻辑中增加基数调整记录
|
2023-10-17 11:40:28 +08:00 |
|
Harryxzy
|
a34a5b9aa6
|
同步义务人人员范围到账套人员范围
|
2023-10-16 16:59:18 +08:00 |
|
钱涛
|
4a59859fa8
|
调薪记录
|
2023-10-12 17:34:09 +08:00 |
|
钱涛
|
e570c1879e
|
账套保存异常
|
2023-10-09 15:35:20 +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 |
|
钱涛
|
138f832537
|
时效性过滤
|
2023-10-08 10:11:07 +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 |