 钱涛
|
629bb241aa
|
fix冲突
|
2024-10-22 09:50:10 +08:00 |
|
钱涛
|
b99ce85dd9
|
Merge branch 'custom/领悦' into custom/领悦业务线
# Conflicts:
# src/com/engine/salary/constant/SalaryDefaultTenantConstant.java
# src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
# src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
# src/com/engine/salary/service/VariableArchiveService.java
# src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
|
2024-10-22 09:44:34 +08:00 |
Harryxzy
|
dd7905ac1c
|
Merge branch 'release/2.16.1.2410.01' into custom/领悦
|
2024-10-21 18:05:27 +08:00 |
|
Harryxzy
|
15b1428ff3
|
领悦 社保公积金报表拆分
|
2024-10-21 18:02:04 +08:00 |
|
钱涛
|
2bd336fc16
|
单元格锁定
|
2024-10-18 16:54:34 +08:00 |
|
钱涛
|
af34b8a5b5
|
单元格锁定
|
2024-10-18 16:49:17 +08:00 |
|
钱涛
|
57fdc79e7b
|
修复引用日期转换问题
|
2024-10-18 15:58:43 +08:00 |
|
钱涛
|
be2d6b693a
|
单元格锁定
|
2024-10-17 18:27:37 +08:00 |
|
钱涛
|
38f773d125
|
优化核算导入效率
|
2024-10-17 14:07:27 +08:00 |
|
钱涛
|
70429df180
|
Merge branch 'custom/上海电力设计院' into release/2.16.1.2410.01
|
2024-10-17 13:42:23 +08:00 |
|
钱涛
|
0d100d9f53
|
修复报表分部条件过滤不生效
|
2024-10-17 10:20:58 +08:00 |
|
Harryxzy
|
fc88f03904
|
浮动薪酬加解密
|
2024-10-16 15:47:18 +08:00 |
|
钱涛
|
5f50c26640
|
取消核算导入vlookup支持
|
2024-10-16 09:30:10 +08:00 |
|
钱涛
|
6ec7210720
|
除去核算支持函数
|
2024-10-15 14:40:04 +08:00 |
|
钱涛
|
6336ae24a0
|
Merge branch 'release/2.15.2.2409.01' into custom/上海电力设计院
|
2024-10-15 14:27:55 +08:00 |
|
Harryxzy
|
4c551dae87
|
Merge branch 'feature/240801-浮动薪资' into release/2.15.2.2409.01
|
2024-10-14 15:06:52 +08:00 |
|
Harryxzy
|
dbd1b574e0
|
浮动薪酬优化
|
2024-10-14 15:05:22 +08:00 |
|
Harryxzy
|
49cbb7a7cc
|
浮动薪酬
|
2024-10-14 10:38:30 +08:00 |
|
Harryxzy
|
dcc18a096d
|
领悦凭证推送
|
2024-10-14 09:19:07 +08:00 |
|
Harryxzy
|
c9ce2ae499
|
Merge branch 'release/2.15.2.2409.01' into custom/领悦
|
2024-10-12 16:39:18 +08:00 |
|
Harryxzy
|
a4b6ca6048
|
领悦凭证推送
|
2024-10-12 16:39:09 +08:00 |
|
钱涛
|
779d519a6f
|
Merge branch 'release/2.15.2.2409.01' into feature/自定义列全局设置
|
2024-10-12 11:11:44 +08:00 |
|
钱涛
|
a0bc3b5452
|
记录核算日志
|
2024-10-11 17:32:02 +08:00 |
|
钱涛
|
3a224170f1
|
导入字段持久化
|
2024-10-11 17:17:07 +08:00 |
|
钱涛
|
4c4b6ab57d
|
导入字段持久化
|
2024-10-11 17:14:14 +08:00 |
|
钱涛
|
b6c7a7f2bd
|
自定义列全局设置
|
2024-10-11 17:04:13 +08:00 |
|
钱涛
|
64ac30c05f
|
自定义列全局设置
|
2024-10-11 15:34:17 +08:00 |
|
Harryxzy
|
9621882a04
|
领悦推送uc
|
2024-10-11 09:10:33 +08:00 |
|
钱涛
|
861cda00fa
|
1、批量锁定、批量解锁选择人员的所在行的工资项目，需根据人员的选择来设置。
2、导入薪资项目时，优化下当前导入表头能否自动为上次选择的表头信息
|
2024-10-10 11:39:22 +08:00 |
|
钱涛
|
b4050e4ee8
|
报表快照搜索
|
2024-09-29 16:58:41 +08:00 |
|
钱涛
|
93d2980ad8
|
刷新核算人员功能
|
2024-09-29 10:37:38 +08:00 |
|
钱涛
|
89ce21a3ce
|
Merge branch 'feature/权限' into custom/领悦业务线
|
2024-09-27 18:25:14 +08:00 |
|
钱涛
|
4a8e96ebe6
|
修复扣缴业务人
|
2024-09-27 18:10:21 +08:00 |
|
钱涛
|
9c155ff50c
|
Merge branch 'feature/权限' into custom/领悦业务线
|
2024-09-27 17:55:43 +08:00 |
|
钱涛
|
4db0fdc699
|
SQL 使用mybatis执行
|
2024-09-27 17:18:07 +08:00 |
|
钱涛
|
6e03afecc2
|
社保档案导入
|
2024-09-27 16:15:01 +08:00 |
|
钱涛
|
1d43e980e7
|
1、优化浮动数据业务线
2、优化浮动字段业务线
3、修复累计专项附加编辑权限
|
2024-09-27 11:34:01 +08:00 |
|
钱涛
|
ab2912fb28
|
Merge branch 'release/2.15.2.2409.01' into feature/权限
|
2024-09-27 11:08:53 +08:00 |
|
钱涛
|
ecd99537fa
|
修复浮动数据null
|
2024-09-27 11:04:44 +08:00 |
|
钱涛
|
053282b40d
|
Merge branch 'feature/权限' into custom/领悦业务线
# Conflicts:
# src/com/engine/salary/mapper/datacollection/EmployMapper.java
|
2024-09-26 17:21:20 +08:00 |
|
钱涛
|
8803052577
|
Merge branch 'release/2.15.2.2409.01' into custom/领悦
|
2024-09-26 17:20:07 +08:00 |
|
Harryxzy
|
c73b362df3
|
领悦temp
|
2024-09-26 17:19:07 +08:00 |
|
钱涛
|
0d7cdeddb0
|
社保台账操作按钮
|
2024-09-26 15:57:16 +08:00 |
|
钱涛
|
78c8d06200
|
社保福利搜索条件
|
2024-09-26 11:24:12 +08:00 |
|
钱涛
|
9b9d41532d
|
社保福利业务线
|
2024-09-26 10:35:46 +08:00 |
|
Harryxzy
|
42267abe79
|
领悦 凭证推送temp
|
2024-09-24 16:31:04 +08:00 |
|
钱涛
|
ae708a1d3b
|
Merge branch 'release/2.15.2.2409.01' into feature/权限
|
2024-09-24 13:19:59 +08:00 |
|
钱涛
|
cc6deee04c
|
报表模块分权
|
2024-09-23 14:35:51 +08:00 |
|
钱涛
|
1bb5dd63fb
|
优化申报提示
|
2024-09-23 13:20:59 +08:00 |
|
钱涛
|
164a97a8e0
|
修复大数据量，重新核算报错
|
2024-09-23 11:10:25 +08:00 |