Harryxzy
|
509257b419
|
pdf导出前先校验生成pdf
|
2024-05-11 15:07:54 +08:00 |
|
Harryxzy
|
8d18c0e5cb
|
优化“薪资项目同步至账套”，薪酬总管理员能选到所有义务人下账套
|
2024-05-10 18:25:32 +08:00 |
|
Harryxzy
|
1c1a77d387
|
移动端工资单列表返回登陆人id
|
2024-05-10 15:41:40 +08:00 |
|
Harryxzy
|
845586cba2
|
test
|
2024-05-10 14:54:02 +08:00 |
 钱涛
|
e7dee966d6
|
二开说明
|
2024-05-09 17:27:28 +08:00 |
|
钱涛
|
bcc1e35117
|
拦截核算记录样例
|
2024-05-08 17:28:43 +08:00 |
|
钱涛
|
6d4265acf1
|
职称显示为中午
|
2024-05-08 15:31:36 +08:00 |
|
钱涛
|
c97618bd97
|
修复社保福利修改时没有小数位问题
|
2024-05-08 11:15:52 +08:00 |
|
钱涛
|
6f2d65a4be
|
修复社保福利新建时没有小数位和进位规则对应问题
|
2024-05-08 10:49:08 +08:00 |
|
钱涛
|
6b0606f5a4
|
自适应
|
2024-05-07 17:37:02 +08:00 |
|
Harryxzy
|
b5b2c9ef1e
|
累计专项附加扣除一键累计，能根据义务人进行累计
|
2024-04-30 15:00:43 +08:00 |
|
Harryxzy
|
4b474f864f
|
累计专项附加扣除一键累计，能根据义务人进行累计
|
2024-04-30 14:43:37 +08:00 |
|
钱涛
|
7d7d2dc309
|
处理公式数组问题
|
2024-04-28 16:21:44 +08:00 |
|
Harryxzy
|
e7c46bc5e8
|
优化同步离职日期
|
2024-04-26 15:13:54 +08:00 |
|
钱涛
|
4682866674
|
档案sql
|
2024-04-25 14:25:40 +08:00 |
|
Harryxzy
|
ea968c316e
|
解决数据透视薪资项目排序问题
|
2024-04-25 14:04:13 +08:00 |
|
钱涛
|
c9075058d5
|
跳过人员范围校验
|
2024-04-25 13:45:59 +08:00 |
|
钱涛
|
c206538aa6
|
Merge remote-tracking branch 'origin/release/2.13.1.2404.02' into release/2.13.1.2404.02
|
2024-04-25 11:45:53 +08:00 |
|
钱涛
|
d802d890d6
|
处理解密问题
|
2024-04-25 11:45:37 +08:00 |
|
Harryxzy
|
0bf4b8ed09
|
修复往期累计导入时未加密
|
2024-04-23 15:45:24 +08:00 |
|
钱涛
|
794ed55c7d
|
版本
|
2024-04-22 15:03:28 +08:00 |
|
钱涛
|
95a7f26d60
|
Merge remote-tracking branch 'origin/release/2.13.1.2404.02' into release/2.13.1.2404.02
|
2024-04-16 16:05:53 +08:00 |
|
钱涛
|
68d0003f62
|
新增核算结果的代理
|
2024-04-16 16:05:42 +08:00 |
|
Harryxzy
|
916baf623c
|
fix导出文本
|
2024-04-16 09:57:12 +08:00 |
|
Harryxzy
|
8d7d3c3ec3
|
非系统人员部门id、分部id删除失败
|
2024-04-12 15:06:32 +08:00 |
|
钱涛
|
23eba4950b
|
处理pdf生成
|
2024-04-11 15:23:23 +08:00 |
|
钱涛
|
6a05269b2d
|
处理LIKE函数
|
2024-04-10 14:20:30 +08:00 |
|
Harryxzy
|
44ed332ed5
|
修复ecology的多语言导致乱码
|
2024-04-08 17:57:59 +08:00 |
|
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 |