Harryxzy
|
85f009984c
|
Merge branch 'fix/231202_补发工资单回算项' into release/2.9.10.2312.02
|
2023-12-14 16:00:24 +08:00 |
|
Harryxzy
|
e97a35f158
|
新建补发工资单模板时，已发补发项目fix
|
2023-12-14 15:57:55 +08:00 |
sy
|
2685c724e4
|
薪酬系统-福利档案，福利档案编辑页方案基础信息返回逻辑优化
|
2023-12-14 13:59:39 +08:00 |
 钱涛
|
d53897d147
|
Merge remote-tracking branch 'origin/release/2.9.10.2312.02' into release/2.9.10.2312.02
|
2023-12-14 10:40:06 +08:00 |
|
钱涛
|
96d37b1b68
|
修复申报表明细
|
2023-12-14 10:39:49 +08:00 |
|
Harryxzy
|
cfbddef42a
|
核算记录归档action
|
2023-12-13 09:58:00 +08:00 |
|
Harryxzy
|
5fba05bc43
|
Merge branch 'fix/核算、线下对比导出优化' into release/2.9.9.2312.01
|
2023-12-12 14:22:44 +08:00 |
|
Harryxzy
|
51022c0a16
|
薪资核算结果、线下对比下载导入模板优化fix
|
2023-12-12 14:22:18 +08:00 |
|
Harryxzy
|
d38ef4769b
|
Merge remote-tracking branch 'origin/release/2.9.9.2312.01' into release/2.9.9.2312.01
|
2023-12-12 14:12:19 +08:00 |
|
Harryxzy
|
5c50b61cd5
|
Merge branch 'fix/核算、线下对比导出优化' into release/2.9.9.2312.01
|
2023-12-12 14:12:14 +08:00 |
|
Harryxzy
|
9602e48e74
|
薪资核算结果、线下对比下载导入模板优化fix
|
2023-12-12 14:11:48 +08:00 |
|
钱涛
|
b78f4302e0
|
小数位
|
2023-12-12 13:18:17 +08:00 |
|
Harryxzy
|
9c454623bc
|
Merge branch 'fix/核算、线下对比导出优化' into release/2.9.9.2312.01
|
2023-12-12 10:32:30 +08:00 |
|
Harryxzy
|
559ba88e9f
|
薪资核算结果、线下对比下载导入模板优化
|
2023-12-12 10:32:04 +08:00 |
|
Harryxzy
|
929bcc7877
|
薪资核算结果、线下对比下载导入模板优化
|
2023-12-12 10:18:10 +08:00 |
|
钱涛
|
04e3225c98
|
自适应
|
2023-12-12 10:07:31 +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 |
|
钱涛
|
e495c1799f
|
自定义
|
2023-12-11 09:52:47 +08:00 |
|
sy
|
9d0d7a00fc
|
薪酬系统-福利台账，线下对比列表、导入、导出，适配拆分福利档案个人和公司基数逻辑
|
2023-12-08 18:06:54 +08:00 |
|
Harryxzy
|
8138b5297f
|
薪酬报表添加文本统计项目时，字符去值规则没有保存进去
|
2023-12-08 11:41:13 +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
|
6dca2a4380
|
薪酬系统-福利档案，开启开关时，档案列表展示，区分个人和公司福利基数
|
2023-12-06 15:38:19 +08:00 |
|
sy
|
ec8cb6214d
|
薪酬系统-福利档案，档案明细编辑保存功能改造，适配福利档案福利基数拆分个人和公司需求
|
2023-12-06 14:04:12 +08:00 |
|
sy
|
451c9fb07b
|
薪酬系统-福利档案，档案明细获取逻辑改造，根据应用设置中的区分开关，判定后将公司的福利基数信息单独区分返回
|
2023-12-06 09:51:07 +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 |
|
钱涛
|
3f61807401
|
修复核算结果可能为0
|
2023-11-29 17:45:16 +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
|
22d749dcb3
|
Merge remote-tracking branch 'remotes/origin/fix/231101-福利档案及模板导出后文件损坏问题修复' into feature/231102-福利台账，补差待编辑项扩充其他可缴纳福利项
|
2023-11-28 16:05:29 +08:00 |
|
sy
|
1bd20b2686
|
薪酬系统-福利台账，台账查询增加个税扣缴义务人
|
2023-11-27 11:20:36 +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 |
|
钱涛
|
f77b4c063b
|
去除文化遗产
|
2023-11-23 10:25:33 +08:00 |
|
钱涛
|
a143b4fba5
|
新增工资单模板短信字段
|
2023-11-23 09:31:09 +08:00 |
|
sy
|
9876bc49cf
|
薪酬系统-福利核算，对于处于在缴员工列表，但是不在起始缴纳月和最后缴纳月区间的核算月的人员，不生成核算记录
|
2023-11-22 16:47:36 +08:00 |
|
钱涛
|
e0f7ec3256
|
申报表提示日期优化
|
2023-11-22 16:37:48 +08:00 |
|
钱涛
|
f16f93fd43
|
过滤pdf中的空或0值
|
2023-11-22 14:06:34 +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
|
30e6bed471
|
Merge remote-tracking branch 'remotes/origin/feature/231001-福利档案基数调整记录' into release/2.9.8.2311.02
|
2023-11-22 09:38:16 +08:00 |
|
sy
|
4ebad5ec83
|
Merge remote-tracking branch 'remotes/origin/feature/231001-福利档案基数调整记录' into fix/231102-福利档案，导入数据中的年月数据校验优化
|
2023-11-21 16:02:30 +08:00 |
|
sy
|
9bbbd80d36
|
薪酬系统-福利档案，福利档案导入时，年月格式兼容2001/01一类格式
|
2023-11-21 16:02:12 +08:00 |
|
sy
|
c9b279049d
|
薪酬系统-福利台账，福利核算出现异常时，优化核算进度获取逻辑
|
2023-11-21 14:40:30 +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 |
|
钱涛
|
a2f63dee2b
|
短信模板设置接口
|
2023-11-16 15:42:11 +08:00 |
|
钱涛
|
e1a4e275ff
|
短信模板设置接口
|
2023-11-16 15:41:29 +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 |
|
sy
|
e0fcff792d
|
薪酬系统-福利档案，福利档案及模板导出参数设置优化
|
2023-11-15 10:17:12 +08:00 |
|
钱涛
|
7f68931cc5
|
获取考勤假期余额
|
2023-11-13 17:23:33 +08:00 |
|
钱涛
|
7befa9f408
|
获取考勤假期余额
|
2023-11-13 17:23:09 +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 |
|
钱涛
|
3dc5cc3a44
|
修改报表bug
|
2023-11-10 14:22:58 +08:00 |
|
钱涛
|
eb61811766
|
假期余额
|
2023-11-10 10:55:38 +08:00 |
|
钱涛
|
d86b00e5f7
|
清除加解密状态
|
2023-11-09 17:01:08 +08:00 |
|
钱涛
|
9ec0daa3f6
|
加密描述
|
2023-11-09 16:40:30 +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 |
|
钱涛
|
0cfbe05c54
|
报表日期
|
2023-11-09 16:14:35 +08:00 |
|
钱涛
|
675e5d7972
|
扩展人员属性
|
2023-11-09 11:34:00 +08:00 |
|
钱涛
|
e677207eac
|
新增统计维度展示
|
2023-11-08 15:59:54 +08:00 |
|
钱涛
|
d2ac1aec23
|
修改维度展示
|
2023-11-08 09:38:24 +08:00 |
|
钱涛
|
61d0e0f659
|
去除无效代码
|
2023-11-07 20:14:23 +08:00 |
|
钱涛
|
fbd19ecf75
|
缓存
|
2023-11-07 19:11:16 +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 |
|
钱涛
|
5f371a8e58
|
报表复制
|
2023-11-07 15:55:03 +08:00 |
|
钱涛
|
b30c9b1ca9
|
Merge branch 'feature/扩展人员维度属性' into feature/报表支持自定义维度
|
2023-11-07 14:45:27 +08:00 |
|
Harryxzy
|
3353cd67ce
|
Merge remote-tracking branch 'origin/release/3.0.0.2311.01' into release/3.0.0.2311.01
|
2023-11-07 11:24:59 +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 |
|
钱涛
|
b9d119bcf0
|
修改关闭解密方法
|
2023-11-07 10:00:51 +08:00 |
|
钱涛
|
36a77a8e0f
|
自定义报表维度
|
2023-11-06 18:46:49 +08:00 |
|
钱涛
|
43d627c23a
|
扩展维度属性
|
2023-11-06 11:32:25 +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 |
|
Harryxzy
|
5d2218b8f0
|
返聘action
|
2023-11-02 16:22:24 +08:00 |
|
钱涛
|
83f38d1d74
|
显示字符统计规则
|
2023-11-02 14:43:15 +08:00 |
|
Harryxzy
|
f80bb620dd
|
返聘action
|
2023-11-02 14:21:33 +08:00 |
|
钱涛
|
22a946d9ad
|
报表支持文本
|
2023-11-01 16:09:19 +08:00 |
|
钱涛
|
7fa3c31aac
|
报表支持文本
|
2023-11-01 09:54:09 +08:00 |
|
钱涛
|
4c11c54973
|
统一解密位置
|
2023-10-31 17:16:48 +08:00 |
|
钱涛
|
0c77031e46
|
报表功能暂存
|
2023-10-31 17:08:28 +08:00 |
|
钱涛
|
3d8919da25
|
账套增加证件号码字段
|
2023-10-31 15:08:43 +08:00 |
|
钱涛
|
e70a17cd19
|
捕获社保模块导出异常
|
2023-10-31 11:21:48 +08:00 |
|
钱涛
|
4bf60c0370
|
公式负数符号特殊处理
|
2023-10-31 09:41:02 +08:00 |
|
钱涛
|
2b4ded9dd0
|
修复合计没有根据自定义字段过滤
|
2023-10-30 19:19:07 +08:00 |
|
钱涛
|
872ca0a805
|
恢复档案pageid
|
2023-10-26 13:45:38 +08:00 |
|
sy
|
da04a951d2
|
薪酬系统-福利档案，福利档案基数调整记录列表排序优化
|
2023-10-26 10:00:14 +08:00 |
|
sy
|
267cced46b
|
薪酬系统-福利档案，福利档案基数调整记录列表功能优化，可展示非系统人员姓名
|
2023-10-25 19:14:02 +08:00 |
|
钱涛
|
16f46ae2da
|
报表人员维度增加部门和工号
|
2023-10-25 14:33:19 +08:00 |
|
钱涛
|
b08d3bdd2c
|
修复报表多部门查询
|
2023-10-25 11:19:47 +08:00 |
|
sy
|
dba2f48785
|
薪酬系统-福利档案，福利档案基数调整记录生成逻辑优化，过滤空值变更
|
2023-10-25 11:18:10 +08:00 |
|
钱涛
|
adc8bce395
|
薪资档案改个pageid
|
2023-10-25 10:14:33 +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 |
|
钱涛
|
cf2d2552a2
|
Merge branch 'feature/假期余额' into release/3.0.0.2311.01
|
2023-10-24 11:44:01 +08:00 |
|
钱涛
|
bf67fe17fc
|
年假余额
|
2023-10-24 11:43:14 +08:00 |
|
钱涛
|
7249c749c0
|
年假余额
|
2023-10-24 10:24:10 +08:00 |
|
sy
|
1c0b00d163
|
薪酬系统-福利档案，福利档案基数调整记录列表查询入参调整
|
2023-10-23 18:07:37 +08:00 |
|
钱涛
|
05b9a2a57e
|
Merge branch 'feature/公式短路' into release/2.9.6.2310.01
|
2023-10-20 14:19:54 +08:00 |
|
钱涛
|
35550aa788
|
假期余额
|
2023-10-20 13:26:25 +08:00 |
|
钱涛
|
a19f86c624
|
一键累计bug修复
|
2023-10-20 10:29:46 +08:00 |
|
sy
|
1db16d6fa6
|
Merge remote-tracking branch 'remotes/origin/fix/231001-福利档案导入bug修复，档案主表查询人员ids分片' into release/2.9.6.2310.01
|
2023-10-20 09:51:39 +08:00 |
|
sy
|
f8f5ea7782
|
薪酬系统-福利档案，薪资核算时调用福利核算数据查询时人员ids分片
|
2023-10-20 09:50:44 +08:00 |
|
钱涛
|
83e16cedf6
|
一键累计bug修复
|
2023-10-20 09:43:04 +08:00 |
|
钱涛
|
0dd9040408
|
一键累计bug修复
|
2023-10-19 17:35:33 +08:00 |
|
钱涛
|
81b9d65a22
|
过滤==
|
2023-10-19 16:26:23 +08:00 |
|
钱涛
|
6bbfc10c34
|
过滤==
|
2023-10-19 16:25:30 +08:00 |
|
钱涛
|
3745be2c5c
|
状态编码
|
2023-10-19 15:52:52 +08:00 |
|
sy
|
d247353530
|
Merge remote-tracking branch 'remotes/origin/fix/231001-福利档案导入bug修复，档案主表查询人员ids分片' into release/2.9.6.2310.01
|
2023-10-19 14:31:49 +08:00 |
|
sy
|
d0e0195709
|
薪酬系统-福利档案，导入时档案主表查询时人员ids分片
|
2023-10-19 14:30:58 +08:00 |
|
钱涛
|
18527f745e
|
修复自定义核算条件
|
2023-10-19 14:21:22 +08:00 |
|
钱涛
|
0d5f1ce6c7
|
Merge branch 'release/2.9.6.2310.01' into feature/公式短路
|
2023-10-18 17:12:22 +08:00 |
|
钱涛
|
213deb731c
|
调薪记录bug
|
2023-10-18 17:01:37 +08:00 |
|
钱涛
|
0ecb3a3977
|
短路处理
|
2023-10-18 16:01:37 +08:00 |
|
sy
|
96bc325b43
|
薪酬系统-福利档案，福利档案基数调整记录列表查询入参和返回数据调整
|
2023-10-18 15:13:08 +08:00 |
|
钱涛
|
dafde8451e
|
调薪记录bug
|
2023-10-18 14:20:32 +08:00 |
|
sy
|
b9a681a791
|
薪酬系统-福利台账，线下对比中数值是否存在差异相关逻辑优化
|
2023-10-18 14:14:05 +08:00 |
|
sy
|
9ac549c06a
|
薪酬系统-福利档案，福利档案基数调整记录列表查询
|
2023-10-18 13:34:05 +08:00 |
|
sy
|
e68359ef50
|
Merge branch 'fix/231001-福利台账，导入模板下载接口由get改为post' into release/2.9.6.2310.01
|
2023-10-18 09:48:19 +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 |
|
钱涛
|
7e22c9836f
|
调整原因接口
|
2023-10-16 15:01:29 +08:00 |
|
钱涛
|
4a59859fa8
|
调薪记录
|
2023-10-12 17:34:09 +08:00 |
|
Harryxzy
|
f70a7e6c96
|
Merge branch 'fix/231002_变量返回双引号或0' into release/2.9.6.2310.01
|
2023-10-12 14:28:10 +08:00 |
|
Harryxzy
|
07c1785714
|
Merge remote-tracking branch 'origin/release/2.9.6.2310.01' into release/2.9.6.2310.01
|
2023-10-12 14:27:57 +08:00 |
|
钱涛
|
db71ba0e5f
|
fix null
|
2023-10-12 14:13:25 +08:00 |
|
Harryxzy
|
fbc49bff98
|
公式变量为文本时返回””number返回0
|
2023-10-12 13:47:18 +08:00 |
|
sy
|
6ae953c723
|
薪酬系统-福利台账，补缴、补差导入模板下载接口改为post类型
|
2023-10-12 11:45:21 +08:00 |
|
Harryxzy
|
c83539460c
|
薪酬token
|
2023-10-11 15:54:08 +08:00 |
|
Harryxzy
|
b71633d744
|
token
|
2023-10-11 15:28:58 +08:00 |
|
Harryxzy
|
03d3befbdd
|
token
|
2023-10-11 14:07:23 +08:00 |
|
sy
|
92a7daa9fa
|
薪酬系统-福利台账，正常缴纳导入模板下载接口改为post类型
|
2023-10-10 16:17:44 +08:00 |
|
钱涛
|
e570c1879e
|
账套保存异常
|
2023-10-09 15:35:20 +08:00 |
|
Harryxzy
|
e25ea296e8
|
Merge remote-tracking branch 'origin/release/2.9.6.2310.01' into release/2.9.6.2310.01
|
2023-10-09 14:34:32 +08:00 |
|
Harryxzy
|
2766ceb276
|
自动同步考勤定时任务
|
2023-10-09 14:34:18 +08:00 |
|
钱涛
|
61b80e3ad1
|
Merge remote-tracking branch 'origin/release/2.9.6.2310.01' into release/2.9.6.2310.01
|
2023-10-09 14:17:25 +08:00 |
|
钱涛
|
39520346dc
|
解密
|
2023-10-09 14:17:15 +08:00 |
|
Harryxzy
|
d69aa46e33
|
自动同步考勤定时任务
|
2023-10-09 14:10:09 +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 |
|
sy
|
26e9fc90e1
|
薪酬系统-福利台账，修复未设置基数情况下存在的核算失败问题
|
2023-10-08 11:12:16 +08:00 |
|
钱涛
|
138f832537
|
时效性过滤
|
2023-10-08 10:11:07 +08:00 |
|
钱涛
|
b6508067f1
|
过滤枚举
|
2023-10-08 09:16:54 +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 |
|
Harryxzy
|
bf8ae9fd09
|
Merge branch 'fix/230902-导出报表为数值类型' into release/2.9.5.2309.01
|
2023-09-21 16:03:38 +08:00 |
|
Harryxzy
|
bc7d7b3326
|
Merge branch 'feature/230902_报表共享' into release/2.9.5.2309.01
|
2023-09-21 15:06:04 +08:00 |
|
Harryxzy
|
7a57849a25
|
报表fixbug
|
2023-09-21 15:05:39 +08:00 |
|
sy
|
f4883ad87c
|
Merge remote-tracking branch 'remotes/origin/feature/230901-社保福利方案搜索功能' into release/2.9.5.2309.01
|
2023-09-21 14:10:06 +08:00 |
|
sy
|
5f84ed451b
|
Merge remote-tracking branch 'remotes/origin/feature/230901-福利台账-调差，支持一个人存在多个调差记录' into release/2.9.5.2309.01
|
2023-09-21 14:09:54 +08:00 |
|
Harryxzy
|
efa818f8b9
|
核算结果导出数值项excel格式为数值
|
2023-09-21 13:36:23 +08:00 |
|
Harryxzy
|
cdefb1d310
|
Merge branch 'feature/230902_报表共享' into release/2.9.5.2309.01
|
2023-09-21 11:45:34 +08:00 |
|
Harryxzy
|
443368bdb3
|
Merge branch 'fix/230902-账套中从公式改为输入，核算公式展示错误' into release/2.9.5.2309.01
|
2023-09-21 11:44:23 +08:00 |
|
Harryxzy
|
ad6587b9b2
|
Merge branch 'fix/230902-能够重复反馈' into release/2.9.5.2309.01
|
2023-09-21 11:44:12 +08:00 |
|
钱涛
|
c86151225d
|
流程获取档案信息v2
|
2023-09-21 11:43:41 +08:00 |
|
Harryxzy
|
9e95e3402b
|
删除多余注释
|
2023-09-21 11:02:48 +08:00 |
|
钱涛
|
3609045de2
|
流程获取档案信息
|
2023-09-21 10:58:19 +08:00 |
|
Harryxzy
|
dfc8a1c578
|
报表共享
|
2023-09-21 09:38:38 +08:00 |
|
sy
|
3167aaab63
|
薪酬系统-福利方案，修改查询参数
|
2023-09-20 17:29:44 +08:00 |
|
sy
|
05507180eb
|
薪酬系统-福利台账，调差保存时判断调差到对象是否为统计范围内福利项
|
2023-09-20 15:40:31 +08:00 |
|
Harryxzy
|
c40c31845c
|
账套中修改公式为输入，核算的公式页面展示为空字符串不是”输入“
|
2023-09-20 15:26:18 +08:00 |
|
Harryxzy
|
74e4d39b83
|
报表fix
|
2023-09-20 15:02:44 +08:00 |
|
钱涛
|
9ab80de441
|
工资单pdf和签名
|
2023-09-20 14:45:44 +08:00 |
|
sy
|
dc93a96c8d
|
薪酬系统-薪资核算，获取福利核算数据逻辑优化
|
2023-09-20 14:13:00 +08:00 |
|
Harryxzy
|
0eafc0ce94
|
报表temp
|
2023-09-20 09:10:47 +08:00 |
|
Harryxzy
|
5bd66b626f
|
查看工资单后能够继续反馈、确认
|
2023-09-19 16:21:23 +08:00 |
|
sy
|
bf6918264f
|
薪酬系统-福利方案，福利方案修改action
|
2023-09-19 15:24:44 +08:00 |
|
Harryxzy
|
897a7731bf
|
报表fixbug
|
2023-09-19 13:59:08 +08:00 |
|
Harryxzy
|
c7713353dd
|
报表fixbug
|
2023-09-19 13:34:51 +08:00 |
|
Harryxzy
|
5d4231c241
|
报表共享fix
|
2023-09-19 13:11:24 +08:00 |
|
钱涛
|
d9c56a0da4
|
修复switchs函数数据问题
|
2023-09-19 11:24:41 +08:00 |
|
sy
|
2afa94e3a4
|
Merge remote-tracking branch 'remotes/origin/release/2.9.5.2309.01' into feature/230901-福利台账-调差，支持一个人存在多个调差记录
|
2023-09-19 10:47:13 +08:00 |
|
Harryxzy
|
c95098a22b
|
报表共享fix
|
2023-09-18 19:14:06 +08:00 |
|
钱涛
|
12480f8306
|
生成工资单pdf签名
|
2023-09-18 18:45:59 +08:00 |
|
Harryxzy
|
5f1ef51892
|
报表共享temp
|
2023-09-18 18:20:53 +08:00 |
|
sy
|
5538a7d01e
|
薪酬系统-福利方案，增加查询功能
|
2023-09-18 16:30:52 +08:00 |
|
钱涛
|
88a59d3d01
|
处理空指针
|
2023-09-18 13:49:25 +08:00 |
|
钱涛
|
7b3f7b2e39
|
签名
|
2023-09-18 10:25:43 +08:00 |
|
sy
|
3826e89a72
|
薪酬系统-福利台账，福利核算逻辑优化，支持未设置基数，仅设置固定值的福利档案的核算
|
2023-09-15 15:38:20 +08:00 |
|
Harryxzy
|
7db0a475ff
|
Merge branch 'fix/230902-薪资账套复制缺少字段' into release/2.9.5.2309.01
|
2023-09-14 17:35:05 +08:00 |
|
Harryxzy
|
0675de75ed
|
修复复制账套时少复制
|
2023-09-14 17:32:01 +08:00 |
|
钱涛
|
2b13d0c7ef
|
定薪账套
|
2023-09-14 11:56:00 +08:00 |
|
sy
|
38bffb2a8b
|
薪酬系统-福利台账、档案，细化调差报错信息，编辑action修复新增个税扣缴义务人人员范围
|
2023-09-13 10:09:32 +08:00 |
|
sy
|
0ad4a63a6b
|
Merge remote-tracking branch 'remotes/origin/fix/230901-福利档案编辑问题修复' into feature/230901-福利台账-调差，支持一个人存在多个调差记录
|
2023-09-12 11:30:12 +08:00 |
|
sy
|
eb1966b703
|
薪酬系统-福利档案，编辑后保存功能，校验档案人员是否为非系统人员逻辑问题修复
|
2023-09-12 11:21:48 +08:00 |
|
sy
|
b276066b52
|
薪酬系统-福利台账，导入模板带出核算数据
|
2023-09-12 11:05:46 +08:00 |
|
sy
|
39971f726d
|
Merge remote-tracking branch 'remotes/origin/feature/230901-福利档案-非系统人员tab' into release/2.9.5.2309.01
|
2023-09-08 17:02:03 +08:00 |
|
sy
|
3e7180a25e
|
Merge remote-tracking branch 'remotes/origin/feature/230901-福利档案-非系统人员tab' into feature/230901-福利台账-调差，支持一个人存在多个调差记录
|
2023-09-08 16:57:32 +08:00 |
|
sy
|
ec406b7f8a
|
薪酬系统-福利档案，福利档案编辑并减员、编辑并增员action
|
2023-09-08 16:57:09 +08:00 |
|
sy
|
9bd270e77d
|
薪酬系统-福利台账，调差支持一人多条记录
|
2023-09-08 13:24:27 +08:00 |
|
sy
|
a8e118b33a
|
薪酬系统-非系统人员管理，导入时增加对多级部门的识别
|
2023-09-07 15:11:10 +08:00 |
|
Harryxzy
|
8ec5def53d
|
Merge branch 'feature/230901-同步薪资项目至账套' into release/2.9.5.2309.01
|
2023-09-07 10:05:14 +08:00 |
|
sy
|
a672c71e5a
|
薪酬系统-福利档案，导入初始、最后缴纳月取值逻辑优化
|
2023-09-06 17:39:09 +08:00 |
|
Harryxzy
|
e48f64e814
|
Merge branch 'fix/230801-修改jackson解析方法' into release/2.9.5.2309.01
# Conflicts:
# src/com/engine/salary/service/impl/FormulaRunServiceImpl.java
|
2023-09-06 15:42:53 +08:00 |
|
sy
|
eb6fed2079
|
Merge remote-tracking branch 'remotes/origin/release/2.9.4.2308.02' into fix/230901-福利核算中处理核算结果逻辑中，查询sql分片
|
2023-09-06 10:17:41 +08:00 |
|
sy
|
d7b9485d18
|
薪酬系统-福利台账，核算数据中间表查询分片
|
2023-09-06 10:17:20 +08:00 |
|
钱涛
|
1451c4b192
|
定位解析异常
|
2023-09-06 10:14:52 +08:00 |
|
钱涛
|
8de418b28b
|
定位解析异常
|
2023-09-06 10:13:22 +08:00 |
|
sy
|
f6094cbc7a
|
薪酬系统-福利档案，非系统人员tab页列表
|
2023-09-06 10:04:58 +08:00 |
|
Harryxzy
|
6f2436d808
|
新建调薪调整返回数据，为null时不返回“null”
|
2023-09-04 16:38:18 +08:00 |
|
钱涛
|
0ac2fd248e
|
慢sql提醒
|
2023-08-31 16:22:02 +08:00 |
|
钱涛
|
2fad3c6c7c
|
Merge branch 'feature/慢sql检测' into release/2.9.4.2308.02
|
2023-08-31 15:46:29 +08:00 |
|
钱涛
|
283485929f
|
超时提醒
|
2023-08-31 15:31:34 +08:00 |
|
钱涛
|
feeb3d21f2
|
公式检测
|
2023-08-31 14:39:58 +08:00 |
|
sy
|
fac2bc21e0
|
Merge remote-tracking branch 'remotes/origin/feature/230802-ST数据库适配' into release/2.9.4.2308.02
|
2023-08-31 14:18:46 +08:00 |
|
sy
|
bc21cc7a2e
|
薪酬系统-福利档案，导入模板带出数据时，参考当前搜索条件
|
2023-08-31 14:18:00 +08:00 |
|
Harryxzy
|
f16f62304c
|
Merge branch 'feature/230901-自动同步结束发薪日期' into release/2.9.4.2308.02
|
2023-08-31 13:57:49 +08:00 |
|
Harryxzy
|
b90066e8b7
|
fixbug
|
2023-08-31 13:03:04 +08:00 |
|
Harryxzy
|
6ca1c6eae3
|
Merge branch 'fix/230802-薪资核算编辑时保留小数位数' into release/2.9.4.2308.02
|
2023-08-31 11:13:46 +08:00 |
|
Harryxzy
|
dbe659d81d
|
Merge branch 'fix/2309101-工资单模板给无分类项目重命名bug' into release/2.9.4.2308.02
|
2023-08-31 10:39:58 +08:00 |
|
Harryxzy
|
2934a88cc2
|
同步薪资项目至账套
|
2023-08-31 10:23:14 +08:00 |
|
sy
|
a23e62052c
|
Merge remote-tracking branch 'remotes/origin/feature/230802-福利档案-档案相关action' into release/2.9.4.2308.02
|
2023-08-31 09:34:39 +08:00 |
|
Harryxzy
|
190bbe0875
|
同步薪资项目至账套
|
2023-08-31 09:24:41 +08:00 |
|
Harryxzy
|
64f64c4f89
|
自动同步离职人员结束发薪日期
|
2023-08-30 15:34:54 +08:00 |
|
sy
|
bf48341655
|
薪酬系统-福利档案，全量增减员过滤掉非系统人员
|
2023-08-30 15:10:25 +08:00 |
|
Harryxzy
|
4467f57928
|
工资单模板新建时重命名无分类名字消失bug
|
2023-08-30 13:26:25 +08:00 |
|
Harryxzy
|
bd75ef8d3b
|
自动同步离职人员社保档案、薪资档案最后缴纳日期
|
2023-08-30 13:09:56 +08:00 |
|
Harryxzy
|
c2ae65ff79
|
Merge branch 'fix/230802-添加非系统人员时误删除taxagentEmp数据' into release/2.9.4.2308.02
|
2023-08-30 10:44:52 +08:00 |
|
Harryxzy
|
c1893f9152
|
自动同步结束发薪日期temp
|
2023-08-30 10:41:00 +08:00 |
|
sy
|
8966730267
|
Merge remote-tracking branch 'remotes/origin/fix/230802-函数中增加福利项基数信息' into release/2.9.4.2308.02
|
2023-08-30 10:27:51 +08:00 |
|
sy
|
92d33534a0
|
Merge remote-tracking branch 'remotes/origin/feature/230802-福利档案-档案相关action' into release/2.9.4.2308.02
|
2023-08-30 10:26:56 +08:00 |
|
sy
|
28fff1f519
|
薪酬系统-薪资档案，非系统人员导入模板带出数据中部门为null处理为空字符串
|
2023-08-29 11:46:06 +08:00 |
|
Harryxzy
|
bd1a6b7a9a
|
在个税扣缴义务人非系统人员添加人员时，会误删除正常人员范围在hrsa_tax_agent_emp中的数据
|
2023-08-28 22:22:00 +08:00 |
|
钱涛
|
c1db3883b0
|
核算时暴露日期解析异常
|
2023-08-27 20:10:31 +08:00 |
|
Harryxzy
|
e83db15bc7
|
薪资档案、薪资核算编辑前端控制保留位数
|
2023-08-25 15:09:12 +08:00 |
|
sy
|
d94ee07de6
|
薪酬系统-福利方案，处理合并冲突
|
2023-08-24 09:17:39 +08:00 |
|
sy
|
f925943b31
|
Merge remote-tracking branches 'remotes/origin/feature/230802-福利方案-修改方案明细接口' and 'remotes/origin/fix/230802-优化福利台账导出合计列' into feature/230802-福利档案-档案相关action
|
2023-08-24 09:15:48 +08:00 |
|
sy
|
a3b67ab091
|
薪酬系统-福利方案，福利方案明细数据修改接口，明细表更细sql优化
|
2023-08-23 18:39:02 +08:00 |
|
sy
|
770074ba23
|
薪酬系统-薪资核算，非系统人员查询问题修复
|
2023-08-23 17:48:52 +08:00 |
|
sy
|
2048e9c489
|
薪酬系统-福利档案，福利档案减员、增员action
|
2023-08-23 16:52:32 +08:00 |
|
sy
|
c94f1b24a4
|
薪酬系统-福利档案，新增和编辑福利档案action、福利档案导入逻辑优化（仅修改设置值的数据）
|
2023-08-22 14:47:48 +08:00 |
|
sy
|
5f9fbde35a
|
薪酬系统-福利方案，福利方案明细数据修改接口，更新明细修改时间
|
2023-08-21 16:48:17 +08:00 |
|
sy
|
299284872f
|
薪酬系统-福利方案，福利方案明细数据修改接口
|
2023-08-21 14:58:01 +08:00 |
|
sy
|
4ffca1872a
|
薪酬系统-福利台账，核算明细列表合计行导出
|
2023-08-18 17:58:36 +08:00 |
|
sy
|
4a7b04152b
|
薪酬系统-薪资核算，薪资项目函数增加福利基数信息
|
2023-08-18 13:30:42 +08:00 |
|
sy
|
f60eae5af2
|
薪酬系统-福利台账，列表导出取消对档案状态的过滤
|
2023-08-17 15:24:15 +08:00 |
|
sy
|
63023ae8e6
|
薪酬系统-福利档案、台账，档案增加分部字段、tab计数过滤非系统人员、补差取消部分字段展示
|
2023-08-17 11:31:38 +08:00 |
|
Harryxzy
|
bf555b5b32
|
修改jackson解析map的方法
|
2023-08-14 16:38:40 +08:00 |
|
Harryxzy
|
19cb2d9622
|
Merge branch 'feature/230703-薪资账套项目页面改造' into release/2.9.3.2308.01
|
2023-08-14 09:19:20 +08:00 |
|
Harryxzy
|
7ebb8d6618
|
Merge branch 'feature/230702-自定义工资项目展示名' into release/2.9.3.2308.01
|
2023-08-14 09:19:04 +08:00 |
|
sy
|
536465fbae
|
Merge remote-tracking branches 'remotes/origin/feature/230801-福利档案-同步非系统人员增量数据' and 'remotes/origin/fix/230801-福利台账-导入的年月格式校验逻辑优化' into release/2.9.3.2308.01
|
2023-08-09 18:08:40 +08:00 |
|
sy
|
9f021b6d5e
|
薪酬系统-福利档案，修复非系统人员增量数据造成的bug
|
2023-08-08 15:03:52 +08:00 |
|
Harryxzy
|
6a01f0d785
|
Merge branch 'release/2.9.2.2307.02' into feature/230702-自定义工资项目展示名
|
2023-08-08 11:42:41 +08:00 |
|
Harryxzy
|
fa7eb0ee60
|
Merge branch 'release/2.9.2.2307.02' into feature/230703-薪资账套项目页面改造
|
2023-08-08 11:06:06 +08:00 |
|
sy
|
9d0194acd3
|
薪酬系统-福利台账，优化福利台账补缴模板中账单月份和补缴月份校验逻辑
|
2023-08-07 16:46:17 +08:00 |
|
sy
|
95525d42d8
|
Merge remote-tracking branch 'remotes/origin/feature/230702-非系统人员导入功能' into release/2.9.3.2308.01
|
2023-08-04 16:55:56 +08:00 |
|
sy
|
14a944c60b
|
薪酬系统-非系统人员管理，非系统人员导入时，部门名称为null则置为空字符串
|
2023-08-04 16:55:19 +08:00 |
|
sy
|
d9caedbe5b
|
Merge remote-tracking branch 'remotes/origin/feature/230702-非系统人员导入功能' into release/2.9.3.2308.01
|
2023-08-04 16:34:16 +08:00 |