qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,233 Commits 293 Branches 39 Tags 49 MiB
Commit Graph

265 Commits

Author SHA1 Message Date
fcli 92a6512dc8 feat: 专项附加扣除模块,去除月份，添加普通用户登录查看本人记录功能 2022-11-09 10:40:28 +08:00
fcli fafc157e63 feat: 专项附加扣除模块 2022-11-09 10:40:19 +08:00
钱涛 457fe51239 处理薪资档案重复数据 2022-11-07 17:05:50 +08:00
钱涛 2da0455c46 修复薪资档案个税扣缴义务人不显示的问题 
处理历史数据改为异步
 2022-11-07 15:11:24 +08:00
fcli 8873224123 Merge remote-tracking branch 'origin/release/2.1.2.2211.01' into release/2.1.2.2211.01 2022-11-02 17:33:26 +08:00
fcli 11f0a2c418 Merge branch 'fix/089' into release/2.1.2.2211.01 2022-11-02 17:32:49 +08:00
钱涛 28be5f8e41 Merge branch 'hotfix/工资单发放合并计税bug' into release/2.1.2.2211.01 2022-11-02 17:22:19 +08:00
钱涛 73c24bcac5 工资单发放合并计税bug 2022-11-02 17:20:34 +08:00
Harryxzy 5d97954e48 往期累计情况一键清空和删除所选 2022-10-31 19:21:13 +08:00
Harryxzy e8ac395300 fix-专项附加扣除taxAgentId为空 2022-10-31 16:04:06 +08:00
Harryxzy 317fb5e8ac 数据采集-编辑前查看功能 2022-10-31 14:50:54 +08:00
Harryxzy d525c59d6d Merge branch 'feature/V2-editDataCollection-11-03-tempDev' into feature/V2-editDataCollection-11-03 2022-10-28 16:38:17 +08:00
Harryxzy 09d85bdab3 考勤引用=编辑 2022-10-28 16:15:51 +08:00
Harryxzy 1f29ac67eb 累计、其他免税、往期 新增、删除、一键清空、编辑功能 2022-10-28 14:08:27 +08:00
fcli 31982fc1db fix: 工资单发放页高级搜索功能不生效 2022-10-28 09:39:31 +08:00
Harryxzy ddd0c49cdd 其他免税扣除-新增、删除所选、一键清空功能 2022-10-27 18:02:05 +08:00
钱涛 104213fc04 1、提示优化 
2、导入模板
3、定薪流程
 2022-10-27 15:17:22 +08:00
Harryxzy a406eed4b9 累计专项附加扣除-新增、删除所选、一键清空功能 2022-10-27 13:59:11 +08:00
Harryxzy c0bb94bf71 editDataCollection-2 2022-10-26 18:35:23 +08:00
钱涛 7a817af154 档案导入 2022-10-26 13:46:36 +08:00
钱涛 1f48539e1c 删除待定薪代办 
删除待停薪代办
 2022-10-18 16:44:31 +08:00
钱涛 4b37775f78 档案发薪设置 2022-10-18 09:43:58 +08:00
钱涛 77fc944491 获取保存档案配置表单 
保存档案配置
 2022-10-14 16:18:55 +08:00
钱涛 0e05185599 操作接口 2022-10-13 16:24:59 +08:00
钱涛 68076fc724 fix sqlserver增量数据空 2022-10-13 14:57:52 +08:00
李栋 708a947449 薪资档案加密设置加进度 2022-10-12 14:24:01 +08:00
钱涛 ab575db152 Merge branch 'develop' into feature/archive 2022-10-10 17:36:29 +08:00
钱涛 9781b67ddb Merge branch 'develop' into feature/archive 2022-10-10 15:41:31 +08:00
钱涛 816885609d 薪资列表 2022-10-10 15:15:23 +08:00
钱涛 41203342d0 薪资列表 2022-10-10 14:58:29 +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
Harryxzy b2b0abcaf5 xzy-fix-处理Employee_statuses历史数据 2022-10-08 17:21:38 +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
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
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
钱涛 e48f576617 显示应用设置接口 2022-09-28 10:08:51 +08:00
钱涛 23a1396c12 核算列表求和 2022-09-27 17:43:43 +08:00
钱涛 1d635f1423 核算列表求和 2022-09-27 15:47:13 +08:00
钱涛 1573fc5bcf 人员状态枚举适配 2022-09-22 11:42:02 +08:00
钱涛 b812454cd3 人员校验规则 2022-09-22 10:10:18 +08:00
钱涛 90c18ec201 定薪 2022-09-20 18:02:45 +08:00
Harryxzy 183e63140a xzy-月度绩效环比增加人员导出功能 2022-09-20 16:18:43 +08:00
钱涛 f678aa46d6 薪资档案排序 2022-09-19 18:21:34 +08:00
钱涛 bc1e874a1c Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
 2022-09-19 16:45:10 +08:00