Harryxzy
|
6e26dfa44a
|
Merge branch 'release/2.17.1.2411.01' into custom/汇通建设集团
# Conflicts:
# src/com/engine/salary/mapper/datacollection/EmployMapper.xml
|
2024-11-22 09:32:14 +08:00 |
 钱涛
|
618dbd17d8
|
fix默认值列表重复bug
|
2024-11-19 09:48:13 +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 |
|
钱涛
|
158e7dd20c
|
Merge branch 'feature/次账号' into release/2.17.1.2411.01
# Conflicts:
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
# src/com/engine/salary/sys/constant/SalarySysConstant.java
|
2024-11-12 18:05:42 +08:00 |
|
Harryxzy
|
ce1312d605
|
修复没有档案的人，定薪action状态保持不变
|
2024-11-12 17:08:59 +08:00 |
|
Harryxzy
|
5a18ccf57b
|
修复没有档案的人，定薪action状态保持不变
|
2024-11-12 17:06:41 +08:00 |
|
钱涛
|
0e3a5320a4
|
新增核算结果状态编码
|
2024-11-12 11:31:47 +08:00 |
|
Harryxzy
|
11f2591797
|
Merge branch 'feature/241101-定薪action支持不设为发薪人员' into release/2.16.1.2410.01
|
2024-11-08 16:30:53 +08:00 |
|
Harryxzy
|
32eabb25f0
|
Merge branch 'feature/241101_薪资档案增加调薪筛选' into release/2.16.1.2410.01
|
2024-11-08 16:30:40 +08:00 |
|
Harryxzy
|
a2f8803e76
|
薪资档案增加调薪时间 筛选
|
2024-11-08 16:08:49 +08:00 |
|
钱涛
|
e537ffaa5a
|
薪资明细显示模板
|
2024-11-07 17:45:17 +08:00 |
|
Harryxzy
|
5953c2b938
|
薪酬token加解密
|
2024-11-06 13:37:03 +08:00 |
|
Harryxzy
|
dbb332e07f
|
Merge branch 'release/2.16.1.2410.01' into fix/240901_token加解密
|
2024-11-06 10:05:53 +08:00 |
|
Harryxzy
|
13012b739e
|
定薪action支持配置留在待定薪
|
2024-11-05 16:22:48 +08:00 |
|
钱涛
|
4cd0fbfe30
|
报表模板
|
2024-11-04 19:49:46 +08:00 |
|
Harryxzy
|
07c0492ec2
|
Merge branch 'release/2.16.1.2410.01' into feature/次账号
|
2024-11-04 17:29:32 +08:00 |
|
钱涛
|
e3d5ca78f4
|
修改账套状态类型
|
2024-11-04 10:53:21 +08:00 |
|
Harryxzy
|
989468cdc7
|
Merge branch 'feature/241001-社保台账人员信息快照' into release/2.16.1.2410.01
|
2024-11-01 14:33:14 +08:00 |
|
钱涛
|
7fd0f95802
|
扣缴义务人和账套的人员的人员状态
|
2024-11-01 14:27:47 +08:00 |
|
Harryxzy
|
82eb197079
|
汇通二开需求调整
|
2024-11-01 14:11:28 +08:00 |
|
钱涛
|
391fa6ebd9
|
扣缴义务人和账套的人员的人员状态
|
2024-11-01 10:04:15 +08:00 |
|
Harryxzy
|
4e24000c3c
|
Merge branch 'release/2.16.1.2410.01' into custom/汇通建设集团
|
2024-10-31 17:26:51 +08:00 |
|
钱涛
|
ad48063ca9
|
扣缴义务人和账套的人员范围支持编辑
|
2024-10-31 16:56:32 +08:00 |
|
Harryxzy
|
1c6b55f8f5
|
汇通建设 增加导出、搜索
|
2024-10-31 16:24:57 +08:00 |
|
钱涛
|
d21258596a
|
扣缴义务人新加入人员，不会修改历史档案
|
2024-10-30 17:10:32 +08:00 |
|
Harryxzy
|
6ab7e6cb6d
|
Merge branch 'release/2.16.1.2410.01' into custom/汇通建设集团
|
2024-10-30 10:30:32 +08:00 |
|
Harryxzy
|
93b95ce820
|
汇通 薪酬二开
|
2024-10-30 10:29:36 +08:00 |
|
钱涛
|
bfbd9e4b40
|
修复人员报表排序
|
2024-10-28 11:35:57 +08:00 |
|
钱涛
|
71569cad9e
|
薪资所属年变量
|
2024-10-25 16:01:45 +08:00 |
|
Harryxzy
|
8bf0ca48a5
|
Merge branch 'release/2.16.1.2410.01' into custom/汇通建设集团
|
2024-10-25 13:28:03 +08:00 |
|
Harryxzy
|
5810e540ad
|
汇通temp
|
2024-10-25 13:27:58 +08:00 |
|
钱涛
|
94bb1ede32
|
Merge branch 'release/2.16.1.2410.01' into feature/次账号
# Conflicts:
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
|
2024-10-24 10:34:56 +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 |
|
钱涛
|
96a7be5625
|
修复核算列表次账号不显示问题
|
2024-10-18 11:03:33 +08:00 |
|
钱涛
|
313b91297f
|
Merge branch 'release/2.16.1.2410.01' into feature/次账号
# Conflicts:
# src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
|
2024-10-18 10:39:12 +08:00 |
|
钱涛
|
9f498551e4
|
单元格锁定字段改成字符型
|
2024-10-18 10:20:29 +08:00 |
|
钱涛
|
be2d6b693a
|
单元格锁定
|
2024-10-17 18:27:37 +08:00 |
|
钱涛
|
fb8595ac00
|
次账号规则
|
2024-10-16 18:20:11 +08:00 |
|
钱涛
|
070a2a75ac
|
Merge branch 'release/2.15.2.2409.01' into feature/次账号
|
2024-10-16 17:19:43 +08:00 |
|
钱涛
|
53ce7c7b43
|
核算人员显示次账号
|
2024-10-16 15:25:48 +08:00 |
|
钱涛
|
d3050117d1
|
支持次账号
|
2024-10-15 14:24:37 +08:00 |
|
Harryxzy
|
4c551dae87
|
Merge branch 'feature/240801-浮动薪资' into release/2.15.2.2409.01
|
2024-10-14 15:06:52 +08:00 |
|
Harryxzy
|
49cbb7a7cc
|
浮动薪酬
|
2024-10-14 10:38:30 +08:00 |
|
钱涛
|
b6c7a7f2bd
|
自定义列全局设置
|
2024-10-11 17:04:13 +08:00 |
|
钱涛
|
64ac30c05f
|
自定义列全局设置
|
2024-10-11 15:34:17 +08:00 |
|
钱涛
|
861cda00fa
|
1、批量锁定、批量解锁选择人员的所在行的工资项目，需根据人员的选择来设置。
2、导入薪资项目时，优化下当前导入表头能否自动为上次选择的表头信息
|
2024-10-10 11:39:22 +08:00 |
|
Harryxzy
|
752de1fa8e
|
社保福利台账人员信息快照
|
2024-10-09 10:57:23 +08:00 |
|
钱涛
|
ff44ddd8b1
|
员工明细排序
|
2024-10-08 14:19:02 +08:00 |