 钱涛
|
71569cad9e
|
薪资所属年变量
|
2024-10-25 16:01:45 +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 |
|
钱涛
|
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 |
|
钱涛
|
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 |
|
钱涛
|
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 |
|
钱涛
|
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 |
|
钱涛
|
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 |
|
钱涛
|
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 |
|
钱涛
|
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 |
|
钱涛
|
f487e060a2
|
Merge branch 'feature/快照条件搜索报表' into feature/权限
# Conflicts:
# src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
|
2024-10-08 16:20:32 +08:00 |
|
钱涛
|
ff44ddd8b1
|
员工明细排序
|
2024-10-08 14:19:02 +08:00 |
|
钱涛
|
800f03427d
|
社保档案业务线
|
2024-09-29 14:34:44 +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 |
|
钱涛
|
222fe9facd
|
业务线明细列表
|
2024-09-26 19:20:37 +08:00 |
|
钱涛
|
0d7cdeddb0
|
社保台账操作按钮
|
2024-09-26 15:57:16 +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 |
|
钱涛
|
ff200e2586
|
核算确认列表组织信息
|
2024-09-25 11:45:36 +08:00 |
|
钱涛
|
63c6a5af5e
|
业务线配置
|
2024-09-24 19:02:40 +08:00 |
|
钱涛
|
a659821be8
|
业务线高级搜索
|
2024-09-24 09:50: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 |
|
钱涛
|
ee535fc2bf
|
1、业务线-新建累计专项附加扣除
2、业务线-报表
|
2024-09-19 16:46:36 +08:00 |
|
钱涛
|
6e7ccb2339
|
浮动薪资档案分权
|
2024-09-18 18:19:58 +08:00 |
|
Harryxzy
|
3420c36448
|
人员id加密
|
2024-09-18 18:10:30 +08:00 |
|
钱涛
|
9edf23fa37
|
Merge branch 'release/2.15.2.2409.01' into feature/权限
|
2024-09-18 16:13:24 +08:00 |
|
钱涛
|
09042321d1
|
1、支持获取班次信息
2、导出考勤功能优化，excel列和列表显示保持一致
|
2024-09-18 15:59:36 +08:00 |
|
钱涛
|
a48d4cea11
|
浮动数据
|
2024-09-14 09:36:52 +08:00 |
|
钱涛
|
96ced6e934
|
Merge branch 'release/2.15.2.2409.01' into feature/权限
|
2024-09-13 17:32:58 +08:00 |
|
钱涛
|
de0728665b
|
导入往期累计
|
2024-09-13 17:32:15 +08:00 |
|
Harryxzy
|
9e5810f173
|
Merge branch 'feature/240801-浮动薪资' into release/2.15.2.2409.01
|
2024-09-13 11:11:24 +08:00 |
|
钱涛
|
383562c9cf
|
工资单、数据采集权限功能
|
2024-09-12 11:50:18 +08:00 |
|
钱涛
|
87d601c65b
|
账套和核算列表的权限控制
|
2024-09-11 15:25:50 +08:00 |
|
钱涛
|
c7659e0717
|
数据采集权限
|
2024-09-11 10:28:20 +08:00 |
|
钱涛
|
3614f89982
|
业务线权限接口
|
2024-09-10 13:37:21 +08:00 |
|
钱涛
|
a0fb036bce
|
业务线配置
|
2024-09-09 19:10:40 +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 |
|
钱涛
|
09fb9898e7
|
完成账套和扣缴义务人接口
|
2024-09-09 11:13:10 +08:00 |
|
钱涛
|
17afe87356
|
申报表权限规则
|
2024-09-05 18:14:02 +08:00 |
|
钱涛
|
4d9f1e6ff4
|
申报权限按钮限制
|
2024-09-05 17:31:01 +08:00 |
|
钱涛
|
882716b10c
|
修复核算结果可能为空带来的影响
|
2024-09-05 14:13:43 +08:00 |
|
钱涛
|
920b0e31c4
|
账套扣缴义务人聚合查询
|
2024-09-05 10:26:52 +08:00 |
|
钱涛
|
4b0eee4798
|
工资单跨扣缴义务人发放
|
2024-09-04 15:39:54 +08:00 |
|
钱涛
|
5ccee97429
|
新建账套携带各扣缴义务人人员范围
|
2024-09-04 13:59:00 +08:00 |
|
钱涛
|
0b90f4890e
|
工资单支持跨扣缴义务人
|
2024-09-03 14:30:57 +08:00 |
|
Harryxzy
|
44c11c7dcc
|
Merge branch 'feature/240801-社保方案上下限调整自动调整基数' into release/2.15.1.2407.01
|
2024-09-03 09:23:50 +08:00 |
|
钱涛
|
7f77f4cb12
|
获取账套关联扣缴义务人
|
2024-09-03 09:21:57 +08:00 |
|
钱涛
|
ecfa6a4604
|
跨扣缴义务人核算
|
2024-09-02 17:36:41 +08:00 |
|
钱涛
|
c72fa7fd7c
|
保存账套联系
|
2024-09-02 14:13:29 +08:00 |
|
钱涛
|
fdb1f76e01
|
保存业务线
|
2024-09-02 10:22:42 +08:00 |
|
钱涛
|
9d4362b46e
|
业务线分权
|
2024-08-30 17:22:10 +08:00 |
|
钱涛
|
49e6050c54
|
核算和账套的权限
|
2024-08-30 10:49:46 +08:00 |
|
钱涛
|
932ea6bedd
|
核算和账套的权限
|
2024-08-29 14:47:33 +08:00 |
|
钱涛
|
3721867723
|
核算和账套的权限
|
2024-08-28 17:55:42 +08:00 |
|
钱涛
|
9b96d0cff2
|
限制账套
|
2024-08-28 10:02:39 +08:00 |
|
钱涛
|
a2db71d403
|
Merge branch 'release/2.15.1.2407.01' into feature/权限
|
2024-08-26 11:11:31 +08:00 |
|
钱涛
|
42e91e32da
|
改为通过快照信息搜索
|
2024-08-26 09:26:42 +08:00 |
|
钱涛
|
a22aa624db
|
权限控制
|
2024-08-22 15:37:50 +08:00 |
|
钱涛
|
25321bb357
|
Merge branch 'release/2.15.1.2407.01' into feature/权限
|
2024-08-21 15:49:12 +08:00 |
|
钱涛
|
9fae93fcd7
|
Merge branch 'feature/导入工具' into release/2.15.1.2407.01
|
2024-08-20 11:40:33 +08:00 |
|
Harryxzy
|
6dc9650305
|
Merge branch 'release/2.15.1.2407.01' into feature/240801-社保方案上下限调整自动调整基数
|
2024-08-19 16:01:06 +08:00 |
|
Harryxzy
|
26d300299b
|
社保方案上下限
|
2024-08-19 12:07:03 +08:00 |
|
钱涛
|
9b390faf50
|
SQL适配
|
2024-08-19 11:33:15 +08:00 |
|
钱涛
|
a796752203
|
Merge branch 'release/2.15.1.2407.01' into feature/权限
# Conflicts:
# src/com/engine/salary/entity/taxagent/bo/TaxAgentBO.java
|
2024-08-19 10:43:43 +08:00 |
|
钱涛
|
e2b2b9071f
|
Merge remote-tracking branch 'origin/feature/240801-浮动薪资' into feature/240801-浮动薪资
|
2024-08-16 14:04:31 +08:00 |
|
钱涛
|
659560550a
|
Merge branch 'release/2.15.1.2407.01' into feature/240801-浮动薪资
|
2024-08-16 13:18:08 +08:00 |
|
钱涛
|
7250ed3520
|
修复组织信息快照，主动添加或者sql添加人员丢失
|
2024-08-15 17:03:17 +08:00 |
|
Harryxzy
|
2ee605df44
|
浮动薪酬优化
|
2024-08-15 13:56:41 +08:00 |
|
钱涛
|
5071c08d8c
|
Merge branch 'release/2.15.1.2407.01' into feature/导入工具
# Conflicts:
# src/com/engine/salary/service/impl/SalarySobServiceImpl.java
|
2024-08-15 13:41:52 +08:00 |
|
钱涛
|
c5c469e4c4
|
修复邮件不显示入职日期
|
2024-08-15 11:54:18 +08:00 |
|
钱涛
|
2b2e9ea504
|
账套支持sql范围
|
2024-08-15 10:53:08 +08:00 |
|
钱涛
|
d37434521d
|
Merge remote-tracking branch 'origin/release/2.15.1.2407.01' into release/2.15.1.2407.01
|
2024-08-15 10:37:57 +08:00 |
|
钱涛
|
f74ec99644
|
账套支持sql范围
|
2024-08-15 10:37:41 +08:00 |
|
钱涛
|
9d26e1228f
|
薪酬迁移工具
|
2024-08-13 18:15:04 +08:00 |
|
Harryxzy
|
5055a4801a
|
浮动薪酬增加义务人
|
2024-08-12 16:36:27 +08:00 |
|
钱涛
|
ecb0f6f7bc
|
excel导入工具
|
2024-08-12 15:16:06 +08:00 |
|
钱涛
|
b83d45efa0
|
下载系统配置
|
2024-08-12 10:02:46 +08:00 |
|
钱涛
|
31cd3981e2
|
添加日志
|
2024-08-09 17:30:44 +08:00 |
|
钱涛
|
71c9bd3564
|
xml文件
|
2024-08-09 15:53:36 +08:00 |
|
Harryxzy
|
75fb15928a
|
浮动薪酬
|
2024-08-09 10:21:40 +08:00 |
|
钱涛
|
dd257ec53e
|
xml文件
|
2024-08-09 09:22:27 +08:00 |
|
钱涛
|
6532225da3
|
迁移工具
|
2024-08-08 18:04:50 +08:00 |
|
钱涛
|
83a408afa2
|
迁移工具
|
2024-08-08 16:53:31 +08:00 |
|
钱涛
|
080a69c929
|
全量迁移
|
2024-08-08 09:50:04 +08:00 |
|
钱涛
|
484639a690
|
导入薪资项目、模板、预览
|
2024-08-07 14:40:08 +08:00 |
|
钱涛
|
d30380e2e7
|
导入薪资项目、模板、预览
|
2024-08-07 14:23:35 +08:00 |
|
钱涛
|
48120f8e24
|
导入薪资项目
|
2024-08-07 09:06:09 +08:00 |
|
Harryxzy
|
dd18cf5191
|
考勤引用多个账套
|
2024-08-06 16:54:19 +08:00 |
|
钱涛
|
bd6e30b63b
|
导入薪资项目
|
2024-08-06 14:24:08 +08:00 |
|
钱涛
|
23ed2c5f3f
|
删除、同步对象设置
|
2024-08-06 10:46:33 +08:00 |
|
钱涛
|
10d988084b
|
导入工具
|
2024-08-06 10:32:57 +08:00 |
|
钱涛
|
84cb57ccd7
|
Merge branch 'release/2.15.1.2407.01' into feature/权限
|
2024-08-05 17:23:47 +08:00 |
|
钱涛
|
ff00de206c
|
线下对比
|
2024-08-05 17:23:25 +08:00 |
|
钱涛
|
4dcb3b4fea
|
薪资档案分权
|
2024-08-05 15:40:34 +08:00 |
|
钱涛
|
4d8c54bf8a
|
角色加描述
|
2024-08-02 16:18:26 +08:00 |
|
钱涛
|
494679087d
|
角色加描述
|
2024-08-02 14:04:14 +08:00 |
|
钱涛
|
9eea989bf2
|
显示扣缴义务人的角色
|
2024-08-02 10:10:04 +08:00 |
|
钱涛
|
4d51b6e57c
|
显示扣缴义务人的角色
|
2024-08-01 18:04:09 +08:00 |
|
钱涛
|
a0d2db2702
|
角色
|
2024-08-01 16:19:23 +08:00 |
|
钱涛
|
c674c22da1
|
在线算税重试处理
|
2024-08-01 10:56:29 +08:00 |
|
Harryxzy
|
8d057e2706
|
Merge branch 'feature/240702-编辑核算时人员信息' into release/2.15.1.2407.01
|
2024-08-01 10:53:29 +08:00 |
|
Harryxzy
|
8bbf8f3ff6
|
核算时编辑职称bug
|
2024-08-01 10:52:44 +08:00 |
|
钱涛
|
a8b487c94b
|
Merge branch 'release/2.15.1.2407.01' into feature/权限
# Conflicts:
# src/com/engine/salary/mapper/datacollection/EmployMapper.java
# src/com/engine/salary/mapper/datacollection/EmployMapper.xml
# src/com/engine/salary/service/SalaryEmployeeService.java
# src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
|
2024-08-01 10:16:05 +08:00 |
|
钱涛
|
241a85c711
|
默认值
|
2024-07-31 14:59:03 +08:00 |
|
钱涛
|
87a5eb59c6
|
暂存
|
2024-07-30 17:45:02 +08:00 |
|
钱涛
|
fad1402b06
|
权限项配置
|
2024-07-29 16:00:27 +08:00 |
|
钱涛
|
63012fd62a
|
成员列表
|
2024-07-29 13:28:46 +08:00 |
|
钱涛
|
0b091eee12
|
成员表达式变更
|
2024-07-26 14:32:35 +08:00 |
|
钱涛
|
e30ae5a2a1
|
成员表达式变更
|
2024-07-26 14:30:14 +08:00 |
|
钱涛
|
4543539206
|
角色和成员基础接口
|
2024-07-26 11:35:17 +08:00 |
|
Harryxzy
|
ec669c1f51
|
核算时编辑人员组织信息
|
2024-07-25 17:51:38 +08:00 |
|
Harryxzy
|
bdd27bcfc6
|
核算时编辑人员组织信息
|
2024-07-25 14:04:14 +08:00 |
|
Harryxzy
|
78cdadbb99
|
工资单详情 - 显示列定制
|
2024-07-16 11:30:25 +08:00 |
|
Harryxzy
|
84ce2821f6
|
1、定薪、返聘action优化
2、修复导出时excel中双击单元格变成黑色
|
2024-07-10 14:01:09 +08:00 |
|
钱涛
|
edddf5f557
|
处理8位小数问题
|
2024-06-28 14:42:23 +08:00 |
|
钱涛
|
9c7c6de614
|
核算信息快照
|
2024-06-27 16:10:30 +08:00 |
|
Harryxzy
|
c1c8bae9da
|
Merge branch 'fix/240603_薪资明细导出排序' into release/2.14.5.2406.03
|
2024-06-26 10:37:51 +08:00 |
|
Harryxzy
|
63c7477966
|
1、薪资明细导出根据显示列定制导出
2、薪资档案 高级搜索支持个税扣缴义务人多选
|
2024-06-26 10:35:05 +08:00 |
|
钱涛
|
993f21b448
|
Merge branch 'feature/人员信息快照' into release/2.14.5.2406.03
# Conflicts:
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
|
2024-06-21 14:17:36 +08:00 |
|
钱涛
|
e5d66373e6
|
默认值需要导致异动
|
2024-06-20 14:47:19 +08:00 |
|
钱涛
|
0961071980
|
Merge remote-tracking branch 'origin/feature/240502_薪资项目增加默认值设置' into feature/240502_薪资项目增加默认值设置
# Conflicts:
# src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml
|
2024-06-19 11:23:43 +08:00 |
|
钱涛
|
f0fce26e8a
|
Merge branch 'release/2.14.4.2406.02' into feature/240502_薪资项目增加默认值设置
# Conflicts:
# src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml
# src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
|
2024-06-19 11:14:31 +08:00 |
|
钱涛
|
81c768b7b9
|
人员信息快照
|
2024-06-18 15:28:31 +08:00 |
|
钱涛
|
0c0c754a9d
|
人员信息快照
|
2024-06-18 11:01:58 +08:00 |
|
Harryxzy
|
216c4cee84
|
默认值temp
|
2024-06-17 17:58:01 +08:00 |
|
钱涛
|
64e34d6d08
|
工资单预览
|
2024-06-13 17:46:37 +08:00 |
|
钱涛
|
1983ba968c
|
去除日志
系统薪资项目配置不需要重启
|
2024-06-12 15:35:40 +08:00 |
|
钱涛
|
853482141f
|
小数位支持10位
|
2024-06-12 10:45:32 +08:00 |
|
钱涛
|
f073f6d90c
|
处理刷新非正常人员问题
|
2024-06-11 15:48:07 +08:00 |
|
钱涛
|
c86b53fd27
|
Merge branch 'feature/锁定人员' into release/2.14.3.2406.01
|
2024-05-30 17:06:57 +08:00 |
|
钱涛
|
9aa2a03425
|
Merge branch 'release/2.14.2.2405.02' into release/2.14.3.2406.01
|
2024-05-30 14:41:45 +08:00 |
|
钱涛
|
9e8e7f1f09
|
删除隐藏
|
2024-05-30 14:41:28 +08:00 |
|
钱涛
|
7952e93d01
|
考勤引用显示证件号码
|
2024-05-29 16:53:51 +08:00 |