Harryxzy
|
5d83326d23
|
listByAcctEmployeeIdsAndSalaryItemIds的分片问题
|
2023-06-28 16:26:20 +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 |
|
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
|
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
|
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 |
|
钱涛
|
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 |
|
钱涛
|
d90a1977ce
|
fix数据采集-往期累计情况导出全部字段为空时显示null
|
2023-06-20 15:58:03 +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 |
|
Harryxzy
|
6850c050b8
|
薪资核算人员去除 停薪_来自待定薪
|
2023-06-19 09:16:49 +08:00 |
|
Harryxzy
|
d9f57ac258
|
修复回算后无法发放第二次核算的工资单
|
2023-06-16 16:41:49 +08:00 |
|
钱涛
|
8612f0e5b2
|
Merge branch 'release/2.8.4.2306.02' into feature/短信验证码
|
2023-06-16 14:54:24 +08:00 |
|
Harryxzy
|
3096954628
|
核算人员匹配规则（是否包含停薪列表）暂存
|
2023-06-16 14:40:36 +08:00 |
|
钱涛
|
ec67c89e7d
|
报表排除掉未归档的数据
|
2023-06-16 13:49:40 +08:00 |
|
Harryxzy
|
ee7936a9bf
|
考勤引用校验能够否删除
|
2023-06-16 13:33:38 +08:00 |
|
Harryxzy
|
512510c623
|
考勤引用校验能够否删除
|
2023-06-16 11:49:23 +08:00 |
|
Harryxzy
|
1805726387
|
限制无法打开他人工资单
|
2023-06-16 10:14:28 +08:00 |
|
Harryxzy
|
f4b3a742f0
|
系统默认水印
|
2023-06-16 09:58:54 +08:00 |
|
钱涛
|
5e6a65e47e
|
获取报表缓存，暂存方法
|
2023-06-15 18:48:31 +08:00 |
sy
|
f33f309262
|
Merge remote-tracking branch 'remotes/origin/feature/v4-importAndExportHeaderUnified-0615' into release/2.8.4.2306.02
|
2023-06-15 16:35:52 +08:00 |
|
钱涛
|
87a9338a73
|
Merge remote-tracking branch 'origin/release/2.8.4.2306.02' into release/2.8.4.2306.02
|
2023-06-15 10:44:42 +08:00 |
|
钱涛
|
2480525fa6
|
修复同步档案bug
缓存公共接口
|
2023-06-15 10:44:31 +08:00 |
|
钱涛
|
57798a8e3e
|
短信验证码功能
|
2023-06-14 15:51:26 +08:00 |
|
sy
|
3638fb469f
|
薪酬系统-薪资档案，列表导入、导出统一表头内容和顺序，不包括自选表头
|
2023-06-14 10:33:26 +08:00 |
|
sy
|
12b4977067
|
薪酬系统-福利台账，退差新增逻辑优化
|
2023-06-13 15:43:10 +08:00 |
|
sy
|
1460d32ae4
|
薪酬系统-社保福利，列表导入、导出统一表头内容和顺序，不包括自选表头
|
2023-06-13 14:49:26 +08:00 |
|
Harryxzy
|
b544c5e2c1
|
水印预览
|
2023-06-13 10:02:11 +08:00 |
|
Harryxzy
|
7a40a31d6f
|
水印 - 暂存2
|
2023-06-12 15:19:24 +08:00 |
|
Harryxzy
|
155a00623a
|
导入编辑自动锁定 根据confValue判断
|
2023-06-12 10:45:01 +08:00 |
|
Harryxzy
|
c37750b538
|
撤回个税申报
|
2023-06-12 10:40:01 +08:00 |
|
Harryxzy
|
76977331af
|
暂存
|
2023-06-09 17:57:17 +08:00 |
|
Harryxzy
|
b2f39f56e2
|
Merge branch 'fix/sysSalaryItemSearchBUG' into release/2.8.3.2306.01
|
2023-06-09 09:50:25 +08:00 |
|
Harryxzy
|
e24579f363
|
Merge branch 'feature/statisticDataPerspective' into release/2.8.3.2306.01
|
2023-06-09 09:48:27 +08:00 |
|
Harryxzy
|
dbb2a97be4
|
系统薪资项目列表显示改造
|
2023-06-08 11:10:40 +08:00 |
|
钱涛
|
799b3d9f64
|
Merge branch 'feature/短信邮件' into release/2.8.3.2306.01
|
2023-06-07 17:32:48 +08:00 |
|
Harryxzy
|
4617005e1f
|
数据透视功能
|
2023-06-07 15:43:23 +08:00 |
|
sy
|
4c1e7da51b
|
薪酬系统-福利档案，福利档案导出增加工号信息
|
2023-06-07 15:40:38 +08:00 |
|
钱涛
|
3498005a11
|
工资单发放
|
2023-06-07 14:21:47 +08:00 |
|
钱涛
|
f154753698
|
拦截短信
|
2023-06-06 15:02:53 +08:00 |
|
钱涛
|
4358dc20a5
|
Merge branch 'release/2.8.3.2306.01' into feature/短信邮件
|
2023-06-06 14:24:23 +08:00 |
|
钱涛
|
a308ee8d1f
|
获取员工短信内容
|
2023-06-06 14:21:35 +08:00 |