Harryxzy
|
2b6b1ef2c4
|
Merge branch 'custom/鲁控数字' into feature/231202-批量编辑
|
2023-12-11 11:36:59 +08:00 |
|
Harryxzy
|
419baeb8cd
|
鲁控数字
|
2023-12-06 16:05:08 +08:00 |
sy
|
9876bc49cf
|
薪酬系统-福利核算，对于处于在缴员工列表，但是不在起始缴纳月和最后缴纳月区间的核算月的人员，不生成核算记录
|
2023-11-22 16:47:36 +08:00 |
|
sy
|
c9b279049d
|
薪酬系统-福利台账，福利核算出现异常时，优化核算进度获取逻辑
|
2023-11-21 14:40:30 +08:00 |
 钱涛
|
39520346dc
|
解密
|
2023-10-09 14:17:15 +08:00 |
|
sy
|
26e9fc90e1
|
薪酬系统-福利台账，修复未设置基数情况下存在的核算失败问题
|
2023-10-08 11:12:16 +08:00 |
|
sy
|
3826e89a72
|
薪酬系统-福利台账，福利核算逻辑优化，支持未设置基数，仅设置固定值的福利档案的核算
|
2023-09-15 15:38:20 +08:00 |
|
sy
|
3e7180a25e
|
Merge remote-tracking branch 'remotes/origin/feature/230901-福利档案-非系统人员tab' into feature/230901-福利台账-调差，支持一个人存在多个调差记录
|
2023-09-08 16:57:32 +08:00 |
|
sy
|
d7b9485d18
|
薪酬系统-福利台账，核算数据中间表查询分片
|
2023-09-06 10:17:20 +08:00 |
|
sy
|
f6094cbc7a
|
薪酬系统-福利档案，非系统人员tab页列表
|
2023-09-06 10:04:58 +08:00 |
|
sy
|
c7fe4fee23
|
Merge branches 'feature/230701-社保福利-核算记录的校验' and 'feature/230701-薪资核算-导出功能可选择字段导出' into release/2.9.2.2307.02
|
2023-07-20 10:19:40 +08:00 |
|
钱涛
|
89ecf0984d
|
fix外部人员
|
2023-07-12 09:45:00 +08:00 |
|
sy
|
47dc9e35bd
|
薪酬系统-福利台账，已归档状态下重新核算按钮增加是否被薪资核算引用校验逻辑
|
2023-07-11 17:56:45 +08:00 |
|
钱涛
|
aec6918c12
|
Merge branch 'release/2.9.1.2307.01' into feature/外部人员
# Conflicts:
# src/com/engine/salary/biz/EmployBiz.java
# src/com/engine/salary/biz/SIAccountBiz.java
# src/com/engine/salary/entity/salaryBill/dto/SalarySendDetailListDTO.java
# src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java
# src/com/engine/salary/mapper/archive/SalaryArchiveMapper.java
# src/com/engine/salary/service/SalaryEmployeeService.java
# src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
# src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
# src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java
# src/com/engine/salary/service/impl/SIAccountServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
# src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
# src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
# src/com/engine/salary/service/impl/SalarySendRangeServiceImpl.java
# src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java
# src/com/engine/salary/web/SalarySobController.java
# src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
# src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
# src/com/engine/salary/wrapper/SalarySendWrapper.java
# src/com/engine/salary/wrapper/TaxAgentSubAdminWrapper.java
# src/com/engine/salary/wrapper/TaxDeclarationWrapper.java
|
2023-07-11 16:08:15 +08:00 |
|
Harryxzy
|
6850c050b8
|
薪资核算人员去除 停薪_来自待定薪
|
2023-06-19 09:16:49 +08:00 |
|
Harryxzy
|
3096954628
|
核算人员匹配规则（是否包含停薪列表）暂存
|
2023-06-16 14:40:36 +08:00 |
|
钱涛
|
993db67601
|
公共进度条功能
|
2023-06-06 10:30:49 +08:00 |
|
sy
|
f68981baac
|
薪酬系统-福利台账，福利核算、核算明细列表逻辑优化（取消对档案状态的过滤）
|
2023-04-17 10:27:31 +08:00 |
|
钱涛
|
6bb6e350a8
|
冲突
|
2023-03-15 10:43:05 +08:00 |
|
钱涛
|
c9f6b62b5a
|
Merge branch 'release/2.7.1.2303.02' into feature/外部人员
# Conflicts:
# src/com/engine/salary/biz/SIAccountBiz.java
# src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java
|
2023-03-15 10:15:49 +08:00 |
|
sy
|
3e03b5d920
|
薪酬系统-社保福利，福利核算进度条逻辑优化
|
2023-03-07 16:52:09 +08:00 |
|
sy
|
b6ee197fe6
|
薪酬系统,梳理Mapper类使用方式
|
2023-03-07 14:21:01 +08:00 |
|
钱涛
|
a423790a35
|
获取人员信息
|
2023-03-06 17:57:20 +08:00 |
|
sy
|
390d2d7851
|
薪酬系统-福利台账，补缴起始缴纳月之前的福利默认为空
|
2023-02-08 14:50:45 +08:00 |
|
sy
|
5657d5cc64
|
薪酬系统-福利台账，福利补缴方式一和二不允许补缴起始缴纳月之前的月份
|
2023-02-08 13:04:23 +08:00 |
|
sy
|
de5b5d4c19
|
薪酬系统-福利台账，福利缴纳周期核算时考虑起始缴纳月相关逻辑，福利补缴不允许补缴起始缴纳月之前的月份
|
2023-02-08 11:33:17 +08:00 |
|
sy
|
45d9fa4c12
|
薪酬系统-福利台账，补缴核算时按照补缴月份考虑缴纳周期
|
2023-02-03 17:04:30 +08:00 |
|
sy
|
9a4b58b2ee
|
薪酬系统-福利台账，只勾选医疗保险和养老保险时的补缴核算过程加入福利方案缴纳周期逻辑
|
2023-02-03 13:38:12 +08:00 |
|
sy
|
2e7ea046f2
|
薪酬系统-福利台账，补缴核算过程加入福利方案缴纳周期逻辑
|
2023-02-02 14:47:39 +08:00 |
|
sy
|
6abc2068ea
|
薪酬系统-福利方案，福利方案新增、编辑、查看方法改进，福利核算加入福利方案中的缴纳周期因素
|
2023-01-31 17:40:34 +08:00 |
|
sy
|
3ed6c43a93
|
薪酬系统-福利台账，补缴原方式新增时，未设置基数情况下的逻辑优化
|
2023-01-12 18:31:36 +08:00 |
|
sy
|
f722535ba1
|
薪酬系统-福利台账，补缴新增仅缴纳部分福利项时的台账统计逻辑优化
|
2023-01-06 11:20:44 +08:00 |
|
sy
|
ac99625e29
|
薪酬系统-福利台账，补缴新增社保缴纳明细保存问题修复
|
2023-01-05 09:53:26 +08:00 |
|
sy
|
5f59ff399d
|
薪酬系统-福利台账，补缴功能优化只选社保或养老保险时的单位缴纳逻辑
|
2023-01-04 16:05:19 +08:00 |
|
sy
|
7fba73d3f4
|
薪酬系统-福利台账，福利核算无核算人员时，直接进度完成
|
2022-12-29 09:24:07 +08:00 |
|
sy
|
84aeb5059f
|
薪酬系统-福利台账，调差方式3时的福利项
|
2022-12-28 17:01:15 +08:00 |
|
sy
|
af15ffcc23
|
薪酬系统-福利台账，补缴新增功能改造v1
|
2022-12-27 14:01:08 +08:00 |
|
sy
|
2f10986e2b
|
薪酬系统-福利台账，重新核算时，保留已有补差数据，但是bill_batch统计信息只统计补差相关缴费数额，不统计补差相关人数信息
|
2022-12-19 14:47:49 +08:00 |
|
sy
|
237f42f2ae
|
薪酬系统-福利台账，核算进度条逻辑优化
|
2022-12-15 18:03:28 +08:00 |
|
sy
|
0787fb4d05
|
Merge remote-tracking branch 'remotes/origin/release/2.4.1.2212.02' into feature/v3-siAccountBalance-1208
# Conflicts:
# src/com/engine/salary/service/impl/SIAccountServiceImpl.java
|
2022-12-15 17:08:21 +08:00 |
fcli
|
d039781b74
|
feat: develop处理合并
|
2022-12-14 11:03:33 +08:00 |
|
fcli
|
dea2353ef2
|
Merge branch 'feature/变更分页' into feature/加密方法&分页merge
# Conflicts:
# src/com/engine/salary/biz/SIAccountBiz.java
# src/com/engine/salary/biz/SalaryArchiveItemBiz.java
# src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
# src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
# src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java
# src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java
|
2022-12-14 10:57:41 +08:00 |
|
fcli
|
d3de862d11
|
feat: 加密统一,薪资项目&社保档案详情...
|
2022-12-13 17:14:27 +08:00 |
|
fcli
|
eabc983100
|
feat: 加密统一，社保福利档案&薪资核算结果
|
2022-12-13 10:15:31 +08:00 |
|
fcli
|
93db32b758
|
feat: 加密统一，累计附加扣除&社保福利模块
|
2022-12-12 15:40:01 +08:00 |
|
sy
|
ae72d25431
|
Merge remote-tracking branch 'remotes/origin/master' into feature/v3-siAccountBalance-1208
|
2022-12-12 13:43:16 +08:00 |
|
fcli
|
b58e71989d
|
feat: 统一修改到内存分页
|
2022-12-12 10:25:55 +08:00 |
|
sy
|
c94e28e68c
|
薪酬系统-福利台账，核算功能相关临时表数据删除逻辑优化
|
2022-12-08 10:10:48 +08:00 |
|
sy
|
f31e176cab
|
薪酬系统-福利台账，billBatch统计数据刷新方法优化（不需要统计补差数据中的人数信息）
|
2022-12-07 17:50:25 +08:00 |
|
sy
|
22a7258229
|
薪酬系统-福利台账，福利核算添加核算进度查询逻辑
|
2022-12-02 17:08:35 +08:00 |