李栋
|
dea9fffe7e
|
Merge branch 'dev-LeeD' into develop
|
2022-10-10 17:34:37 +08:00 |
|
李栋
|
e384c6c1c3
|
薪资档案加密设置更新
|
2022-10-10 17:29:36 +08:00 |
|
李栋
|
4a9a3bcd83
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-10-10 17:16:00 +08:00 |
|
李栋
|
f8d151e639
|
薪资档案加密设置更新
|
2022-10-10 17:15:20 +08:00 |
sy
|
a7b47a8bfe
|
薪酬系统-福利档案结构改造，档案列表导出增加runstatus条件、并将导入和历史数据生成的福利档案基础信息的默认runStatus置为2
|
2022-10-10 17:11:44 +08:00 |
 钱涛
|
2de432dc03
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-10-10 17:08:28 +08:00 |
|
钱涛
|
212631c9e5
|
Merge branch 'hotfix-1010' into develop
|
2022-10-10 17:08:22 +08:00 |
|
钱涛
|
c5870f17a2
|
处理考勤值为空
|
2022-10-10 17:07:51 +08:00 |
|
sy
|
b24c08474c
|
薪酬系统-福利档案结构改造，档案列表接口入参将runStatus调整为runStatuses，并修改对应逻辑
|
2022-10-10 16:58:43 +08:00 |
|
李栋
|
4b30bca5d1
|
薪资档案加密设置更新
|
2022-10-10 16:44:17 +08:00 |
|
李栋
|
a9c0168a69
|
Merge branch 'develop' into dev-LeeD
|
2022-10-10 16:43:00 +08:00 |
Harryxzy
|
f217867969
|
xzy-fix-salarysobutil
|
2022-10-10 16:41:01 +08:00 |
|
钱涛
|
9781b67ddb
|
Merge branch 'develop' into feature/archive
|
2022-10-10 15:41:31 +08:00 |
|
钱涛
|
824c3ca565
|
薪资列表
|
2022-10-10 15:40:51 +08:00 |
|
钱涛
|
816885609d
|
薪资列表
|
2022-10-10 15:15:23 +08:00 |
|
钱涛
|
41203342d0
|
薪资列表
|
2022-10-10 14:58:29 +08:00 |
|
李栋
|
5a613183d7
|
Merge branch 'develop' into dev-LeeD
|
2022-10-10 14:55:46 +08:00 |
|
李栋
|
bf494588f7
|
薪资档案加密设置更新
|
2022-10-10 14:55:36 +08:00 |
|
sy
|
ed00d3fe89
|
薪酬系统-福利档案结构改造，福利台账核算中的补缴人元添加时判断是否已存在福利档案的数据源调整为福利档案基础信息表
|
2022-10-10 14:20:02 +08:00 |
|
sy
|
d6c6f446a9
|
薪酬系统-福利档案结构改造，恢复社保、公积金、其他福利档案表在档案导入时的个税扣缴义务人设置逻辑
|
2022-10-10 11:49:18 +08:00 |
|
sy
|
49502a2f70
|
薪酬系统-福利档案结构改造，通过福利档案人员状态枚举类设置档案基础信息的runStatus字段值
|
2022-10-10 11:27:08 +08:00 |
|
Harryxzy
|
5c4380cbe0
|
xzy-fix-薪资档案中人员范围更新时bug
|
2022-10-10 10:53:51 +08:00 |
|
sy
|
a80c92c907
|
薪酬系统-福利档案结构改造,福利台账核算对于个税扣缴义务人的匹配源调整为福利档案基础信息表
|
2022-10-10 10:11:30 +08:00 |
|
李栋
|
f0b2c73cb6
|
Merge branch 'develop' into dev-LeeD
|
2022-10-10 10:01:09 +08:00 |
|
李栋
|
4f4535778e
|
薪资档案加密设置
|
2022-10-10 10:00:59 +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 |
|
钱涛
|
5431ed9506
|
历史数据处理
|
2022-10-10 09:47:09 +08:00 |
|
李栋
|
c92f4f0b28
|
Merge branch 'develop' into dev-LeeD
|
2022-10-10 09:44:03 +08:00 |
|
李栋
|
60396e90a3
|
薪资档案加密设置
|
2022-10-10 09:43:57 +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 |
|
钱涛
|
1f0bf061dd
|
历史数据处理
|
2022-10-09 10:55:35 +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 |
|
钱涛
|
4a20105260
|
Merge branch 'develop' into feature/archive
|
2022-10-08 11:42:54 +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 |
|
钱涛
|
f8bb262906
|
档案
|
2022-09-29 09:32:29 +08:00 |
|
钱涛
|
d20ebb5a2a
|
Merge branch 'develop' into feature/archive
|
2022-09-28 17:19:54 +08:00 |
|
钱涛
|
346445c70d
|
核算合计功能
|
2022-09-28 16:59:51 +08:00 |
|
钱涛
|
e0d68d6417
|
档案状态
|
2022-09-28 15:11:15 +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 |
|
sy
|
2d11bad723
|
薪酬系统-社保福利台账-核算-补缴项删除功能bug修复
|
2022-09-23 16:07:10 +08:00 |
|
sy
|
d38a50cc56
|
薪酬系统-社保福利台账-核算-补缴人员新建，添加人员是否已有社保档案校验
|
2022-09-23 11:37:56 +08:00 |
|
Harryxzy
|
600cb3c37f
|
xzy-fix-社保福利台账添加补缴时核算人数错误问题
|
2022-09-23 11:37:24 +08:00 |
|
Harryxzy
|
df15afc29e
|
xzy-fix-社保福利台账总览中人数计算0.0问题
|
2022-09-22 17:39:32 +08:00 |
|
钱涛
|
31317fe8ac
|
福利台账列表人数统计
|
2022-09-22 17:01:21 +08:00 |
|
钱涛
|
89893288e9
|
补缴未设置档案产生的bug
|
2022-09-22 16:48:59 +08:00 |
|
Harryxzy
|
8dc2db8729
|
xzy-fix-社保福利台账人数核算
|
2022-09-22 16:14:42 +08:00 |
|
钱涛
|
6717a8235a
|
我的薪资福利翻页问题
|
2022-09-22 16:04:48 +08:00 |
|
钱涛
|
6ee777ebb5
|
fix线下对比翻页问题
|
2022-09-22 15:31:28 +08:00 |
|
sy
|
1e9ad0727e
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport
|
2022-09-22 14:49:30 +08:00 |
|
sy
|
3452f9ab96
|
薪酬系统-社保福利台账-核算-删除功能优化
|
2022-09-22 14:49:12 +08:00 |
|
钱涛
|
68142b4bbb
|
补缴必填校验
|
2022-09-22 14:25:50 +08:00 |
|
sy
|
83d5533322
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport
|
2022-09-22 14:01:12 +08:00 |
|
sy
|
e75c7eefab
|
薪酬系统-社保福利档案-高级搜索工号搜索不生效bug修复
|
2022-09-22 13:59:55 +08:00 |
|
钱涛
|
7e2463cf10
|
人员状态枚举适配
|
2022-09-22 11:54:10 +08:00 |
|
钱涛
|
1573fc5bcf
|
人员状态枚举适配
|
2022-09-22 11:42:02 +08:00 |
|
sy
|
f10a320a62
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport
|
2022-09-22 11:15:12 +08:00 |
|
sy
|
49e3b77995
|
薪酬系统-薪资档案-初始化导入模板表头属性优化
|
2022-09-22 10:25:31 +08:00 |
|
钱涛
|
b812454cd3
|
人员校验规则
|
2022-09-22 10:10:18 +08:00 |