Harryxzy
|
ff19e46ac2
|
fix
|
2024-04-07 15:52:07 +08:00 |
|
Harryxzy
|
93f9e9aca7
|
1、修复工资单员工信息分部显示问题
2、修复日志功能查询参数超1000导致的报错
|
2024-04-07 13:56:00 +08:00 |
|
Harryxzy
|
2242723d3f
|
Merge branch 'feature/240302-薪资核算导出模板' into release/2.12.1.2403.02
|
2024-04-03 11:39:30 +08:00 |
 钱涛
|
a06a54f574
|
去除objectUtil
|
2024-04-01 20:25:23 +08:00 |
|
Harryxzy
|
4ccfac80f5
|
sql
|
2024-04-01 16:33:13 +08:00 |
|
Harryxzy
|
f9d7c05190
|
核算导出模板修改表名
|
2024-04-01 10:17:45 +08:00 |
|
Harryxzy
|
7557c1b330
|
薪资核算导出模板优化
|
2024-03-29 15:45:45 +08:00 |
|
Harryxzy
|
47e0f5da52
|
fix冲突
|
2024-03-29 10:52:46 +08:00 |
|
Harryxzy
|
330d1363fc
|
Merge branch 'fix/240302-调薪前端保留位数优化' into release/2.12.1.2403.02
|
2024-03-29 10:49:58 +08:00 |
|
Harryxzy
|
5d2cc92bf8
|
Merge branch 'feature/240302-薪资明细表' into release/2.12.1.2403.02
# Conflicts:
# src/com/engine/salary/mapper/datacollection/EmployMapper.java
# src/com/engine/salary/mapper/datacollection/EmployMapper.xml
# src/com/engine/salary/service/SalaryEmployeeService.java
# src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
|
2024-03-29 10:49:39 +08:00 |
|
Harryxzy
|
4e25dd4f0d
|
Merge branch 'feature/240302-报表明细导出' into release/2.12.1.2403.02
|
2024-03-29 10:47:44 +08:00 |
|
Harryxzy
|
582abc061a
|
薪资核算导出模板
|
2024-03-29 10:46:51 +08:00 |
|
Harryxzy
|
0d6bf4dfe3
|
薪资核算导出模板修复
|
2024-03-28 18:28:22 +08:00 |
|
Harryxzy
|
130be31d99
|
薪资核算导出模板
|
2024-03-27 11:33:56 +08:00 |
|
Harryxzy
|
3c8d1dc6ee
|
薪资明细表
|
2024-03-27 09:35:47 +08:00 |
|
Harryxzy
|
1c40ed0ecd
|
薪资核算导出模板
|
2024-03-26 17:04:56 +08:00 |
|
Harryxzy
|
92ba8e8fcf
|
薪资明细合计接口
|
2024-03-26 13:49:37 +08:00 |
|
Harryxzy
|
ccc2744bee
|
薪资明细
|
2024-03-26 09:12:59 +08:00 |
|
Harryxzy
|
faabf1dad3
|
薪酬报表-人事状态
|
2024-03-25 17:29:40 +08:00 |
|
Harryxzy
|
e3c528c649
|
薪资明细表
|
2024-03-25 16:08:34 +08:00 |
|
Harryxzy
|
25c2e2f1c1
|
其他维度
|
2024-03-22 15:23:03 +08:00 |
|
Harryxzy
|
18c496c009
|
多部门多分部筛选
|
2024-03-21 14:19:36 +08:00 |
|
Harryxzy
|
0c444acd38
|
多部门多分部筛选
|
2024-03-21 14:19:03 +08:00 |
|
Harryxzy
|
2691b1e099
|
调薪显示位数前端优化
|
2024-03-19 17:36:58 +08:00 |
|
Harryxzy
|
649dd8f7d5
|
社保福利台账补缴新增
|
2024-03-19 17:23:53 +08:00 |
|
Harryxzy
|
1a4059f7ba
|
报表数据透视导出
|
2024-03-19 13:35:37 +08:00 |
|
钱涛
|
68b4d29c40
|
修改版本号
|
2024-03-18 09:54:59 +08:00 |
|
钱涛
|
80510c8cfc
|
修改版本号
|
2024-03-15 10:20:38 +08:00 |
|
Harryxzy
|
69d94731a0
|
Merge branch 'feature/240301_阅后即焚' into release/3.0.0.2403.01
|
2024-03-15 10:15:12 +08:00 |
|
Harryxzy
|
08b2c240ab
|
提示修复
|
2024-03-15 10:14:59 +08:00 |
|
Harryxzy
|
a1c6d6ba52
|
Merge branch 'feature/240301_阅后即焚' into release/3.0.0.2403.01
|
2024-03-15 09:33:22 +08:00 |
|
Harryxzy
|
c3800881bc
|
sql
|
2024-03-15 09:31:04 +08:00 |
|
Harryxzy
|
0f8b16d473
|
Merge branch 'feature/240301_同步起始缴纳月、起始发薪日期' into release/3.0.0.2403.01
|
2024-03-15 09:19:17 +08:00 |
|
Harryxzy
|
b17d2b70de
|
Merge branch 'feature/240301_阅后即焚' into release/3.0.0.2403.01
|
2024-03-15 09:19:03 +08:00 |
|
Harryxzy
|
d28321bcad
|
Merge branch 'fix/240302_加密解密社保福利错误' into release/3.0.0.2403.01
# Conflicts:
# src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
|
2024-03-15 09:18:57 +08:00 |
|
Harryxzy
|
ea2a8540ef
|
Merge branch 'fix/240301-加解密开关后社保台账线下对比bug' into release/3.0.0.2403.01
|
2024-03-15 09:18:30 +08:00 |
|
钱涛
|
0a7334ddef
|
考勤导入，多语言
|
2024-03-14 18:16:20 +08:00 |
|
钱涛
|
29e81e03c2
|
优化公式不显示未启用的考勤字段
|
2024-03-14 16:08:16 +08:00 |
|
钱涛
|
417c9f703d
|
下载模板时带出数据
|
2024-03-14 15:28:14 +08:00 |
|
Harryxzy
|
0c42e1cb35
|
同步社保、薪资档案起始发薪日为入职日定时任务
|
2024-03-14 14:05:36 +08:00 |
|
钱涛
|
a70a2061a5
|
部门改多选
|
2024-03-14 11:19:02 +08:00 |
|
Harryxzy
|
8543d70a66
|
社保加解密
|
2024-03-14 11:07:01 +08:00 |
|
钱涛
|
f23b23cd92
|
优化IF解释
|
2024-03-14 10:25:39 +08:00 |
|
Harryxzy
|
26a3199b1e
|
社保线下对比加解密
|
2024-03-13 17:58:24 +08:00 |
|
Harryxzy
|
dca445810d
|
Merge branch 'fix/240301_薪资核算、社保台账导入提示缺失' into fix/240302_加密解密社保福利错误
|
2024-03-12 18:31:30 +08:00 |
|
钱涛
|
bef1835c39
|
jar更新
|
2024-03-12 16:46:55 +08:00 |
|
Harryxzy
|
43c57cb10b
|
阅后即焚功能
|
2024-03-12 16:17:24 +08:00 |
|
Harryxzy
|
b5afaa54df
|
Merge branch 'release/3.0.0.2403.01' into feature/240301_阅后即焚
|
2024-03-12 15:13:34 +08:00 |
|
Harryxzy
|
af57e8ecf4
|
Merge remote-tracking branch 'origin/release/3.0.0.2403.01' into release/3.0.0.2403.01
|
2024-03-12 14:58:21 +08:00 |
|
钱涛
|
e22e178d08
|
去除非标准功能
|
2024-03-12 14:51:28 +08:00 |