 钱涛
|
0e3a5320a4
|
新增核算结果状态编码
|
2024-11-12 11:31:47 +08:00 |
|
钱涛
|
4601d5ec81
|
修复打印模板列表不显示
|
2024-11-11 18:03:31 +08:00 |
|
钱涛
|
99274b95ec
|
修复打印模板列表不显示
|
2024-11-11 16:58:16 +08:00 |
Harryxzy
|
02de1e4444
|
工资单发放预览，兼容很早之前新建的工资单模板
|
2024-11-11 15:02:21 +08:00 |
|
Harryxzy
|
6ebef0cd5e
|
Merge remote-tracking branch 'origin/release/2.16.1.2410.01' into release/2.16.1.2410.01
|
2024-11-11 14:06:37 +08:00 |
|
Harryxzy
|
95abadfb0d
|
社保福利台账添加人员bug
|
2024-11-11 14:06:15 +08:00 |
|
钱涛
|
553764da86
|
模板sql
|
2024-11-11 10:51:59 +08:00 |
|
Harryxzy
|
ce80905ad0
|
薪资明细接口优化
|
2024-11-11 09:59:27 +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
|
058e7dcb3c
|
薪资档案增加调薪时间 筛选
|
2024-11-08 16:29:06 +08:00 |
|
钱涛
|
7e235e112a
|
处理核算结果null插入问题
|
2024-11-08 16:20:30 +08:00 |
|
Harryxzy
|
a2f8803e76
|
薪资档案增加调薪时间 筛选
|
2024-11-08 16:08:49 +08:00 |
|
钱涛
|
e537ffaa5a
|
薪资明细显示模板
|
2024-11-07 17:45:17 +08:00 |
|
Harryxzy
|
15fe5044e8
|
修复先加锁 再核算时报错
|
2024-11-07 15:19:11 +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 |
|
Harryxzy
|
1026599131
|
Merge remote-tracking branch 'origin/release/2.16.1.2410.01' into release/2.16.1.2410.01
|
2024-11-05 14:35:15 +08:00 |
|
Harryxzy
|
cb6738734a
|
修复社保福利档案导出，一个人在多个义务人下 导出bug
|
2024-11-05 11:04:21 +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 |
|
钱涛
|
ea06150dc5
|
取消社保台账重新核算限制
|
2024-11-04 15:06:27 +08:00 |
|
钱涛
|
e3d5ca78f4
|
修改账套状态类型
|
2024-11-04 10:53:21 +08:00 |
|
Harryxzy
|
e9b347c07c
|
前端增加薪资审批按钮的显隐控制
|
2024-11-01 16:03:51 +08:00 |
|
Harryxzy
|
906a432ec2
|
Merge branch 'fix/241001-社保停缴action最后缴纳月支持分开设置' into release/2.16.1.2410.01
|
2024-11-01 14:34:14 +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 |
|
钱涛
|
391fa6ebd9
|
扣缴义务人和账套的人员的人员状态
|
2024-11-01 10:04:15 +08:00 |
|
钱涛
|
ad48063ca9
|
扣缴义务人和账套的人员范围支持编辑
|
2024-10-31 16:56:32 +08:00 |
|
钱涛
|
d21258596a
|
扣缴义务人新加入人员，不会修改历史档案
|
2024-10-30 17:10:32 +08:00 |
|
钱涛
|
455550836e
|
解决账套项目过多，快照问题
|
2024-10-28 15:46:29 +08:00 |
|
钱涛
|
2499d543d8
|
解决主次账号档案异常
|
2024-10-28 15:11:31 +08:00 |
|
钱涛
|
bfbd9e4b40
|
修复人员报表排序
|
2024-10-28 11:35:57 +08:00 |
|
钱涛
|
71569cad9e
|
薪资所属年变量
|
2024-10-25 16:01:45 +08:00 |
|
钱涛
|
45c99da037
|
Merge branch 'release/2.16.1.2410.01' into feature/次账号
|
2024-10-24 11:08:20 +08:00 |
|
钱涛
|
c0de305c3d
|
核算记录最后操作日期
|
2024-10-24 10:55:44 +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 |
|
钱涛
|
28fa294c6f
|
异步记录日志
|
2024-10-24 10:19:35 +08:00 |
|
钱涛
|
e3c6b08e6f
|
处理报表导出异常
|
2024-10-23 17:41:28 +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 |
|
钱涛
|
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 |
|
钱涛
|
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 |
|
Harryxzy
|
c6fdbe6403
|
社保停缴action最后缴纳月支持分开设置
|
2024-10-17 16:39:24 +08:00 |
|
Harryxzy
|
f664536bce
|
社保停缴action最后缴纳月支持分开设置
|
2024-10-17 15:51:05 +08:00 |
|
钱涛
|
4ec883cd9c
|
Merge branch 'release/2.16.1.2410.01' into feature/次账号
|
2024-10-17 14:28:08 +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 |
|
钱涛
|
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 |
|
钱涛
|
d42e9768c2
|
处理sqlserver浮动数据bug
|
2024-10-16 16:53:24 +08:00 |
|
Harryxzy
|
fc88f03904
|
浮动薪酬加解密
|
2024-10-16 15:47:18 +08:00 |
|
钱涛
|
53ce7c7b43
|
核算人员显示次账号
|
2024-10-16 15:25:48 +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 |
|
钱涛
|
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
|
dbd1b574e0
|
浮动薪酬优化
|
2024-10-14 15:05:22 +08:00 |
|
Harryxzy
|
3ac5da2b31
|
社保台账sqlserver 2100bug
|
2024-10-14 14:34:46 +08:00 |
|
Harryxzy
|
49cbb7a7cc
|
浮动薪酬
|
2024-10-14 10:38:30 +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 |
|
钱涛
|
32b3ce97a9
|
Merge branch 'release/2.15.2.2409.01' into feature/自定义列全局设置
|
2024-10-11 15:34:44 +08:00 |
|
钱涛
|
64ac30c05f
|
自定义列全局设置
|
2024-10-11 15:34:17 +08:00 |
|
Harryxzy
|
310c77a270
|
excel设置列宽 超过255报错
|
2024-10-11 15:14:21 +08:00 |
|
Harryxzy
|
8d8fc5c15d
|
社保台账人员信息快照
|
2024-10-11 10:17:35 +08:00 |
|
钱涛
|
861cda00fa
|
1、批量锁定、批量解锁选择人员的所在行的工资项目，需根据人员的选择来设置。
2、导入薪资项目时，优化下当前导入表头能否自动为上次选择的表头信息
|
2024-10-10 11:39:22 +08:00 |
|
钱涛
|
2ba4bb72db
|
薪资明细增加入职日期
|
2024-10-09 18:10:38 +08:00 |
|
钱涛
|
3a128a4c5b
|
报表快照
|
2024-10-09 14:59:33 +08:00 |
|
钱涛
|
a40188659f
|
报表快照
|
2024-10-09 13:21:28 +08:00 |
|
Harryxzy
|
752de1fa8e
|
社保福利台账人员信息快照
|
2024-10-09 10:57:23 +08:00 |
|
钱涛
|
09ccda7883
|
Merge branch 'release/2.15.2.2409.01' into feature/快照条件搜索报表
|
2024-10-08 16:12:08 +08:00 |
|
钱涛
|
61dee5d3a1
|
薪资明细排序
|
2024-10-08 15:48:33 +08:00 |
|
钱涛
|
ff5419f2bb
|
薪资明细排序
|
2024-10-08 15:45:12 +08:00 |
|
钱涛
|
edb07052b5
|
员工明细排序
|
2024-10-08 14:36:18 +08:00 |
|
钱涛
|
87f819f3e2
|
Merge branch 'release/2.15.2.2409.01' into feature/快照条件搜索报表
|
2024-10-08 14:25:26 +08:00 |
|
钱涛
|
ff44ddd8b1
|
员工明细排序
|
2024-10-08 14:19:02 +08:00 |
|
钱涛
|
8c0bad8023
|
报表快照
|
2024-09-30 10:37:27 +08:00 |
|
钱涛
|
13f0854208
|
报表缓存
|
2024-09-29 17:02:59 +08:00 |
|
钱涛
|
b4050e4ee8
|
报表快照搜索
|
2024-09-29 16:58:41 +08:00 |
|
钱涛
|
93d2980ad8
|
刷新核算人员功能
|
2024-09-29 10:37:38 +08:00 |
|
钱涛
|
4db0fdc699
|
SQL 使用mybatis执行
|
2024-09-27 17:18:07 +08:00 |
|
钱涛
|
0852094cb1
|
修改浮动数据扣缴义务人id类型
|
2024-09-27 11:13:00 +08:00 |