 钱涛
|
ff00de206c
|
线下对比
|
2024-08-05 17:23:25 +08:00 |
Harryxzy
|
8d057e2706
|
Merge branch 'feature/240702-编辑核算时人员信息' into release/2.15.1.2407.01
|
2024-08-01 10:53:29 +08:00 |
|
Harryxzy
|
8bbf8f3ff6
|
核算时编辑职称bug
|
2024-08-01 10:52:44 +08:00 |
|
钱涛
|
241a85c711
|
默认值
|
2024-07-31 14:59:03 +08:00 |
|
Harryxzy
|
bcf5fbdce7
|
Merge branch 'fix/240702-社保福利档案导入下载模板bug' into release/2.15.1.2407.01
|
2024-07-30 18:17:49 +08:00 |
|
Harryxzy
|
0c3610961f
|
修复社保福利档案 高级搜索后下载导入模板bug
|
2024-07-30 17:29:12 +08:00 |
|
Harryxzy
|
9819bb25e0
|
修复社保福利台账补差添加bug
|
2024-07-29 10:58:41 +08:00 |
|
Harryxzy
|
ec669c1f51
|
核算时编辑人员组织信息
|
2024-07-25 17:51:38 +08:00 |
|
Harryxzy
|
bdd27bcfc6
|
核算时编辑人员组织信息
|
2024-07-25 14:04:14 +08:00 |
|
Harryxzy
|
671350654a
|
fix薪资明细报表显示列定制
|
2024-07-22 15:29:34 +08:00 |
|
Harryxzy
|
8b0781ef31
|
删除无用代码
|
2024-07-22 11:28:51 +08:00 |
|
Harryxzy
|
462d0e1ae8
|
Merge branch 'release/2.15.1.2407.01' into custom/宁波精华
|
2024-07-22 10:28:55 +08:00 |
|
Harryxzy
|
039c6fd568
|
薪资明细报表合计行过滤文本项
|
2024-07-22 10:27:46 +08:00 |
|
Harryxzy
|
94a829e2c9
|
宁波精华社保管理员
|
2024-07-22 10:08:04 +08:00 |
|
Harryxzy
|
650f588356
|
Merge branch 'feature/240701-社保管理员' into custom/宁波精华
|
2024-07-18 16:14:19 +08:00 |
|
Harryxzy
|
ecf7307372
|
fix 社保管理员退差添加选不到人
|
2024-07-18 16:12:45 +08:00 |
|
Harryxzy
|
71005e2959
|
Merge branch 'feature/240701-社保管理员' into custom/宁波精华
|
2024-07-18 15:39:11 +08:00 |
|
Harryxzy
|
2a4bc60e23
|
fix 社保管理员退差添加选不到人
|
2024-07-18 15:38:49 +08:00 |
|
Harryxzy
|
d90e2e1436
|
宁波精华报表打印过滤4列
|
2024-07-18 15:29:15 +08:00 |
|
Harryxzy
|
ecadd01fa0
|
社保管理员sql
|
2024-07-18 13:43:12 +08:00 |
|
Harryxzy
|
def55c9996
|
Merge branch 'feature/240701-社保管理员' into custom/宁波精华
|
2024-07-18 13:42:06 +08:00 |
|
Harryxzy
|
6b8b7fee62
|
社保管理员sql
|
2024-07-18 13:41:25 +08:00 |
|
Harryxzy
|
8c1caebdaf
|
Merge branch 'feature/240701-社保管理员' into custom/宁波精华
# Conflicts:
# src/com/engine/salary/entity/taxagent/po/TaxAgentAdminPO.java
# src/com/engine/salary/mapper/archive/SalaryArchiveMapper.java
# src/com/engine/salary/mapper/salarysob/SalarySobMapper.xml
# src/com/engine/salary/mapper/taxagent/TaxAgentAdminMapper.xml
# src/com/engine/salary/service/TaxAgentAdminService.java
# src/com/engine/salary/service/impl/TaxAgentAdminServiceImpl.java
# src/com/engine/salary/service/impl/TaxAgentServiceImpl.java
# src/com/engine/salary/wrapper/TaxAgentWrapper.java
|
2024-07-17 18:18:39 +08:00 |
|
Harryxzy
|
6d5ff52329
|
社保管理员temp
|
2024-07-17 18:05:37 +08:00 |
|
Harryxzy
|
844266ac9a
|
社保管理员temp
|
2024-07-17 17:59:52 +08:00 |
|
Harryxzy
|
f7a68cd27e
|
社保管理员temp
|
2024-07-17 14:55:44 +08:00 |
|
钱涛
|
909152decc
|
报表导出改为从内存获取
|
2024-07-16 16:57:58 +08:00 |
|
Harryxzy
|
6f7ae2506d
|
阅后即焚oracle数据库修复
|
2024-07-16 14:56:11 +08:00 |
|
Harryxzy
|
78cdadbb99
|
工资单详情 - 显示列定制
|
2024-07-16 11:30:25 +08:00 |
|
Harryxzy
|
95ba4aee36
|
Merge branch 'fix/240701_返聘action优化' into release/2.15.1.2407.01
|
2024-07-15 14:48:21 +08:00 |
|
Harryxzy
|
5331494ebc
|
Merge branch 'fix/240701_报表分页' into release/2.15.1.2407.01
|
2024-07-15 14:48:08 +08:00 |
|
Harryxzy
|
e579bbc4f2
|
人员维度分页
|
2024-07-15 11:20:24 +08:00 |
|
钱涛
|
b91818f2dc
|
版本
|
2024-07-15 09:36:40 +08:00 |
|
钱涛
|
50e3be607d
|
修复oracle bug
|
2024-07-11 16:30:00 +08:00 |
|
Harryxzy
|
a259a52044
|
人员维度分页
|
2024-07-11 11:28:54 +08:00 |
|
Harryxzy
|
a6f02082d8
|
fix社保福利台账非系统人员日志空指针
|
2024-07-10 15:01:49 +08:00 |
|
Harryxzy
|
84ce2821f6
|
1、定薪、返聘action优化
2、修复导出时excel中双击单元格变成黑色
|
2024-07-10 14:01:09 +08:00 |
|
钱涛
|
7ef229dfde
|
修复社保调差bug
|
2024-07-10 10:43:11 +08:00 |
|
Harryxzy
|
42182dec1b
|
宁波精华fix
|
2024-07-08 17:56:54 +08:00 |
|
Harryxzy
|
95b9f5452a
|
薪资档案导出fix多选义务人bug
|
2024-07-08 10:20:21 +08:00 |
|
Harryxzy
|
3a7c1c2d29
|
修复sql隐藏bug
|
2024-07-03 18:00:29 +08:00 |
|
Harryxzy
|
ab1cd5d929
|
Merge branch 'release/2.14.5.2406.03' into custom/宁波精华
# Conflicts:
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
|
2024-07-02 10:18:47 +08:00 |
|
Harryxzy
|
db93c2b8a8
|
修复报表分享记录分页总计数bug
|
2024-06-28 17:22:34 +08:00 |
|
钱涛
|
458f10d09b
|
优化考勤引用
|
2024-06-28 15:42:10 +08:00 |
|
Harryxzy
|
58a9dd4089
|
宁波精华报表
|
2024-06-28 15:23:55 +08:00 |
|
钱涛
|
edddf5f557
|
处理8位小数问题
|
2024-06-28 14:42:23 +08:00 |
|
钱涛
|
9c7c6de614
|
核算信息快照
|
2024-06-27 16:10:30 +08:00 |
|
钱涛
|
ea07fe1a59
|
处理sqlserver 2100 个参数
|
2024-06-27 10:38:30 +08:00 |
|
Harryxzy
|
b26663889d
|
Merge branch 'fix/240603_薪资明细导出排序' into release/2.14.5.2406.03
|
2024-06-26 11:33:32 +08:00 |
|
Harryxzy
|
933fc8ae65
|
报表分享支持次账号
|
2024-06-26 11:33:12 +08:00 |