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

1234 Commits

Author SHA1 Message Date
钱涛 c2371ffcb3 取消缓冲时间 2022-11-24 10:30:00 +08:00
钱涛 c5aa1aded7 缓存类 2022-11-23 18:36:33 +08:00
钱涛 2ab7049fa0 单个核算 2022-11-23 18:30:53 +08:00
钱涛 5221c22b5c 优化公式选择档案项目和薪资项目 2022-11-23 17:02:17 +08:00
钱涛 6405610456 计划任务日志 2022-11-23 15:24:29 +08:00
钱涛 829375d314 同步人员范围定时任务 2022-11-22 16:14:54 +08:00
钱涛 1307f485eb 同步人员范围 2022-11-22 15:53:05 +08:00
钱涛 264edf1bf2 同步人员范围 2022-11-22 15:37:07 +08:00
钱涛 9a9a9cdaf3 Merge branch 'feature/加锁221117' into release/2.2.2.2211.03 2022-11-17 19:05:55 +08:00
Harryxzy 188096f931 Merge branch 'fix/salaryArchiveNoDataNEW' into release/2.2.2.2211.03 2022-11-17 19:04:58 +08:00
钱涛 cc711bc411 修复加锁顺序 2022-11-17 19:04:42 +08:00
Harryxzy f19e4c2569 fix发薪日期为一个月最后一天时，薪资档案不显示NEW 2022-11-17 19:03:59 +08:00
钱涛 d07ded883f 修复加锁顺序 2022-11-17 18:53:22 +08:00
Harryxzy 11c4b1e4f7 Merge branch 'feature/V3-editSalaryAdjustment-11-17' into release/2.2.2.2211.03 2022-11-17 18:35:12 +08:00
钱涛 4779cc861e 相同itemid 2022-11-17 17:04:14 +08:00
Harryxzy f762fd7030 调薪编辑、删除 放开校验限制 2022-11-17 16:51:07 +08:00
fcli e6eaf96bcd feat: 沿用上月增加校验 2022-11-17 15:39:39 +08:00
钱涛 10ffe88810 核算锁定 2022-11-17 15:17:49 +08:00
fcli b03e5efbcf feat: 沿用上月增加校验 2022-11-17 15:13:59 +08:00
fcli 0aa59757c5 feat: 沿用上月增加校验 2022-11-17 15:13:55 +08:00
fcli 0f51d44cd4 Merge remote-tracking branch 'origin/release/2.2.2.2211.03' into release/2.2.2.2211.03 2022-11-17 14:43:59 +08:00
fcli b3cd118c21 feat: 自动累计功能 2022-11-17 14:28:15 +08:00
fcli 5743fa2162 feat: 其他附加扣除沿用上月功能完成 2022-11-17 14:28:10 +08:00
Harryxzy 2bc1453ad8 Merge branch 'feature/V3-editSalaryAdjustment-11-17' into release/2.2.2.2211.03 2022-11-17 14:28:07 +08:00
Harryxzy 1eaef7fcd4 fix分页时，数据不显示 2022-11-17 09:53:40 +08:00
钱涛 271daf29be 批量锁定功能 2022-11-17 09:28:40 +08:00
Harryxzy 9f17c6e99a fixBUG 2022-11-16 17:22:22 +08:00
Harryxzy 1bcb02d2e0 fix薪资账套关闭状态下无法删除bug 2022-11-16 14:22:25 +08:00
Harryxzy a3705c67a4 修改查看编辑调薪 2022-11-15 11:37:55 +08:00
Harryxzy 323c1ec0e0 查看编辑调薪 2022-11-15 09:34:58 +08:00
Harryxzy 9dc6c61ed2 编辑调薪 2022-11-14 21:03:24 +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
Harryxzy c786dc2d14 个税申报功能-重启时间和薪资核算创建时间比较 2022-11-10 11:11:41 +08:00
Harryxzy 9dab99d3c5 个税申报功能-fix重启后回到开启 2022-11-10 10:28:03 +08:00
Harryxzy 1abd3d47f2 个税申报功能-重启状态前端展示开启 2022-11-10 10:14:29 +08:00
Harryxzy 3d4be3265e 个税申报功能-重启 2022-11-10 09:46:30 +08:00
fcli 459f7e5053 Merge branch 'feature/SpecialAddUpMerge' into release/2.1.3.2211.03 2022-11-10 09:33:22 +08:00
钱涛 f5622df8fe Merge branch 'feature/report1110' into release/2.1.3.2211.03 
# Conflicts:
#	src/com/engine/salary/sys/entity/param/AppSettingSaveParam.java
#	src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
 2022-11-09 19:03:14 +08:00
fcli 63ee9c9b8e fix: 一键累计添加日期与校验 2022-11-09 18:57:28 +08:00
sy 23e7065403 Merge branch 'feature/v2-allAddLimit-1110' into release/2.1.3.2211.03 2022-11-09 17:42:15 +08:00
钱涛 b55c339bb0 获取上月数据 2022-11-09 17:26:51 +08:00
fcli 815e37e50b fix: 一键累计添加日期与校验 2022-11-09 16:55:00 +08:00
Harryxzy 02a6ab11ce Merge branch 'fix/CollectionDataLongCompare' into release/2.1.3.2211.03 
# Conflicts:
#	src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
 2022-11-09 16:44:49 +08:00
Harryxzy 095a0665b8 Merge branch 'feature/V2-taxDeclarationSwitch-11-10' into release/2.1.3.2211.03 2022-11-09 16:12:35 +08:00
钱涛 e63c72f51e 逆向解密 2022-11-09 15:47:09 +08:00
fcli bf75c3831f fix: 一键累计添加日期 2022-11-09 15:39:00 +08:00
Harryxzy e2e383bd79 数据采集-Fix数据采集Long类型判断 2022-11-09 15:36:07 +08:00
fcli 07f9976d63 fix: 加解密处理 2022-11-09 14:32:04 +08:00
fcli 0b26eeec7e fix: 加解密处理 2022-11-09 14:32:00 +08:00
sy 2c691d1838 薪酬系统-福利档案增员问题修复 2022-11-09 11:25:46 +08:00