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

112 Commits

Author SHA1 Message Date
钱涛 3a79ed9574 Merge branch 'release/2.11.2.2403.01' into release/个税版本 
# Conflicts:
#	src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
#	src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java
#	src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
 2024-03-15 15:44:15 +08:00
Harryxzy b17d2b70de Merge branch 'feature/240301_阅后即焚' into release/3.0.0.2403.01 2024-03-15 09:19:03 +08:00
Harryxzy 8543d70a66 社保加解密 2024-03-14 11:07:01 +08:00
Harryxzy 26a3199b1e 社保线下对比加解密 2024-03-13 17:58:24 +08:00
Harryxzy 78d4f5e2ae 阅后即焚 2024-03-11 10:35:56 +08:00
钱涛 5a9d45f92b Merge branch 'release/2.11.1.2402.01' into release/个税版本 
# Conflicts:
#	resource/WEB-INF/prop/hrmSalaryCustom.properties
#	src/com/engine/salary/entity/datacollection/AddUpSituation.java
#	src/com/engine/salary/entity/datacollection/po/SpecialAddDeductionPO.java
#	src/com/engine/salary/entity/salarysob/po/SalarySobPO.java
#	src/com/engine/salary/formlua/entity/parameter/ExcelFuncs.java
#	src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
#	src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
#	src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
#	src/com/engine/salary/service/impl/SalarySendServiceImpl.java
#	src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
#	src/com/engine/salary/service/impl/SalarySobServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java
#	src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java
#	src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
#	src/com/engine/salary/util/page/SalaryPageUtil.java
 2024-03-06 15:54:07 +08:00
Harryxzy 6c2d20a5a7 Merge branch 'feature/240101_我的薪资福利显示页签支持配置' into release/2.11.1.2402.01 2024-03-05 14:24:19 +08:00
Harryxzy a39806bb92 我的薪资福利显示页签支持配置 2024-02-23 11:04:14 +08:00
钱涛 53806d9262 Merge branch 'release/2.10.1.2401.01' into release/个税版本 
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
#	src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
#	src/com/engine/salary/util/excel/ExcelUtil.java
 2024-02-21 15:28:33 +08:00
Harryxzy b4f36ab101 Merge branch 'feature/240102_工资单确认和反馈按钮分开' into release/2.10.1.2401.01 2024-02-20 09:51:00 +08:00
Harryxzy e75cfae309 Merge branch 'feature/240101_工资单反馈区分pc和移动端' into release/2.10.1.2401.01 2024-01-31 16:13:27 +08:00
Harryxzy 2331ef354e 工资单确认和反馈按钮分开 2024-01-30 15:53:55 +08:00
钱涛 6fc8d8fdee 去除达梦驱动 2024-01-25 11:38:38 +08:00
Harryxzy 71f90882d3 工资单反馈区分pc和移动端 2024-01-23 16:45:09 +08:00
钱涛 4846cfcf18 Merge branch 'release/2.9.10.2312.02' into release/个税版本 
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
 2024-01-17 14:14:32 +08:00
sy 3b761341fc 薪酬系统-福利档案，档案导入功能优化，增加基数自动调整逻辑 2024-01-10 11:20:36 +08:00
sy 451c9fb07b 薪酬系统-福利档案，档案明细获取逻辑改造，根据应用设置中的区分开关，判定后将公司的福利基数信息单独区分返回 2023-12-06 09:51:07 +08:00
钱涛 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