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

95 Commits

Author SHA1 Message Date
钱涛 791bc2ffca Merge branch 'release/2.9.9.2312.01' into release/个税版本 
# Conflicts:
#	src/com/engine/salary/service/SalaryArchiveService.java
#	src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
 2023-12-05 15:09:40 +08:00
Harryxzy df25f99544 薪资核算固定列头 2023-11-29 16:48:09 +08:00
钱涛 526c8f8514 Merge branch 'release/3.0.0.2311.01' into release/个税版本 2023-11-10 15:29:39 +08:00
钱涛 d86b00e5f7 清除加解密状态 2023-11-09 17:01:08 +08:00
钱涛 9ec0daa3f6 加密描述 2023-11-09 16:40:30 +08:00
钱涛 fdfeae9344 合并1101 2023-11-08 16:21:53 +08:00
钱涛 75717871d0 Merge branch 'release/3.0.0.2311.01' into release/个税版本 
# Conflicts:
#	src/com/engine/salary/service/SalaryEmployeeService.java
#	src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
#	src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
 2023-11-08 16:20:31 +08:00
钱涛 b9d119bcf0 修改关闭解密方法 2023-11-07 10:00:51 +08:00
钱涛 26bbc9c0ee Merge branch 'release/2.9.6.2310.01' into release/个税版本 
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
 2023-10-08 14:21:25 +08:00
钱涛 5241972151 工资单时效设置 2023-10-07 14:46:28 +08:00
钱涛 a7e8498b98 取消核算报表数据 2023-09-26 17:18:27 +08:00
钱涛 6b97efde4d 往期累计新增字段的加解密 2023-09-18 14:43:02 +08:00
钱涛 c29c032ef5 申报表加解密 2023-08-25 17:37:39 +08:00
钱涛 01b02531ce Merge branch 'feature/外部人员' into release/2.9.2.2307.02 
# Conflicts:
#	src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml
#	src/com/engine/salary/service/impl/SalarySendServiceImpl.java
#	src/com/engine/salary/sys/service/SalarySysConfService.java
#	src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
#	src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java
 2023-07-20 10:08:05 +08:00
钱涛 888938f150 系统设置接口 2023-07-13 11:33:58 +08:00
Harryxzy 820d15d06f 工资单确认反馈 2023-07-12 15:17:59 +08:00
Harryxzy 5dc2dadd46 工资单自动确认 2023-07-11 17:28:15 +08:00
Harryxzy be895829c2 工资单反馈 2023-07-11 15:29:13 +08:00
Harryxzy 467746f7df Merge branch 'release/2.9.1.2307.01' into feature/230701-工资单反馈 2023-07-10 11:12:03 +08:00
Harryxzy 584ebbc562 暂存 2023-07-10 11:11:52 +08:00
Harryxzy 0e2a6c8368 Merge branch 'feature/taxDeclarationWithdraw' into release/2.9.1.2307.01 
# Conflicts:
#	src/com/engine/salary/sys/constant/SalarySysConstant.java
#	src/com/engine/salary/sys/entity/vo/AppSettingVO.java
#	src/com/engine/salary/sys/service/SalarySysConfService.java
#	src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
#	src/com/engine/salary/web/SalarySystemConfigController.java
#	src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java
 2023-07-10 11:10:10 +08:00
Harryxzy e90bd66489 Merge branch 'feature/230701-删除档案' into release/2.9.1.2307.01 2023-07-10 10:09:38 +08:00
钱涛 82ab6c1e11 非系统算税功能 2023-07-04 09:32:12 +08:00
Harryxzy 18fb376054 个税申报撤回fix 2023-06-30 16:41:06 +08:00
Harryxzy 8cbc758131 删除档案开关bug 2023-06-30 11:40:59 +08:00
Harryxzy 1fa04f1515 个税申报撤回开关-2 2023-06-29 16:42:48 +08:00
Harryxzy 04592a58b4 Merge branch 'release/2.8.4.2306.02' into feature/taxDeclarationWithdraw 
# Conflicts:
#	src/com/engine/salary/sys/constant/SalarySysConstant.java
#	src/com/engine/salary/sys/service/SalarySysConfService.java
#	src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
#	src/com/engine/salary/web/SalarySystemConfigController.java
#	src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java
 2023-06-29 16:40:07 +08:00
Harryxzy ba85231656 个税申报撤回开关-1 2023-06-29 16:38:50 +08:00
Harryxzy 2735661b4a 删除薪资档案 2023-06-29 10:35:55 +08:00
钱涛 6f3593f44b Merge branch 'feature/短信验证码' into release/2.8.4.2306.02 
# Conflicts:
#	src/com/engine/salary/service/impl/SalarySendServiceImpl.java
#	src/com/engine/salary/sys/constant/SalarySysConstant.java
 2023-06-26 13:54:56 +08:00
Harryxzy 1c6cf5feab 核算人员匹配规则（是否包含停薪列表）暂存 2023-06-16 15:47:24 +08:00
Harryxzy 3096954628 核算人员匹配规则（是否包含停薪列表）暂存 2023-06-16 14:40:36 +08:00
钱涛 912c80c97f 验证方式 2023-06-14 16:15:05 +08:00
Harryxzy 1294e86c8c 导入自动锁定添加开关 2023-06-02 15:25:46 +08:00
钱涛 59a38954bc Merge branch 'feature/个人养老金' into release/2.7.3.2304.01 
# Conflicts:
#	src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java
 2023-04-13 09:35:29 +08:00
钱涛 a4a829d201 年终奖数据 2023-04-11 17:24:31 +08:00
sy 6bb5f8ddb4 Merge remote-tracking branch 'remotes/origin/feature/v4-closeEncryptSettingWithChange-0406' into release/2.7.3.2304.01 2023-04-11 10:10:59 +08:00
钱涛 bb76df3718 个人养老金 2023-04-04 17:29:56 +08:00
sy add7051759 薪酬系统, 适配金仓-个税申报单逻辑优化、薪资部分发放逻辑优化、删除initserviceimpl文件 2023-04-04 16:28:15 +08:00
sy 0427ec5ed4 薪酬系统, 关闭加密方法优化 2023-03-30 11:44:21 +08:00
钱涛 9b8e89bf9f 去除lang3 2023-03-03 14:55:26 +08:00
钱涛 affa437506 加密显示配置 2023-02-23 15:18:33 +08:00
钱涛 84e63d4d40 加密日志 2023-02-21 13:58:30 +08:00
钱涛 830304fabb 系统配置 2023-01-09 14:41:10 +08:00
Harryxzy 43511f7922 Merge branch 'feature/V3-backItem-1215' into release/2.4.2.2212.03 2022-12-21 16:39:55 +08:00
fcli beeadfc35c feat: 加解密处理 2022-12-14 14:55:57 +08:00
Harryxzy 4fa7f9a5e7 回算-加解密开关 2022-12-14 14:45:24 +08:00
fcli d3de862d11 feat: 加密统一,薪资项目&社保档案详情... 2022-12-13 17:14:27 +08:00
钱涛 8dc2ddc3c8 加密方法 2022-12-12 09:37:15 +08:00
Harryxzy 15749ecc10 Merge branch 'feature/V2-taxDeclarationSwitch-11-10' into release/2.1.3.2211.03 
# Conflicts:
#	src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
 2022-11-10 11:25:01 +08:00