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 |
|
钱涛
|
ef13d93fe1
|
Merge branch 'release/2.16.1.2410.01' into feature/权限
# Conflicts:
# src/com/engine/salary/entity/siaccount/po/InsuranceAccountBatchPO.java
|
2024-11-04 14:33:15 +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 |
|
钱涛
|
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 |
|
钱涛
|
2499d543d8
|
解决主次账号档案异常
|
2024-10-28 15:11:31 +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 |
|
钱涛
|
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 |
|
Harryxzy
|
a933d60aaf
|
领悦优化
|
2024-10-23 11:31:51 +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 |
|
Harryxzy
|
70d9925570
|
领悦凭证删除
|
2024-10-22 14:05:24 +08:00 |
|
Harryxzy
|
bd76b44fbf
|
领悦凭证
|
2024-10-22 11:33:00 +08:00 |
|
钱涛
|
629bb241aa
|
fix冲突
|
2024-10-22 09:50:10 +08:00 |
|
钱涛
|
b99ce85dd9
|
Merge branch 'custom/领悦' into custom/领悦业务线
# Conflicts:
# src/com/engine/salary/constant/SalaryDefaultTenantConstant.java
# src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
# src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
# src/com/engine/salary/service/VariableArchiveService.java
# src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
|
2024-10-22 09:44:34 +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 |
|
Harryxzy
|
dd7905ac1c
|
Merge branch 'release/2.16.1.2410.01' into custom/领悦
|
2024-10-21 18:05:27 +08:00 |
|
Harryxzy
|
15b1428ff3
|
领悦 社保公积金报表拆分
|
2024-10-21 18:02:04 +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 |
|
钱涛
|
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 |
|
钱涛
|
53ce7c7b43
|
核算人员显示次账号
|
2024-10-16 15:25:48 +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 |
|
钱涛
|
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 |
|
Harryxzy
|
dcc18a096d
|
领悦凭证推送
|
2024-10-14 09:19:07 +08:00 |
|
Harryxzy
|
c9ce2ae499
|
Merge branch 'release/2.15.2.2409.01' into custom/领悦
|
2024-10-12 16:39:18 +08:00 |
|
Harryxzy
|
a4b6ca6048
|
领悦凭证推送
|
2024-10-12 16:39:09 +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 |
|
钱涛
|
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 |
|
Harryxzy
|
9621882a04
|
领悦推送uc
|
2024-10-11 09:10:33 +08:00 |
|
钱涛
|
861cda00fa
|
1、批量锁定、批量解锁选择人员的所在行的工资项目，需根据人员的选择来设置。
2、导入薪资项目时，优化下当前导入表头能否自动为上次选择的表头信息
|
2024-10-10 11:39:22 +08:00 |
|
钱涛
|
2ba4bb72db
|
薪资明细增加入职日期
|
2024-10-09 18:10:38 +08:00 |
|
钱涛
|
767d650ee9
|
Merge branch 'release/2.15.2.2409.01' into feature/权限
|
2024-10-09 17:31:45 +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 |
|
钱涛
|
c2b200d843
|
业务线
|
2024-10-08 19:47:45 +08:00 |
|
钱涛
|
237ea8fcd8
|
业务线
|
2024-10-08 19:47:18 +08:00 |
|
钱涛
|
f487e060a2
|
Merge branch 'feature/快照条件搜索报表' into feature/权限
# Conflicts:
# src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
|
2024-10-08 16:20:32 +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 |
|
钱涛
|
800f03427d
|
社保档案业务线
|
2024-09-29 14:34:44 +08:00 |
|
钱涛
|
7f233145d4
|
fix刷新核算人员功能冲突
|
2024-09-29 11:07:48 +08:00 |
|
钱涛
|
d54dd4e237
|
fix刷新核算人员功能冲突
|
2024-09-29 10:52:04 +08:00 |
|
钱涛
|
541546f5c8
|
Merge branch 'release/2.15.2.2409.01' into feature/权限
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
|
2024-09-29 10:46:04 +08:00 |
|
钱涛
|
93d2980ad8
|
刷新核算人员功能
|
2024-09-29 10:37:38 +08:00 |
|
钱涛
|
89ce21a3ce
|
Merge branch 'feature/权限' into custom/领悦业务线
|
2024-09-27 18:25:14 +08:00 |
|
钱涛
|
4a8e96ebe6
|
修复扣缴业务人
|
2024-09-27 18:10:21 +08:00 |
|
钱涛
|
9c155ff50c
|
Merge branch 'feature/权限' into custom/领悦业务线
|
2024-09-27 17:55:43 +08:00 |
|
钱涛
|
4db0fdc699
|
SQL 使用mybatis执行
|
2024-09-27 17:18:07 +08:00 |
|
钱涛
|
6e03afecc2
|
社保档案导入
|
2024-09-27 16:15:01 +08:00 |
|
钱涛
|
1d43e980e7
|
1、优化浮动数据业务线
2、优化浮动字段业务线
3、修复累计专项附加编辑权限
|
2024-09-27 11:34:01 +08:00 |
|
钱涛
|
e512a2868a
|
Merge branch 'release/2.15.2.2409.01' into feature/权限
|
2024-09-27 11:13:24 +08:00 |
|
钱涛
|
0852094cb1
|
修改浮动数据扣缴义务人id类型
|
2024-09-27 11:13:00 +08:00 |
|
钱涛
|
ab2912fb28
|
Merge branch 'release/2.15.2.2409.01' into feature/权限
|
2024-09-27 11:08:53 +08:00 |
|
钱涛
|
ecd99537fa
|
修复浮动数据null
|
2024-09-27 11:04:44 +08:00 |
|
钱涛
|
ffb4b5f0b4
|
记录删除业务线日志
|
2024-09-27 10:16:48 +08:00 |
|
钱涛
|
222fe9facd
|
业务线明细列表
|
2024-09-26 19:20:37 +08:00 |
|
钱涛
|
fd8a62718f
|
Merge branch 'feature/权限' into custom/领悦业务线
|
2024-09-26 17:52:48 +08:00 |
|
钱涛
|
7f17c2a9b7
|
业务线同步
|
2024-09-26 17:52:01 +08:00 |
|
钱涛
|
053282b40d
|
Merge branch 'feature/权限' into custom/领悦业务线
# Conflicts:
# src/com/engine/salary/mapper/datacollection/EmployMapper.java
|
2024-09-26 17:21:20 +08:00 |
|
钱涛
|
8803052577
|
Merge branch 'release/2.15.2.2409.01' into custom/领悦
|
2024-09-26 17:20:07 +08:00 |
|
Harryxzy
|
c73b362df3
|
领悦temp
|
2024-09-26 17:19:07 +08:00 |
|
钱涛
|
0d7cdeddb0
|
社保台账操作按钮
|
2024-09-26 15:57:16 +08:00 |
|
钱涛
|
78c8d06200
|
社保福利搜索条件
|
2024-09-26 11:24:12 +08:00 |
|
钱涛
|
9b9d41532d
|
社保福利业务线
|
2024-09-26 10:35:46 +08:00 |
|
钱涛
|
2ada09f16c
|
Merge branch 'release/2.15.2.2409.01' into feature/权限
|
2024-09-25 16:07:42 +08:00 |
|
钱涛
|
b732430562
|
支持根据工号排序
|
2024-09-25 15:40:36 +08:00 |
|
钱涛
|
9f7fe00303
|
穿透显示快照组织信息
|
2024-09-25 13:38:45 +08:00 |
|
钱涛
|
ff200e2586
|
核算确认列表组织信息
|
2024-09-25 11:45:36 +08:00 |
|
钱涛
|
63c6a5af5e
|
业务线配置
|
2024-09-24 19:02:40 +08:00 |
|
Harryxzy
|
42267abe79
|
领悦 凭证推送temp
|
2024-09-24 16:31:04 +08:00 |
|
钱涛
|
ae708a1d3b
|
Merge branch 'release/2.15.2.2409.01' into feature/权限
|
2024-09-24 13:19:59 +08:00 |
|
钱涛
|
0944efcf5e
|
物理删除业务线数据
|
2024-09-24 11:04:44 +08:00 |
|
钱涛
|
d959c75ce0
|
业务线操作日志
|
2024-09-24 10:19:06 +08:00 |
|
钱涛
|
a659821be8
|
业务线高级搜索
|
2024-09-24 09:50:46 +08:00 |
|
钱涛
|
cc6deee04c
|
报表模块分权
|
2024-09-23 14:35:51 +08:00 |
|
钱涛
|
1bb5dd63fb
|
优化申报提示
|
2024-09-23 13:20:59 +08:00 |
|
钱涛
|
164a97a8e0
|
修复大数据量，重新核算报错
|
2024-09-23 11:10:25 +08:00 |
|
钱涛
|
f0f6943eb0
|
薪资项目模块
|
2024-09-23 10:17:36 +08:00 |
|
钱涛
|
f62dfa17be
|
往期累计模块
|
2024-09-20 17:01:37 +08:00 |
|
钱涛
|
0ece125d18
|
其他免税扣除模块
|
2024-09-20 16:49:46 +08:00 |
|
钱涛
|
619af1a76a
|
其他免税扣除模块
|
2024-09-20 16:45:35 +08:00 |
|
钱涛
|
7ea6278e4e
|
累计专项附加扣除模块
|
2024-09-20 15:58:05 +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 |