 钱涛
|
291cd426fe
|
公式变量支持获取上月数据
|
2025-02-17 15:54:35 +08:00 |
|
钱涛
|
5c4d7d8bde
|
Merge branch 'feature/权限' into feature/数据推送
# Conflicts:
# src/com/engine/salary/service/impl/SalarySobServiceImpl.java
# src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
|
2024-11-15 14:20:51 +08:00 |
Harryxzy
|
8a06eaad93
|
Merge branch 'feature/工资单审批' into release/2.17.1.2411.01
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobServiceImpl.java
# src/com/engine/salary/sys/constant/SalarySysConstant.java
# src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
# src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java
|
2024-11-13 18:36:20 +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 |
|
钱涛
|
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 |
|
钱涛
|
be2d6b693a
|
单元格锁定
|
2024-10-17 18:27:37 +08:00 |
|
钱涛
|
38f773d125
|
优化核算导入效率
|
2024-10-17 14:07:27 +08:00 |
|
钱涛
|
63a9e9caf8
|
Merge branch 'release/2.15.2.2409.01' into feature/权限
# Conflicts:
# src/com/engine/salary/service/impl/VariableArchiveServiceImpl.java
|
2024-09-20 13:20:30 +08:00 |
|
钱涛
|
dc3dfc2d6b
|
去除脱敏报表
|
2024-09-20 11:41:44 +08:00 |
|
钱涛
|
7584404bc1
|
Merge branch 'release/2.15.2.2409.01' into feature/权限
|
2024-09-20 10:27:42 +08:00 |
|
钱涛
|
91863b901f
|
增加核算日志
|
2024-09-19 14:17:47 +08:00 |
|
钱涛
|
96ced6e934
|
Merge branch 'release/2.15.2.2409.01' into feature/权限
|
2024-09-13 17:32:58 +08:00 |
|
Harryxzy
|
9e5810f173
|
Merge branch 'feature/240801-浮动薪资' into release/2.15.2.2409.01
|
2024-09-13 11:11:24 +08:00 |
|
钱涛
|
1dd8f12534
|
Merge branch 'release/2.15.1.2407.01' into feature/权限
# Conflicts:
# resource/wiki/扩展功能/hrmSalaryCustom.properties
|
2024-09-09 14:20:56 +08:00 |
|
钱涛
|
e7eb2e3459
|
支持跨扣缴义务人兼容性
|
2024-09-03 15:48:20 +08:00 |
|
钱涛
|
fa861c71dc
|
支持自定义单个线程处理人员数量
|
2024-09-02 18:11:00 +08:00 |
|
Harryxzy
|
75fb15928a
|
浮动薪酬
|
2024-08-09 10:21:40 +08:00 |
|
Harryxzy
|
bdd27bcfc6
|
核算时编辑人员组织信息
|
2024-07-25 14:04:14 +08:00 |
|
钱涛
|
81c768b7b9
|
人员信息快照
|
2024-06-18 15:28:31 +08:00 |
|
钱涛
|
4798f5d4a6
|
处理大数据内存溢出
|
2024-06-12 17:35:06 +08:00 |
|
钱涛
|
2c79afa65e
|
锁定人员
|
2024-05-28 17:29:18 +08:00 |
|
钱涛
|
43db025d98
|
Merge branch 'feature/账套副本' into release/2.14.2.2405.02
|
2024-05-23 11:36:38 +08:00 |
|
钱涛
|
c146537684
|
修改计时说明
|
2024-05-16 15:56:49 +08:00 |
|
钱涛
|
38ebbb9928
|
解决并发问题
|
2024-05-14 13:28:58 +08:00 |
|
钱涛
|
bb32bdfe11
|
核算详细信息
|
2024-05-07 18:48:38 +08:00 |
|
钱涛
|
5c90909c0e
|
账套快照-解决导入、公式、详细详细不对应问题
|
2024-05-07 15:25:43 +08:00 |
|
钱涛
|
1cb89a9d1b
|
账套快照-工资单模板
|
2024-05-06 17:41:39 +08:00 |
|
钱涛
|
3428de9e33
|
账套快照
|
2024-05-06 16:03:29 +08:00 |
|
Harryxzy
|
1800c02e58
|
盛威
|
2024-04-29 16:08:18 +08:00 |
|
钱涛
|
a06a54f574
|
去除objectUtil
|
2024-04-01 20:25:23 +08:00 |
|
钱涛
|
836947725f
|
切换了elog位置
|
2024-03-12 14:34:44 +08:00 |
sy
|
6efbd9deb0
|
薪酬系统，将部分新增代码中labelId入参统一置为0，方便后期多语言逻辑适配时定位
|
2024-02-04 15:10:35 +08:00 |
|
sy
|
f4ecb19ef2
|
Merge branch 'release/2.10.1.2401.01' into feature/操作日志组件
|
2024-02-01 10:21:47 +08:00 |
|
钱涛
|
65f972846f
|
处理id超过2100
|
2024-01-30 10:26:44 +08:00 |
|
钱涛
|
a8bfe83030
|
操作日志
|
2024-01-30 09:58:13 +08:00 |
|
钱涛
|
d2216eee13
|
Merge branch 'release/2.10.1.2401.01' into feature/操作日志组件
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
|
2024-01-29 15:07:58 +08:00 |
|
钱涛
|
6fc8d8fdee
|
去除达梦驱动
|
2024-01-25 11:38:38 +08:00 |
|
钱涛
|
5bf00a98aa
|
记录核算日志
|
2024-01-24 09:50:58 +08:00 |
|
Harryxzy
|
d6705e8917
|
产品-批量编辑
|
2023-12-11 13:09:20 +08:00 |
|
Harryxzy
|
419baeb8cd
|
鲁控数字
|
2023-12-06 16:05:08 +08:00 |
|
Harryxzy
|
2a02e17c15
|
temp
|
2023-12-06 15:55:47 +08:00 |
|
Harryxzy
|
4eb931686e
|
鲁控数字temp
|
2023-12-05 14:57:34 +08:00 |
|
Harryxzy
|
a237f75d79
|
核算结果超过1000导入bug
|
2023-11-20 11:21:58 +08:00 |
|
Harryxzy
|
c8838f2528
|
Merge branch 'fix/薪资核算编辑保存BUG' into fix/核算结果导入超过1000
|
2023-11-20 11:21:14 +08:00 |
|
Harryxzy
|
301144214a
|
薪资核算编辑保存时删除了隐藏项目
|
2023-11-20 11:09:43 +08:00 |
|
Harryxzy
|
2656ce7c90
|
薪资核算结果导入超过1000报错
|
2023-11-20 10:56:03 +08:00 |
|
钱涛
|
2b4ded9dd0
|
修复合计没有根据自定义字段过滤
|
2023-10-30 19:19:07 +08:00 |