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

1777 Commits

Author SHA1 Message Date
钱涛 4aa66ea587 外籍人员更新 2024-04-11 18:57:56 +08:00
钱涛 a2a18245bd 处理缴款反馈 2024-04-11 10:59:36 +08:00
钱涛 917c9f87c1 个税申报 2024-04-10 09:18:05 +08:00
钱涛 d1b6a78238 人员报送 2024-04-10 09:08:24 +08:00
钱涛 e994a61037 申报状态拆分 2024-04-08 14:40:47 +08:00
钱涛 be85c47a68 申报表状态更新主记录 2024-04-07 15:59:36 +08:00
钱涛 fbc9c1a187 申报表状态更新主记录 2024-04-07 11:29:09 +08:00
钱涛 7f965c41c9 申报表状态更新主记录 2024-04-02 15:50:33 +08:00
钱涛 57a0030cc8 处理外籍人员 2024-04-01 17:07:36 +08:00
钱涛 8e2ff975a9 暂存 2024-03-29 14:01:12 +08:00
钱涛 2a692b13b4 外籍人员v1 2024-03-29 10:44:55 +08:00
钱涛 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 69d94731a0 Merge branch 'feature/240301_阅后即焚' into release/3.0.0.2403.01 2024-03-15 10:15:12 +08:00
Harryxzy 08b2c240ab 提示修复 2024-03-15 10:14:59 +08:00
Harryxzy 0f8b16d473 Merge branch 'feature/240301_同步起始缴纳月、起始发薪日期' into release/3.0.0.2403.01 2024-03-15 09:19:17 +08:00
Harryxzy b17d2b70de Merge branch 'feature/240301_阅后即焚' into release/3.0.0.2403.01 2024-03-15 09:19:03 +08:00
钱涛 0a7334ddef 考勤导入，多语言 2024-03-14 18:16:20 +08:00
钱涛 29e81e03c2 优化公式不显示未启用的考勤字段 2024-03-14 16:08:16 +08:00
钱涛 417c9f703d 下载模板时带出数据 2024-03-14 15:28:14 +08:00
Harryxzy 0c42e1cb35 同步社保、薪资档案起始发薪日为入职日定时任务 2024-03-14 14:05:36 +08:00
钱涛 a70a2061a5 部门改多选 2024-03-14 11:19:02 +08:00
钱涛 1d8a1b91c0 解决冲突 2024-03-12 18:58:36 +08:00
钱涛 452d7bc57c Merge branch 'release/3.0.0.2403.01' into release/个税版本 
# Conflicts:
#	src/com/engine/salary/entity/datacollection/AddUpSituation.java
#	src/com/engine/salary/entity/salarysob/po/SalarySobPO.java
#	src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
#	src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
#	src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
#	src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java
#	src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
 2024-03-12 18:56:12 +08:00
Harryxzy 43c57cb10b 阅后即焚功能 2024-03-12 16:17:24 +08:00
Harryxzy b5afaa54df Merge branch 'release/3.0.0.2403.01' into feature/240301_阅后即焚 2024-03-12 15:13:34 +08:00
Harryxzy af57e8ecf4 Merge remote-tracking branch 'origin/release/3.0.0.2403.01' into release/3.0.0.2403.01 2024-03-12 14:58:21 +08:00
钱涛 836947725f 切换了elog位置 2024-03-12 14:34:44 +08:00
Harryxzy 83624be06e Merge branch 'fix/240301_薪资核算、社保台账导入提示缺失' into release/3.0.0.2403.01 2024-03-12 14:26:42 +08:00
Harryxzy afb4bfd7ad 修复bug： 
1、薪资核算结果导入提示缺失
2、社保福利台账导入操作日志导致报错
 2024-03-11 17:23:20 +08:00
钱涛 4b823ccca7 国际化注解 2024-03-11 16:50:47 +08:00
Harryxzy 78d4f5e2ae 阅后即焚 2024-03-11 10:35:56 +08:00
Harryxzy a7b3b7578f 增加个税申报表日志 2024-03-08 16:33:34 +08:00
钱涛 ddc9188cd9 只获取正常且报送成功的 2024-03-08 15:09:42 +08:00
Harryxzy 6aef2856e8 个税日志 2024-03-08 11:14:00 +08:00
Harryxzy d890ab5a84 Merge remote-tracking branch 'origin/release/个税版本' into release/个税版本 2024-03-08 09:26:57 +08:00
钱涛 8516a23bba 修改人员报送刷新逻辑 
刷新人员会集成上月所有人员
 2024-03-07 21:12:09 +08:00
钱涛 72861b9a93 Merge branch 'release/3.0.0.2403.01' into release/个税版本 2024-03-07 16:57:03 +08:00
Harryxzy 0f82b8ce10 Merge branch 'feature/操作日志组件' into release/2.11.1.2402.01 2024-03-07 14:23:46 +08:00
Harryxzy 17428c621e 非系统人员范围操作日志 2024-03-07 14:23:12 +08:00
Harryxzy a4f4c8c5a4 Merge remote-tracking branch 'origin/release/个税版本' into release/个税版本 2024-03-07 11:14:43 +08:00
钱涛 e851944e8f 优化薪资账套项目保存逻辑 2024-03-07 11:11:24 +08:00
钱涛 6d4993f4ff Merge branch 'release/2.11.1.2402.01' into release/个税版本 2024-03-07 10:45:36 +08:00
钱涛 3b1edddf00 优化薪资账套项目保存逻辑 2024-03-07 10:21:06 +08:00
Harryxzy 381c705cf8 人员信息报送、个税申报表日志 2024-03-07 09:29:59 +08:00
钱涛 4196a8c596 合并冲突 2024-03-06 16:05:55 +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 20d7266db9 Merge branch 'feature/240201_社保福利台账导入字段缓存' into release/2.11.1.2402.01 
# Conflicts:
#	src/com/engine/salary/service/impl/SIAccountServiceImpl.java
 2024-03-06 13:50:56 +08:00
Harryxzy 0ac291d83d Merge branch 'feature/操作日志组件' into release/2.11.1.2402.01 2024-03-06 09:23:21 +08:00
Harryxzy 8984369343 薪资档案、社保档案查看日志 2024-03-05 15:15:20 +08:00
Harryxzy 6c2d20a5a7 Merge branch 'feature/240101_我的薪资福利显示页签支持配置' into release/2.11.1.2402.01 2024-03-05 14:24:19 +08:00