 钱涛
|
1e78c40e9a
|
Merge branch 'feature/报表缓存' into release/2.8.4.2306.02
|
2023-06-21 09:48:23 +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 |
|
钱涛
|
16cf63018f
|
重新核算或者回算时删除报表缓存
|
2023-06-19 09:54:02 +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 |
|
钱涛
|
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 |
|
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
|
155a00623a
|
导入编辑自动锁定 根据confValue判断
|
2023-06-12 10:45:01 +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 |
|
钱涛
|
0e5eb1b11e
|
工资单发送
|
2023-06-06 11:48:19 +08:00 |
|
钱涛
|
993db67601
|
公共进度条功能
|
2023-06-06 10:30:49 +08:00 |
|
钱涛
|
4582ab1e51
|
邮件审批方法
|
2023-06-06 09:51:07 +08:00 |
|
钱涛
|
91e3b335dd
|
工资单通道
|
2023-06-05 13:35:17 +08:00 |
|
Harryxzy
|
466412a444
|
Merge branch 'fix/salaryAcctSearchLockItem' into release/2.8.3.2306.01
|
2023-06-05 09:53:13 +08:00 |
|
Harryxzy
|
30e2c489ea
|
Merge branch 'feature/salalryItemAndFieldSort' into release/2.8.3.2306.01
|
2023-06-05 09:52:57 +08:00 |
|
sy
|
f8e9e8513d
|
Merge remote-tracking branch 'remotes/origin/feature/v4-addWorkcodeQuery-0601' into release/2.8.3.2306.01
|
2023-06-05 09:17:54 +08:00 |
|
Harryxzy
|
1294e86c8c
|
导入自动锁定添加开关
|
2023-06-02 15:25:46 +08:00 |
|
Harryxzy
|
52b592dd7e
|
薪资核算获取加锁的值时增加项目条件，提速
|
2023-06-02 15:06:07 +08:00 |
|
Harryxzy
|
d53d7a33d7
|
删除锁定多余代码
|
2023-06-02 14:47:15 +08:00 |
|
钱涛
|
0da2bfa55a
|
邮件暂存
|
2023-06-02 14:38:56 +08:00 |
|
Harryxzy
|
74c5b4f19f
|
薪资项目 和 字段管理的排序
|
2023-06-01 17:52:31 +08:00 |
|
钱涛
|
4be4acc5d8
|
Merge branch 'release/2.8.3.2306.01' into feature/短信邮件
# Conflicts:
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
|
2023-06-01 11:49:16 +08:00 |
|
Harryxzy
|
4e04b6e268
|
薪资核算导入，选择表单字段获取未分类
|
2023-06-01 10:30:33 +08:00 |
|
sy
|
fb03cf98a7
|
薪酬系统，福利台账、薪资档案、薪资核算增加工号查询
|
2023-05-31 11:49:40 +08:00 |
|
Harryxzy
|
601b90d188
|
薪资档案薪资项目排序
|
2023-05-31 09:55:24 +08:00 |
|
Harryxzy
|
0ec6e740d3
|
Merge branch 'fix/backCalcSumRow' into release/2.8.3.2306.01
|
2023-05-29 16:48:18 +08:00 |
|
Harryxzy
|
a2f4653411
|
当薪资档案列表为0时，由于查询了全量数据，导致速度慢
|
2023-05-29 16:17:13 +08:00 |
|
Harryxzy
|
7e841f6fd3
|
修复回算工资单合计列
|
2023-05-26 15:13:56 +08:00 |
|
钱涛
|
fef828ef1d
|
人员明细列表展示账套和核算记录信息、自定义列功能
|
2023-05-26 11:17:25 +08:00 |
|
Harryxzy
|
b26e6069ad
|
Merge branch 'fix/salaryAcctResultEdit' into release/2.8.3.2306.01
|
2023-05-25 17:11:58 +08:00 |
|
Harryxzy
|
25ffd06dd4
|
修复编辑薪资核算没有未分类
|
2023-05-25 17:06:03 +08:00 |
|
钱涛
|
ec90e31695
|
Merge branch 'release/2.8.3.2306.01' into feature/短信邮件
|
2023-05-24 16:20:39 +08:00 |
|
钱涛
|
74c4305b9d
|
优化核算异常提示
|
2023-05-23 15:15:55 +08:00 |
|
Harryxzy
|
a916e061d8
|
Merge branch 'fix/deleteBackCalcRecordBUG' into release/2.8.2.2305.02
|
2023-05-22 14:03:22 +08:00 |