sy
|
49502a2f70
|
薪酬系统-福利档案结构改造，通过福利档案人员状态枚举类设置档案基础信息的runStatus字段值
|
2022-10-10 11:27:08 +08:00 |
|
sy
|
a80c92c907
|
薪酬系统-福利档案结构改造,福利台账核算对于个税扣缴义务人的匹配源调整为福利档案基础信息表
|
2022-10-10 10:11:30 +08:00 |
|
sy
|
02d1822cff
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy
|
2022-10-10 09:53:16 +08:00 |
 钱涛
|
ed454da0f0
|
福利档案状态枚举
|
2022-10-10 09:49:22 +08:00 |
|
sy
|
9b1c6222ed
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy
|
2022-10-10 09:37:03 +08:00 |
|
sy
|
85d46938da
|
薪酬系统-福利档案导入改造，增加基础信息表数据插入逻辑
|
2022-10-10 09:36:34 +08:00 |
Harryxzy
|
7c358fe3a0
|
xzy-fix-薪资档案中默认人员范围
|
2022-10-09 17:51:30 +08:00 |
|
Harryxzy
|
8c4050fe73
|
xzy-fix-薪资账套人员状态传参问题
|
2022-10-09 15:20:04 +08:00 |
|
sy
|
7ac7d58a5f
|
薪酬系统-福利档案列表查询改造
|
2022-10-09 15:12:54 +08:00 |
|
Harryxzy
|
e3a2a52ab8
|
xzy-fix-薪资账套人员错误问题
|
2022-10-09 13:32:05 +08:00 |
|
sy
|
ad16c96910
|
薪酬系统-福利档案基础信息表实体和mapper
|
2022-10-09 09:22:37 +08:00 |
|
Harryxzy
|
b2b0abcaf5
|
xzy-fix-处理Employee_statuses历史数据
|
2022-10-08 17:21:38 +08:00 |
|
Harryxzy
|
6dcecfb1c1
|
xzy-fix-薪资账套
|
2022-10-08 16:00:08 +08:00 |
|
sy
|
7ffd295be0
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport
|
2022-10-08 09:14:54 +08:00 |
|
钱涛
|
521801849f
|
兼容5.7
|
2022-10-08 09:14:13 +08:00 |
|
sy
|
98a297ef27
|
薪酬系统-福利台账-正常缴纳导入模板数据未带出问题修复
|
2022-09-30 15:40:15 +08:00 |
|
sy
|
2f0090d3a0
|
薪酬系统-福利档案，福利档案按照工号查询无法实现模糊查询bug修复
|
2022-09-30 14:14:39 +08:00 |
|
sy
|
dad3197c3a
|
薪酬系统-福利档案，导入模板表头字段提示bug修复
|
2022-09-30 11:44:51 +08:00 |
|
sy
|
2725fc8444
|
薪酬系统-福利台账，线下对比导入取消表id自增，修改对比数据查询参数格式
|
2022-09-30 10:55:46 +08:00 |
|
sy
|
0cfd2fc081
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport
|
2022-09-29 17:32:22 +08:00 |
|
sy
|
1e476e06a5
|
薪酬系统-福利台账，线下对比结果列表导出v1
|
2022-09-29 17:32:04 +08:00 |
李栋
|
96684b8ea3
|
Merge branch 'feature-LeeD' into develop
|
2022-09-29 16:21:22 +08:00 |
|
李栋
|
35e75dbba0
|
薪资档案引用时不能删除
|
2022-09-29 16:21:02 +08:00 |
|
钱涛
|
5285e518d9
|
fix核算合计
|
2022-09-29 15:34:21 +08:00 |
|
sy
|
5f9d929865
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport
|
2022-09-29 15:11:31 +08:00 |
|
sy
|
a44a48450b
|
薪酬系统-福利台账，线下对比结果列表开发优化v1
|
2022-09-29 15:11:13 +08:00 |
|
sy
|
44e4afbf72
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport
# Conflicts:
# src/com/engine/salary/mapper/InsuranceExportMapper.java
# src/com/engine/salary/mapper/InsuranceExportMapper.xml
# src/com/engine/salary/service/impl/SIAccountServiceImpl.java
|
2022-09-29 11:29:17 +08:00 |
|
钱涛
|
c270ecac82
|
新建福利方案去除名字空格
|
2022-09-29 11:16:56 +08:00 |
|
sy
|
cec887a214
|
薪酬系统-福利台账，线下对比结果列表开发
|
2022-09-29 11:13:49 +08:00 |
|
钱涛
|
919d08a496
|
修复工资单查询
|
2022-09-29 10:28:46 +08:00 |
|
钱涛
|
92b2774ebf
|
三个数据采集模块删除无效的查询条件
|
2022-09-29 10:03:51 +08:00 |
|
钱涛
|
346445c70d
|
核算合计功能
|
2022-09-28 16:59:51 +08:00 |
|
钱涛
|
e48f576617
|
显示应用设置接口
|
2022-09-28 10:08:51 +08:00 |
|
钱涛
|
dfeb3fc5e4
|
修复薪资档案导出全部
|
2022-09-28 09:26:26 +08:00 |
|
钱涛
|
321b6ef0b2
|
修复重新核算会删除申报表
|
2022-09-27 18:20:40 +08:00 |
|
sy
|
1a60f36778
|
薪酬系统-福利台账，线下对比excel数据在入库前进行部分字段加密处理
|
2022-09-27 17:54:24 +08:00 |
|
钱涛
|
23a1396c12
|
核算列表求和
|
2022-09-27 17:43:43 +08:00 |
|
sy
|
78ce712116
|
薪酬系统-福利台账，线下对比excel数据导入功能
|
2022-09-27 17:36:06 +08:00 |
|
钱涛
|
1d635f1423
|
核算列表求和
|
2022-09-27 15:47:13 +08:00 |
|
钱涛
|
72c1d2b463
|
fix排序
|
2022-09-27 14:28:21 +08:00 |
|
sy
|
bd3e44442d
|
薪酬系统-福利台账，正常缴纳导出添加工号信息
|
2022-09-27 11:39:57 +08:00 |
|
钱涛
|
08ac0e8b84
|
fix离职日期
|
2022-09-27 10:57:02 +08:00 |
|
sy
|
314dc8803c
|
薪酬系统-福利台账，正常缴纳线下对比模板下载功能
|
2022-09-27 10:55:57 +08:00 |
|
钱涛
|
66a39a07a3
|
Merge branch 'feature/order' into develop
# Conflicts:
# src/com/engine/salary/biz/SIAccountBiz.java
|
2022-09-27 10:25:12 +08:00 |
|
钱涛
|
e2db30c816
|
排序
|
2022-09-27 10:19:09 +08:00 |
|
钱涛
|
6e726366ad
|
排序
|
2022-09-26 18:51:17 +08:00 |
|
sy
|
0a900905bd
|
薪酬系统-数据采集-累计专项附加扣除、往期累计情况、考勤引用三处导入模板均增加基本信息的带出
|
2022-09-26 13:46:43 +08:00 |
|
钱涛
|
55945a9186
|
薪资档案排序
|
2022-09-26 13:45:32 +08:00 |
|
sy
|
ccd0d5a358
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport
|
2022-09-23 16:09:03 +08:00 |
|
sy
|
e6c2dd502c
|
薪酬系统-数据采集-其他免税扣除导入模板带出数据重复bug修复
|
2022-09-23 16:08:41 +08:00 |