 钱涛
|
909782d7d6
|
调薪管理页面权限
|
2024-10-31 10:46:02 +08:00 |
|
钱涛
|
13ed52d1d8
|
Merge branch 'release/2.16.1.2410.01' into feature/权限
|
2024-10-30 17:11:04 +08:00 |
|
钱涛
|
d21258596a
|
扣缴义务人新加入人员，不会修改历史档案
|
2024-10-30 17:10:32 +08:00 |
|
钱涛
|
812ca6c752
|
Merge branch 'release/2.16.1.2410.01' into feature/权限
|
2024-10-28 15:46:51 +08:00 |
|
钱涛
|
455550836e
|
解决账套项目过多，快照问题
|
2024-10-28 15:46:29 +08:00 |
|
钱涛
|
63928ddc59
|
解决人员状态null问题
|
2024-10-28 15:08:10 +08:00 |
|
钱涛
|
a51f20b798
|
Merge branch 'release/2.16.1.2410.01' into feature/权限
|
2024-10-28 13:48:52 +08:00 |
|
钱涛
|
bfbd9e4b40
|
修复人员报表排序
|
2024-10-28 11:35:57 +08:00 |
|
钱涛
|
f884e3ff25
|
Merge branch 'release/2.16.1.2410.01' into feature/权限
|
2024-10-25 16:04:43 +08:00 |
|
钱涛
|
71569cad9e
|
薪资所属年变量
|
2024-10-25 16:01:45 +08:00 |
|
钱涛
|
c3e7037667
|
Merge branch 'release/2.16.1.2410.01' into feature/权限
|
2024-10-25 09:34:45 +08:00 |
|
钱涛
|
c0de305c3d
|
核算记录最后操作日期
|
2024-10-24 10:55:44 +08:00 |
|
钱涛
|
28fa294c6f
|
异步记录日志
|
2024-10-24 10:19:35 +08:00 |
|
钱涛
|
e3c6b08e6f
|
处理报表导出异常
|
2024-10-23 17:41:28 +08:00 |
|
钱涛
|
77d8c8168c
|
Merge branch 'release/2.16.1.2410.01' into feature/权限
# Conflicts:
# src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
|
2024-10-22 17:10:47 +08:00 |
|
钱涛
|
b5e6059298
|
核算记录组织字段分开标识
|
2024-10-22 16:38:27 +08:00 |
|
钱涛
|
ce8356f9b2
|
分部id字段
|
2024-10-22 16:12:30 +08:00 |
|
钱涛
|
8c5c3d5949
|
工资单查看限制类型约束
|
2024-10-22 15:00:19 +08:00 |
|
钱涛
|
5271d2516a
|
Merge branch 'release/2.16.1.2410.01' into feature/权限
# Conflicts:
# src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
# src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
|
2024-10-22 09:27:11 +08:00 |
|
钱涛
|
2bd336fc16
|
单元格锁定
|
2024-10-18 16:54:34 +08:00 |
|
钱涛
|
af34b8a5b5
|
单元格锁定
|
2024-10-18 16:49:17 +08:00 |
|
钱涛
|
988b82751e
|
考勤日志
|
2024-10-18 16:21:14 +08:00 |
|
钱涛
|
57fdc79e7b
|
修复引用日期转换问题
|
2024-10-18 15:58:43 +08:00 |
|
钱涛
|
9f498551e4
|
单元格锁定字段改成字符型
|
2024-10-18 10:20:29 +08:00 |
|
钱涛
|
641b085a28
|
单元格锁定sql
|
2024-10-17 18:53:37 +08:00 |
|
钱涛
|
be2d6b693a
|
单元格锁定
|
2024-10-17 18:27:37 +08:00 |
|
钱涛
|
cede931b0d
|
版本
|
2024-10-17 14:21:46 +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 |
|
钱涛
|
637e5ced98
|
Merge branch 'release/2.15.2.2409.01' into feature/权限
|
2024-10-16 17:19:19 +08:00 |
|
钱涛
|
d42e9768c2
|
处理sqlserver浮动数据bug
|
2024-10-16 16:53:24 +08:00 |
Harryxzy
|
fc88f03904
|
浮动薪酬加解密
|
2024-10-16 15:47:18 +08:00 |
|
钱涛
|
8e90361e82
|
Merge branch 'release/2.15.2.2409.01' into feature/权限
# Conflicts:
# src/com/engine/salary/service/VariableArchiveService.java
|
2024-10-16 10:04:24 +08:00 |
|
Harryxzy
|
35a0349f38
|
Merge remote-tracking branch 'origin/release/2.15.2.2409.01' into release/2.15.2.2409.01
|
2024-10-16 09:42:10 +08:00 |
|
Harryxzy
|
e8559e1afa
|
修复社保福利导入报无人员 （历史数据兼容bug）
|
2024-10-16 09:41:55 +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 |
|
钱涛
|
0111822a47
|
Merge branch 'release/2.15.2.2409.01' into feature/权限
# Conflicts:
# src/com/engine/salary/constant/SalaryDefaultTenantConstant.java
# src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
|
2024-10-12 15:16:38 +08:00 |
|
钱涛
|
779d519a6f
|
Merge branch 'release/2.15.2.2409.01' into feature/自定义列全局设置
|
2024-10-12 11:11:44 +08:00 |
|
钱涛
|
c209399566
|
修复模板设置主键
|
2024-10-12 09:38:08 +08:00 |
|
钱涛
|
265ca2a54e
|
默认展示所有薪资明细列
|
2024-10-11 18:02:52 +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 |