sy
|
f5d21042c8
|
Merge remote-tracking branch 'remotes/origin/feature/240101-减员action优化以及福利档案拷贝action开发' into release/2.10.1.2401.01
|
2024-01-31 16:32:45 +08:00 |
Harryxzy
|
e75cfae309
|
Merge branch 'feature/240101_工资单反馈区分pc和移动端' into release/2.10.1.2401.01
|
2024-01-31 16:13:27 +08:00 |
|
Harryxzy
|
2331ef354e
|
工资单确认和反馈按钮分开
|
2024-01-30 15:53:55 +08:00 |
|
sy
|
8237ed48a6
|
Merge remote-tracking branch 'remotes/origin/feature/240101工资单模板复制优化及福利基数调整记录优化' into release/2.10.1.2401.01
|
2024-01-30 14:32:59 +08:00 |
|
sy
|
b1d3d2c445
|
薪酬系统-福利档案，复制action开发
|
2024-01-30 14:31:21 +08:00 |
 钱涛
|
b6f7281cbd
|
记录日志
|
2024-01-30 14:17:06 +08:00 |
|
Harryxzy
|
12f66512df
|
工资单反馈区分pc和移动端
|
2024-01-30 13:50:05 +08:00 |
|
钱涛
|
e5a0a85179
|
增加调薪原因，晋升、降职、调岗
|
2024-01-30 11:18:54 +08:00 |
|
钱涛
|
65f972846f
|
处理id超过2100
|
2024-01-30 10:26:44 +08:00 |
|
钱涛
|
a8bfe83030
|
操作日志
|
2024-01-30 09:58:13 +08:00 |
|
钱涛
|
d2216eee13
|
Merge branch 'release/2.10.1.2401.01' into feature/操作日志组件
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
|
2024-01-29 15:07:58 +08:00 |
|
sy
|
c4adecf436
|
薪酬系统-福利档案，减员action优化
|
2024-01-29 11:30:04 +08:00 |
|
Harryxzy
|
5e9956fbbf
|
修复新建工资单模板时没有模板id，导致添加薪资项目时取到了其他模板的重命名的信息。
|
2024-01-26 14:56:58 +08:00 |
|
sy
|
78f96c5008
|
薪酬系统，拉取20240101分支更新内容，并处理冲突
|
2024-01-25 13:37:35 +08:00 |
|
sy
|
56c9557b3a
|
Merge remote-tracking branch 'remotes/origin/release/2.10.1.2401.01' into feature/240101工资单模板复制优化及福利基数调整记录优化
# Conflicts:
# src/com/engine/salary/service/impl/SIAccountServiceImpl.java
|
2024-01-25 11:43:11 +08:00 |
|
sy
|
8eeb358dcc
|
Merge remote-tracking branch 'remotes/origin/release/2.10.1.2401.01' into feature/240101工资单模板复制优化及福利基数调整记录优化
|
2024-01-25 11:41:44 +08:00 |
|
sy
|
e92e134d21
|
薪酬系统-工资单模板，复制功能改造，补发工资单模板名称更改
|
2024-01-25 11:41:35 +08:00 |
|
钱涛
|
6fc8d8fdee
|
去除达梦驱动
|
2024-01-25 11:38:38 +08:00 |
|
sy
|
4da07b9e80
|
薪酬系统-福利档案、台账，基数调整记录列表查询增加分权，台账查询条件支持个税扣缴义务人多选
|
2024-01-24 14:35:55 +08:00 |
|
钱涛
|
5bf00a98aa
|
记录核算日志
|
2024-01-24 09:50:58 +08:00 |
|
Harryxzy
|
71f90882d3
|
工资单反馈区分pc和移动端
|
2024-01-23 16:45:09 +08:00 |
|
sy
|
b84b5d1d6e
|
Merge remote-tracking branch 'remotes/origin/feature/231202-福利台账自动核算并归档' into feature/240101工资单模板复制优化及福利基数调整记录优化
|
2024-01-23 15:37:46 +08:00 |
|
钱涛
|
a5303b42a8
|
Merge branch 'release/2.10.1.2401.01' into feature/操作日志组件
|
2024-01-23 14:08:14 +08:00 |
|
sy
|
2a67ca9238
|
薪酬系统-工资单模板，复制功能改造2
|
2024-01-23 13:55:49 +08:00 |
|
sy
|
94d72cd93c
|
薪酬系统-工资单模板，复制功能改造
|
2024-01-23 10:52:53 +08:00 |
|
Harryxzy
|
a3e281b3fe
|
修复非系统人员搜索不生效
|
2024-01-23 10:00:26 +08:00 |
|
sy
|
56651196fa
|
Merge remote-tracking branch 'remotes/origin/release/2.9.10.2312.02' into feature/231202-福利台账自动核算并归档
|
2024-01-22 11:03:37 +08:00 |
|
sy
|
f236b8e655
|
薪酬系统-福利台账，核算相关方法梳理和优化
|
2024-01-19 11:35:11 +08:00 |
|
sy
|
29e5c27ffb
|
薪酬系统-福利台账，自动核算并归档任务类开发
|
2024-01-17 16:07:27 +08:00 |
|
钱涛
|
3f49076a19
|
Merge remote-tracking branch 'origin/release/2.9.10.2312.02' into release/2.9.10.2312.02
|
2024-01-16 16:35:45 +08:00 |
|
钱涛
|
db4b44e62c
|
修复非系统人员状态bug
|
2024-01-16 16:35:37 +08:00 |
|
Harryxzy
|
f4bb757538
|
Merge branch 'feature/240101_薪资档案增加起始、结束发薪筛选' into release/2.9.10.2312.02
|
2024-01-15 18:48:16 +08:00 |
|
Harryxzy
|
e38fd9be99
|
薪资档案增加起始、结束发薪筛选
|
2024-01-15 10:51:53 +08:00 |
|
sy
|
3b761341fc
|
薪酬系统-福利档案，档案导入功能优化，增加基数自动调整逻辑
|
2024-01-10 11:20:36 +08:00 |
|
Harryxzy
|
8164660ebf
|
Merge branch 'feature/231202-批量编辑' into release/2.9.10.2312.02
# Conflicts:
# src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
|
2024-01-08 15:34:32 +08:00 |
|
Harryxzy
|
5ecf069a79
|
Merge branch 'feature/240101_工资单发送action' into release/2.9.10.2312.02
|
2024-01-08 15:33:16 +08:00 |
|
Harryxzy
|
5f7c1c641b
|
Merge remote-tracking branch 'origin/release/2.9.10.2312.02' into release/2.9.10.2312.02
|
2024-01-08 15:33:11 +08:00 |
|
Harryxzy
|
9232dedbbf
|
Merge branch 'feature/240101_薪资项目宽度' into release/2.9.10.2312.02
|
2024-01-08 15:33:11 +08:00 |
|
sy
|
a16ed64ac0
|
Merge remote-tracking branch 'remotes/origin/feature/231201-福利档案拆分个人和公司福利基数' into release/2.9.10.2312.02
|
2024-01-08 13:54:25 +08:00 |
|
Harryxzy
|
9ca420b5e6
|
fix删除义务人时，没分片
|
2024-01-04 10:39:41 +08:00 |
|
Harryxzy
|
7945c84fbb
|
薪资项目宽度
|
2024-01-02 16:37:07 +08:00 |
|
Harryxzy
|
fe00f5c0e7
|
工资单发送action
|
2024-01-02 14:40:33 +08:00 |
|
Harryxzy
|
f03c0d0147
|
薪资项目同步至账套功能，过滤没有权限的账套
|
2023-12-29 10:27:35 +08:00 |
|
钱涛
|
7e22711dcd
|
导入工具
|
2023-12-28 15:47:05 +08:00 |
|
钱涛
|
b7435554e8
|
操作日志前端接口
|
2023-12-26 16:12:44 +08:00 |
|
钱涛
|
ea8d51c493
|
薪资项目操作日志
|
2023-12-22 16:36:11 +08:00 |
|
钱涛
|
bd0edcf8e2
|
日志组件
|
2023-12-22 14:50:16 +08:00 |
|
钱涛
|
7e980db4b3
|
日志组件
|
2023-12-21 20:25:00 +08:00 |
|
sy
|
a5eb86ab06
|
薪酬系统-福利台账，线下对比导入功能优化，适配福利基数个人和公司导入
|
2023-12-21 13:33:21 +08:00 |
|
Harryxzy
|
51022c0a16
|
薪资核算结果、线下对比下载导入模板优化fix
|
2023-12-12 14:22:18 +08:00 |
|
Harryxzy
|
9602e48e74
|
薪资核算结果、线下对比下载导入模板优化fix
|
2023-12-12 14:11:48 +08:00 |
|
Harryxzy
|
559ba88e9f
|
薪资核算结果、线下对比下载导入模板优化
|
2023-12-12 10:32:04 +08:00 |
|
Harryxzy
|
929bcc7877
|
薪资核算结果、线下对比下载导入模板优化
|
2023-12-12 10:18:10 +08:00 |
|
Harryxzy
|
d6705e8917
|
产品-批量编辑
|
2023-12-11 13:09:20 +08:00 |
|
Harryxzy
|
2b6b1ef2c4
|
Merge branch 'custom/鲁控数字' into feature/231202-批量编辑
|
2023-12-11 11:36:59 +08:00 |
|
sy
|
9d0d7a00fc
|
薪酬系统-福利台账，线下对比列表、导入、导出，适配拆分福利档案个人和公司基数逻辑
|
2023-12-08 18:06:54 +08:00 |
|
sy
|
1c5249c76e
|
薪酬系统-福利台账，福利核算、明细列表、导出数据，适配拆分福利档案个人和公司基数逻辑
|
2023-12-08 11:16:18 +08:00 |
|
sy
|
bb1b785f55
|
薪酬系统-福利档案，导出功能，根据区分个人和公司福利基数逻辑改造
|
2023-12-07 11:06:19 +08:00 |
|
sy
|
1287a97fe5
|
薪酬系统-福利档案，导入模板下载、导入、基数调整记录功能，根据区分个人和公司福利基数逻辑改造
|
2023-12-07 09:41:46 +08:00 |
|
Harryxzy
|
419baeb8cd
|
鲁控数字
|
2023-12-06 16:05:08 +08:00 |
|
Harryxzy
|
2a02e17c15
|
temp
|
2023-12-06 15:55:47 +08:00 |
|
sy
|
ec8cb6214d
|
薪酬系统-福利档案，档案明细编辑保存功能改造，适配福利档案福利基数拆分个人和公司需求
|
2023-12-06 14:04:12 +08:00 |
|
钱涛
|
390251bd63
|
Merge remote-tracking branch 'origin/release/2.9.9.2312.01' into release/2.9.9.2312.01
|
2023-12-05 15:08:44 +08:00 |
|
钱涛
|
dd48bff747
|
同步所有档案起始发薪日期为入职日期
|
2023-12-05 15:08:37 +08:00 |
|
Harryxzy
|
4eb931686e
|
鲁控数字temp
|
2023-12-05 14:57:34 +08:00 |
|
Harryxzy
|
3687bdfcdc
|
Merge remote-tracking branch 'origin/release/2.9.9.2312.01' into release/2.9.9.2312.01
|
2023-12-05 11:30:04 +08:00 |
|
Harryxzy
|
b093717e46
|
Merge branch 'fix/231102_账套增加义务人筛选' into release/2.9.9.2312.01
|
2023-12-05 11:28:47 +08:00 |
|
sy
|
ce10204dab
|
Merge remote-tracking branch 'remotes/origin/feature/231102-福利台账，补差待编辑项扩充其他可缴纳福利项' into release/2.9.9.2312.01
|
2023-12-05 11:26:48 +08:00 |
|
Harryxzy
|
a0331112be
|
Merge branch 'fie/231102_线下对比列头改造' into release/2.9.9.2312.01
|
2023-12-05 11:26:22 +08:00 |
|
sy
|
362c4d4459
|
薪酬系统-福利台账，正常缴纳和补缴中未设置缴纳的福利项导入校验优化，忽略为null的福利类缴纳map
|
2023-12-05 10:21:47 +08:00 |
|
sy
|
cecbd16508
|
薪酬系统-福利台账，正常缴纳和补缴中未设置缴纳的福利项，不允许导入核算数据
|
2023-12-04 15:10:46 +08:00 |
|
Harryxzy
|
df25f99544
|
薪资核算固定列头
|
2023-11-29 16:48:09 +08:00 |
|
sy
|
eaa8a45376
|
薪酬系统-福利台账，编辑功能带出福利项数据逻辑优化，增加缴纳对象（公司或个人）标志字段
|
2023-11-29 13:50:25 +08:00 |
|
sy
|
ce8ac2c125
|
薪酬系统-福利台账，编辑功能带出福利项数据逻辑优化，增加福利类别标志字段
|
2023-11-29 11:04:14 +08:00 |
|
sy
|
bf99fd81c6
|
薪酬系统-福利核算，补差数据新增功能接口
|
2023-11-24 17:42:34 +08:00 |
|
钱涛
|
3ab8840ccd
|
增加搜索条件颗粒度
|
2023-11-24 16:49:54 +08:00 |
|
sy
|
c8e3d6312b
|
薪酬系统-福利核算，补差待编辑福利项列表功能接口，补缴第三种方式的待编辑福利项获取逻辑优化，补差编辑tab页待编辑福利项获取逻辑优化
|
2023-11-24 14:05:03 +08:00 |
|
钱涛
|
e0f7ec3256
|
申报表提示日期优化
|
2023-11-22 16:37:48 +08:00 |
|
sy
|
9f8c5f9c07
|
薪酬系统-福利档案，福利档案列表显示、导入导出数据中不带出福利方案中停止缴费的福利数据
|
2023-11-22 11:32:32 +08:00 |
|
钱涛
|
afabde3b18
|
短信模板配置
|
2023-11-22 10:54:32 +08:00 |
|
钱涛
|
addd937b7b
|
Merge branch 'feature/支持工资单短信' into release/2.9.8.2311.02
|
2023-11-22 10:40:30 +08:00 |
|
sy
|
9bbbd80d36
|
薪酬系统-福利档案，福利档案导入时，年月格式兼容2001/01一类格式
|
2023-11-21 16:02:12 +08:00 |
|
Harryxzy
|
805fb9ff3c
|
1、薪资账套页面增加义务人筛选条件
2、薪资核算页面增加义务人列表
|
2023-11-20 16:14:51 +08:00 |
|
Harryxzy
|
a237f75d79
|
核算结果超过1000导入bug
|
2023-11-20 11:21:58 +08:00 |
|
Harryxzy
|
c8838f2528
|
Merge branch 'fix/薪资核算编辑保存BUG' into fix/核算结果导入超过1000
|
2023-11-20 11:21:14 +08:00 |
|
Harryxzy
|
301144214a
|
薪资核算编辑保存时删除了隐藏项目
|
2023-11-20 11:09:43 +08:00 |
|
Harryxzy
|
2656ce7c90
|
薪资核算结果导入超过1000报错
|
2023-11-20 10:56:03 +08:00 |
|
Harryxzy
|
c0ca63129e
|
线下对比优化
|
2023-11-16 16:56:50 +08:00 |
|
钱涛
|
c0e311bf57
|
不使用系统算税支持重新核算之前月份
|
2023-11-16 11:42:02 +08:00 |
|
钱涛
|
3de1e62f6b
|
短信模板
|
2023-11-16 11:38:21 +08:00 |
|
Harryxzy
|
97a5d4ab91
|
线下对比表头改造成分组的样式
|
2023-11-15 17:12:52 +08:00 |
|
钱涛
|
d2127cccff
|
短信模板
|
2023-11-15 13:32:37 +08:00 |
|
钱涛
|
443f2a749e
|
Merge branch 'release/3.0.0.2311.01' into release/2.9.8.2311.01
|
2023-11-13 17:20:04 +08:00 |
|
钱涛
|
2c12b10171
|
1、减少人员bug
2、档案项目输入bug
|
2023-11-13 17:12:25 +08:00 |
|
钱涛
|
f3bc735fae
|
短信发送
|
2023-11-13 16:52:19 +08:00 |
|
钱涛
|
8eefec2e57
|
跳过考勤报表假期余额权限
|
2023-11-13 11:15:49 +08:00 |
|
Harryxzy
|
c88db43e55
|
Merge remote-tracking branch 'origin/release/3.0.0.2311.01' into release/3.0.0.2311.01
|
2023-11-09 16:19:35 +08:00 |
|
Harryxzy
|
025cb73a21
|
Merge branch 'feature/231101_返聘action' into release/3.0.0.2311.01
|
2023-11-09 16:18:00 +08:00 |
|
钱涛
|
675e5d7972
|
扩展人员属性
|
2023-11-09 11:34:00 +08:00 |
|
钱涛
|
00f806a8e9
|
Merge branch 'release/3.0.0.2311.01' into feature/报表支持自定义维度
|
2023-11-07 19:06:57 +08:00 |
|
钱涛
|
bcee3c5e5a
|
人员属性扩展
|
2023-11-07 19:06:43 +08:00 |
|
Harryxzy
|
f2a840576e
|
Merge branch 'fix/薪资核算导入下载模板bug' into release/3.0.0.2311.01
|
2023-11-07 11:24:25 +08:00 |
|
钱涛
|
68bc79ab0b
|
修改关键字
|
2023-11-07 11:00:00 +08:00 |
|
钱涛
|
74f7c71ffe
|
扩展维度属性
|
2023-11-06 11:19:00 +08:00 |
|
Harryxzy
|
0048001c54
|
返聘
|
2023-11-03 16:53:23 +08:00 |
|
Harryxzy
|
e018ec629f
|
返聘
|
2023-11-03 16:37:09 +08:00 |
|
Harryxzy
|
44233d74a8
|
返聘
|
2023-11-03 15:28:04 +08:00 |
|
钱涛
|
0634a139b9
|
显示字符统计规则
|
2023-11-02 18:41:58 +08:00 |
|
Harryxzy
|
f85f0af44a
|
下载核算导入模板，直接从缓存拿选的字段
|
2023-11-02 16:39:58 +08:00 |
|
钱涛
|
4c11c54973
|
统一解密位置
|
2023-10-31 17:16:48 +08:00 |
|
钱涛
|
2b4ded9dd0
|
修复合计没有根据自定义字段过滤
|
2023-10-30 19:19:07 +08:00 |
|
钱涛
|
b08d3bdd2c
|
修复报表多部门查询
|
2023-10-25 11:19:47 +08:00 |
|
sy
|
05b2c1868b
|
Merge remote-tracking branch 'remotes/origin/feature/231001-福利档案基数调整记录' into release/2.9.6.2310.01
|
2023-10-24 14:11:22 +08:00 |
|
sy
|
1c0b00d163
|
薪酬系统-福利档案，福利档案基数调整记录列表查询入参调整
|
2023-10-23 18:07:37 +08:00 |
|
钱涛
|
35550aa788
|
假期余额
|
2023-10-20 13:26:25 +08:00 |
|
钱涛
|
a19f86c624
|
一键累计bug修复
|
2023-10-20 10:29:46 +08:00 |
|
sy
|
f8f5ea7782
|
薪酬系统-福利档案，薪资核算时调用福利核算数据查询时人员ids分片
|
2023-10-20 09:50:44 +08:00 |
|
sy
|
d0e0195709
|
薪酬系统-福利档案，导入时档案主表查询时人员ids分片
|
2023-10-19 14:30:58 +08:00 |
|
sy
|
96bc325b43
|
薪酬系统-福利档案，福利档案基数调整记录列表查询入参和返回数据调整
|
2023-10-18 15:13:08 +08:00 |
|
sy
|
9ac549c06a
|
薪酬系统-福利档案，福利档案基数调整记录列表查询
|
2023-10-18 13:34:05 +08:00 |
|
钱涛
|
5d7a6bc241
|
调薪记录
|
2023-10-17 18:04:47 +08:00 |
|
sy
|
0225e40e57
|
薪酬系统-福利档案，福利档案编辑保存逻辑中增加基数调整记录
|
2023-10-17 17:46:54 +08:00 |
|
sy
|
e80a3497d9
|
薪酬系统-福利档案，福利档案导入逻辑中增加基数调整记录
|
2023-10-17 11:40:28 +08:00 |
|
Harryxzy
|
a34a5b9aa6
|
同步义务人人员范围到账套人员范围
|
2023-10-16 16:59:18 +08:00 |
|
钱涛
|
4a59859fa8
|
调薪记录
|
2023-10-12 17:34:09 +08:00 |
|
钱涛
|
e570c1879e
|
账套保存异常
|
2023-10-09 15:35:20 +08:00 |
|
钱涛
|
dada3a0633
|
去除objectuutil
|
2023-10-09 10:43:43 +08:00 |
|
钱涛
|
5f152a991b
|
核算自定义其他搜索条件
|
2023-10-08 15:44:09 +08:00 |
|
钱涛
|
182e90676c
|
Merge branch 'feature/自定义筛选条件' into release/2.9.6.2310.01
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
|
2023-10-08 14:24:33 +08:00 |
|
钱涛
|
8166e76081
|
账套增加状态字段
|
2023-10-08 13:38:37 +08:00 |
|
钱涛
|
138f832537
|
时效性过滤
|
2023-10-08 10:11:07 +08:00 |
|
钱涛
|
37e9b3c33c
|
sql可以使用薪资项目作为变量
|
2023-10-07 17:00:02 +08:00 |
|
钱涛
|
d98933832a
|
Merge branch 'feature/生成签名pdf' into release/2.9.6.2310.01
# Conflicts:
# src/com/engine/salary/web/SalaryBillController.java
|
2023-10-07 15:19:38 +08:00 |
|
钱涛
|
67a9d45630
|
工资单时效设置
|
2023-10-07 14:47:32 +08:00 |
|
钱涛
|
5241972151
|
工资单时效设置
|
2023-10-07 14:46:28 +08:00 |
|
钱涛
|
6fe4b855ec
|
Merge branch 'fix/核算效率' into release/2.9.6.2310.01
|
2023-10-07 10:05:49 +08:00 |
|
钱涛
|
4c5bc5dda7
|
增加状态
|
2023-09-28 17:05:42 +08:00 |
|
钱涛
|
6e889ccc70
|
同步字段名称到项目公式
|
2023-09-27 17:17:56 +08:00 |
|
钱涛
|
4ed4edc9ed
|
pdf按钮控制
|
2023-09-27 14:19:52 +08:00 |
|
钱涛
|
7562b4e4a3
|
Merge branch 'feature/生成签名pdf' into feature/自定义筛选条件
|
2023-09-27 14:01:32 +08:00 |
|
钱涛
|
07291fb20a
|
取消sqlserver自动分片
|
2023-09-27 10:50:05 +08:00 |
|
钱涛
|
568c62122a
|
取消sqlserver自动分片
|
2023-09-27 10:49:55 +08:00 |
|
钱涛
|
763393983c
|
工资单pdf
|
2023-09-26 17:52:46 +08:00 |
|
钱涛
|
309e89ceaa
|
异步处理核算报表数据
|
2023-09-26 17:35:23 +08:00 |
|
钱涛
|
a7e8498b98
|
取消核算报表数据
|
2023-09-26 17:18:27 +08:00 |
|
钱涛
|
f99bb21bab
|
修复核算效率
|
2023-09-26 14:29:12 +08:00 |
|
钱涛
|
e37922c52f
|
工资单pdf
|
2023-09-26 10:26:12 +08:00 |
|
钱涛
|
1de83a57c2
|
工资单pdf
|
2023-09-26 10:00:00 +08:00 |
|
钱涛
|
5d203b0783
|
自定义搜索
|
2023-09-25 16:53:01 +08:00 |
|
钱涛
|
faeafbe5ad
|
暂存
|
2023-09-25 15:38:14 +08:00 |