Harryxzy
|
9a528d4eef
|
万众财务报表
|
2025-02-26 14:48:35 +08:00 |
|
Harryxzy
|
dad48112ee
|
Merge branch 'release/2.18.1.2412.01' into custom/陕西万众
# Conflicts:
# src/com/engine/salary/service/SalarySobItemService.java
# src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
# src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java
# src/com/engine/salary/wrapper/SalarySobItemWrapper.java
|
2024-12-13 15:01:36 +08:00 |
 钱涛
|
be2d6b693a
|
单元格锁定
|
2024-10-17 18:27:37 +08:00 |
|
Harryxzy
|
b1056070b7
|
Merge branch 'release/2.14.5.2406.03' into custom/陕西万众
# Conflicts:
# src/com/engine/salary/entity/salaryacct/po/SalaryAcctEmployeePO.java
# src/com/engine/salary/entity/salarysob/dto/SalarySobItemFormDTO.java
# src/com/engine/salary/entity/salarysob/po/SalarySobItemPO.java
# src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml
# src/com/engine/salary/service/SalaryAcctExcelService.java
# src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
|
2024-07-10 15:32:13 +08:00 |
|
钱涛
|
2c79afa65e
|
锁定人员
|
2024-05-28 17:29:18 +08:00 |
|
Harryxzy
|
0853260f47
|
万众解密
|
2024-03-08 14:11:34 +08:00 |
|
Harryxzy
|
1fe0598507
|
万众解密
|
2024-03-07 17:52:40 +08:00 |
|
Harryxzy
|
cb77783323
|
Merge branch 'release/2.11.1.2402.01' into custom/陕西万众
# Conflicts:
# src/com/engine/salary/entity/salarysob/bo/SalarySobItemAggregateBO.java
# src/com/engine/salary/entity/salarysob/dto/SalarySobItemDTO.java
# src/com/engine/salary/service/SalaryAcctResultService.java
# src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
# src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java
|
2024-03-04 14:34:17 +08:00 |
|
Harryxzy
|
c1dbe396ba
|
万众，薪资核算模板
|
2024-01-03 10:50:27 +08:00 |
|
Harryxzy
|
7678fa00ef
|
陕西万众，审批temp
|
2024-01-02 10:53:27 +08:00 |
|
Harryxzy
|
d6705e8917
|
产品-批量编辑
|
2023-12-11 13:09:20 +08:00 |
|
Harryxzy
|
419baeb8cd
|
鲁控数字
|
2023-12-06 16:05:08 +08:00 |
|
Harryxzy
|
4eb931686e
|
鲁控数字temp
|
2023-12-05 14:57:34 +08:00 |
|
Harryxzy
|
2656ce7c90
|
薪资核算结果导入超过1000报错
|
2023-11-20 10:56:03 +08:00 |
|
钱涛
|
a7e8498b98
|
取消核算报表数据
|
2023-09-26 17:18:27 +08:00 |
|
Harryxzy
|
5d83326d23
|
listByAcctEmployeeIdsAndSalaryItemIds的分片问题
|
2023-06-28 16:26:20 +08:00 |
|
Harryxzy
|
822ad87451
|
薪资核算结果校验拦截
|
2023-06-27 14:58:33 +08:00 |
|
Harryxzy
|
e7edb9040c
|
修复无分类
|
2023-06-20 17:27:18 +08:00 |
|
Harryxzy
|
4617005e1f
|
数据透视功能
|
2023-06-07 15:43:23 +08:00 |
|
Harryxzy
|
52b592dd7e
|
薪资核算获取加锁的值时增加项目条件，提速
|
2023-06-02 15:06:07 +08:00 |
|
Harryxzy
|
6262f62292
|
薪资回算Excel导入BUG
|
2022-12-26 23:17:32 +08:00 |
|
Harryxzy
|
c0d916c286
|
薪资回算功能，工资单部分
|
2022-12-06 15:29:08 +08:00 |
|
Harryxzy
|
3ff3fd8e44
|
薪资回算-薪资核算部分（剩余核算归档）
|
2022-12-02 17:35:14 +08:00 |
|
钱涛
|
271daf29be
|
批量锁定功能
|
2022-11-17 09:28:40 +08:00 |
|
钱涛
|
1d635f1423
|
核算列表求和
|
2022-09-27 15:47:13 +08:00 |
|
钱涛
|
e9c95918eb
|
1、核算表头带上公式
2、修复核算时取福利台账人员信息不准确
|
2022-08-02 14:58:18 +08:00 |
|
钱涛
|
79632dd1bf
|
申报表分权
|
2022-06-07 19:10:40 +08:00 |
|
钱涛
|
a069447f02
|
核算基础公式
|
2022-04-11 20:17:47 +08:00 |
|
钱涛
|
0b72b2e6cb
|
核算v2
|
2022-04-08 19:08:59 +08:00 |
|
钱涛
|
9d223c7a06
|
核算基础类
|
2022-04-06 20:01:00 +08:00 |