sy
|
47dc9e35bd
|
薪酬系统-福利台账，已归档状态下重新核算按钮增加是否被薪资核算引用校验逻辑
|
2023-07-11 17:56:45 +08:00 |
|
sy
|
193e28758c
|
薪酬系统-薪资核算、薪资档案、福利档案，高级搜索中的状态条件改为数组类型的入参
|
2023-07-10 10:26:08 +08:00 |
|
sy
|
fa28db9c79
|
薪酬系统-薪资核算，高级搜索和导出带入筛选条件未生效问题修复
|
2023-07-07 10:15:23 +08:00 |
 钱涛
|
91859e5127
|
Merge branch 'feature/230701非系统算税' into release/2.9.1.2307.01
|
2023-07-04 15:38:55 +08:00 |
|
sy
|
0e8aa4995d
|
Merge remote-tracking branch 'remotes/origin/fix/importTemplateRemarkRepair' into release/2.9.1.2307.01
|
2023-07-04 14:51:07 +08:00 |
|
sy
|
7f7e7cd453
|
薪酬系统-薪资档案，导入模板字段提示位置问题修复
|
2023-07-04 14:48:02 +08:00 |
|
钱涛
|
82ab6c1e11
|
非系统算税功能
|
2023-07-04 09:32:12 +08:00 |
|
钱涛
|
a37d6758bb
|
核算状态标识
|
2023-07-03 14:27:20 +08:00 |
|
钱涛
|
1403b22cf7
|
修复邮件保存
|
2023-07-03 14:02:34 +08:00 |
Harryxzy
|
d10d5da364
|
Merge remote-tracking branch 'origin/release/2.8.4.2306.02' into release/2.8.4.2306.02
|
2023-06-29 15:14:10 +08:00 |
|
sy
|
a429c271f4
|
Merge branch 'feature/230602-数据库适配-PG' into release/2.8.4.2306.02
|
2023-06-29 15:12:48 +08:00 |
|
Harryxzy
|
eb0c59c0b9
|
累计专项附加扣除列表提速-2
|
2023-06-29 14:05:33 +08:00 |
|
Harryxzy
|
33593311df
|
累计专项附加扣除列表提速
|
2023-06-29 14:04:11 +08:00 |
|
Harryxzy
|
e3e0bcd66b
|
累计专项附加扣除防抖动
|
2023-06-29 13:53:07 +08:00 |
|
钱涛
|
6a5304a605
|
修复进度条
|
2023-06-29 13:38:07 +08:00 |
|
钱涛
|
b130fb0121
|
海康包冲突jar
|
2023-06-28 18:11:53 +08:00 |
|
Harryxzy
|
5d83326d23
|
listByAcctEmployeeIdsAndSalaryItemIds的分片问题
|
2023-06-28 16:26:20 +08:00 |
|
sy
|
faee7160e3
|
Merge remote-tracking branch 'remotes/origin/release/2.8.4.2306.02' into feature/230602-数据库适配-PG
|
2023-06-28 09:46:11 +08:00 |
|
Harryxzy
|
2bb5d18b90
|
Merge branch 'fix/薪资核算页面查看权限校验' into release/2.8.4.2306.02
|
2023-06-28 09:16:51 +08:00 |
|
Harryxzy
|
ea527d0e37
|
Merge branch 'fix/下载档案模板没有数据' into release/2.8.4.2306.02
|
2023-06-27 18:00:59 +08:00 |
|
Harryxzy
|
04f0528143
|
修复下载薪资档案模板没有带出档案数据
|
2023-06-27 18:00:39 +08:00 |
|
钱涛
|
89ae0dc786
|
报表缓存时参数变更问题
|
2023-06-27 16:18:42 +08:00 |
|
sy
|
041303275b
|
Merge remote-tracking branch 'remotes/origin/release/2.8.4.2306.02' into feature/230602-数据库适配-PG
|
2023-06-27 15:09:12 +08:00 |
|
sy
|
d65a792076
|
Merge remote-tracking branch 'remotes/origin/release/2.8.4.2306.02' into feature/230602-数据库适配-PG
|
2023-06-27 15:05:22 +08:00 |
|
sy
|
1ed02f4d07
|
薪酬系统-福利台账，(修改台账列表返回台账状态值返回逻辑)——暂时取消
|
2023-06-27 15:05:07 +08:00 |
|
Harryxzy
|
822ad87451
|
薪资核算结果校验拦截
|
2023-06-27 14:58:33 +08:00 |
|
Harryxzy
|
6ae98ce50a
|
Merge branch 'fix/新建定量维度时数据透视没有值' into release/2.8.4.2306.02
|
2023-06-26 14:23:27 +08:00 |
|
钱涛
|
6f3593f44b
|
Merge branch 'feature/短信验证码' into release/2.8.4.2306.02
# Conflicts:
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
# src/com/engine/salary/sys/constant/SalarySysConstant.java
|
2023-06-26 13:54:56 +08:00 |
|
Harryxzy
|
ca248ded98
|
发送邮件修复bug
|
2023-06-26 13:32:14 +08:00 |
|
Harryxzy
|
7c44a2ad6b
|
Merge branch 'feature/waterMark' into release/2.8.4.2306.02
# Conflicts:
# src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java
# src/com/engine/salary/web/SalaryBillController.java
|
2023-06-26 13:28:21 +08:00 |
|
Harryxzy
|
ce6ba1453c
|
Merge branch 'fix/一键累计定时任务' into release/2.8.4.2306.02
|
2023-06-26 13:27:21 +08:00 |
|
Harryxzy
|
0d23a318e8
|
Merge branch 'feature/停薪action' into release/2.8.4.2306.02
|
2023-06-26 13:27:03 +08:00 |
|
Harryxzy
|
a43123efc0
|
Merge branch 'fix/DBType修改' into release/2.8.4.2306.02
|
2023-06-26 13:26:27 +08:00 |
|
Harryxzy
|
3be6eaa16f
|
Merge branch 'feature/核算人员匹配规则（是否包含停薪列）' into release/2.8.4.2306.02
|
2023-06-26 13:26:03 +08:00 |
|
Harryxzy
|
0117624dc4
|
Merge branch 'fix/回算后无法发放第二次工资单' into release/2.8.4.2306.02
|
2023-06-26 13:25:36 +08:00 |
|
Harryxzy
|
5ecba7fa3e
|
Merge branch 'feature/taxDeclarationWithdraw' into release/2.8.4.2306.02
|
2023-06-26 13:25:01 +08:00 |
|
sy
|
cbcd53d92d
|
薪酬系统-福利台账，修改台账列表返回台账状态值返回逻辑
|
2023-06-26 10:56:03 +08:00 |
|
sy
|
f2cca4cfd7
|
Merge remote-tracking branch 'remotes/origin/fix/DBType修改' into feature/230602-数据库适配-PG
|
2023-06-26 10:15:24 +08:00 |
|
sy
|
8514f076d0
|
薪酬系统-pg数据库适配，考勤引用-设置表头字段显示异常问题修复
|
2023-06-26 10:14:07 +08:00 |
|
钱涛
|
50fa724756
|
采用线程池发送邮件
|
2023-06-26 10:11:54 +08:00 |
|
sy
|
3657abe41b
|
薪酬系统-pg数据库适配，福利档案状态变换异常问题修复
|
2023-06-25 17:56:18 +08:00 |
|
sy
|
1bb9b939f0
|
薪酬系统-pg数据库适配，薪资档案待定薪导入问题修复
|
2023-06-25 13:50:20 +08:00 |
|
钱涛
|
1e78c40e9a
|
Merge branch 'feature/报表缓存' into release/2.8.4.2306.02
|
2023-06-21 09:48:23 +08:00 |
|
Harryxzy
|
e7edb9040c
|
修复无分类
|
2023-06-20 17:27:18 +08:00 |
|
钱涛
|
3708aea0de
|
考勤引用-列表字段根据当时引用情况生成
|
2023-06-20 17:00:14 +08:00 |
|
钱涛
|
d90a1977ce
|
fix数据采集-往期累计情况导出全部字段为空时显示null
|
2023-06-20 15:58:03 +08:00 |
|
Harryxzy
|
d60d24ea2e
|
新建定量维度时数据透视没有值
|
2023-06-20 14:31:06 +08:00 |
|
钱涛
|
7719c503fe
|
Merge branch 'release/2.8.4.2306.02' into feature/报表缓存
|
2023-06-19 14:22:11 +08:00 |
|
Harryxzy
|
0e601e3967
|
修改DBType的写法
|
2023-06-19 13:59:24 +08:00 |
|
钱涛
|
16cf63018f
|
重新核算或者回算时删除报表缓存
|
2023-06-19 09:54:02 +08:00 |