sy
|
9d0194acd3
|
薪酬系统-福利台账，优化福利台账补缴模板中账单月份和补缴月份校验逻辑
|
2023-08-07 16:46:17 +08:00 |
|
sy
|
d219d129a5
|
薪酬系统-福利台账，台账明细导入模板自定义导入字段列表优化
|
2023-08-04 14:14:44 +08:00 |
|
sy
|
293297ad7f
|
薪酬系统-福利台账，线下对比导入分批,列表逻辑优化
|
2023-08-01 15:37:32 +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 |
|
sy
|
2e2954f706
|
薪酬系统-薪资核算，补缴和补差个人福利项明细核算失败问题修复
|
2023-07-14 14:43:30 +08:00 |
|
sy
|
3571797e12
|
薪酬系统-薪资核算，薪资项目函数中增加福利核算明细项根据缴纳状态的细分项
|
2023-07-14 09:13:19 +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 |
|
sy
|
193e28758c
|
薪酬系统-薪资核算、薪资档案、福利档案，高级搜索中的状态条件改为数组类型的入参
|
2023-07-10 10:26:08 +08:00 |
|
钱涛
|
2d8b4b07d0
|
Merge branch 'release/2.7.4.2304.02' into feature/报表
# Conflicts:
# src/com/engine/salary/biz/SIArchivesBiz.java
|
2023-04-28 10:49:33 +08:00 |
|
sy
|
27969cff80
|
薪酬系统-福利台账，补差导入处理合计值为null的情况
|
2023-04-24 10:11:02 +08:00 |
|
sy
|
c686f52153
|
薪酬系统-福利台账，补差导入部分福利项缴费信息相关合计逻辑优化
|
2023-04-23 18:05:32 +08:00 |
|
sy
|
37310f02f6
|
薪酬系统-福利台账，补差导入相关合计项计算逻辑优化
|
2023-04-23 16:35:52 +08:00 |
|
sy
|
62af02522c
|
薪酬系统-福利台账，线下对比（列表、导入、导出）福利项字段根据正常缴纳中的核算字段获得
|
2023-04-18 14:21:05 +08:00 |
|
sy
|
f68981baac
|
薪酬系统-福利台账，福利核算、核算明细列表逻辑优化（取消对档案状态的过滤）
|
2023-04-17 10:27:31 +08:00 |
|
钱涛
|
9549e75e00
|
Merge branch 'release/2.7.3.2304.01' into feature/外部人员
|
2023-04-13 14:48:43 +08:00 |
Harryxzy
|
82ee707f16
|
employebiz改成employeeservice
|
2023-04-12 15:27:35 +08:00 |
|
钱涛
|
e8ae952f18
|
Merge branch 'release/2.7.3.2304.01' into feature/外部人员
# Conflicts:
# src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveExcelBO.java
|
2023-04-11 11:41:30 +08:00 |
|
Harryxzy
|
accb0d3d2b
|
社保福利台账 - 合计列
|
2023-04-04 17:21:29 +08:00 |
|
Harryxzy
|
b331152d27
|
修复合计列
|
2023-03-28 13:59:57 +08:00 |
|
Harryxzy
|
952a8e845c
|
修复合计列
|
2023-03-28 11:00:18 +08:00 |
|
钱涛
|
8430397d03
|
外部人员终极版
|
2023-03-16 16:10:29 +08:00 |
|
Harryxzy
|
e1b4927eaa
|
删除多余代码
|
2023-03-16 14:52:08 +08:00 |
|
Harryxzy
|
6a7e5eacdc
|
社保福利台账合计列
|
2023-03-16 11:17:18 +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 |
|
Harryxzy
|
5067d50722
|
EmployeeBiz修改调用方式-2
|
2023-03-07 17:20:30 +08:00 |
|
Harryxzy
|
068f7e6535
|
EmployeeBiz修改调用方式
|
2023-03-07 17:14:25 +08:00 |
|
sy
|
b6ee197fe6
|
薪酬系统,梳理Mapper类使用方式
|
2023-03-07 14:21:01 +08:00 |
|
sy
|
28d515b41a
|
薪酬系统-福利台账，补缴导入空值时处理逻辑优化
|
2023-01-12 17:23:26 +08:00 |
|
sy
|
df2ac4754d
|
薪酬系统-福利台账，补差数据导入，缴纳费用非有效数值型数据，直接跳过
|
2022-12-23 17:50:12 +08:00 |
|
sy
|
5f4ddeabd4
|
薪酬系统-福利台账，补差数据待编辑数据过滤空值字段
|
2022-12-23 16:34:12 +08:00 |
|
sy
|
28d1d16844
|
薪酬系统-福利台账，补差数据参与薪资核算
|
2022-12-21 11:12:14 +08:00 |
|
sy
|
e75d0c5872
|
薪酬系统-福利台账，补差数据导入逻辑问题修复,福利类合计为0时，不允许补差其包含的福利项
|
2022-12-20 15:20:42 +08:00 |
|
sy
|
cd671b5ae2
|
薪酬系统-福利台账，补差数据导入逻辑问题修复
|
2022-12-20 09:25:55 +08:00 |
|
sy
|
547e7cd662
|
薪酬系统-福利台账，补差数据导入时，拒绝对于未设置社保、公积金、其他福利的正常缴纳项进行补差
|
2022-12-19 17:26:44 +08:00 |
|
sy
|
53d48d63b0
|
薪酬系统-福利台账，补差新增数据时，过滤重复数据
|
2022-12-19 11:43:20 +08:00 |
|
sy
|
69e0d7e441
|
薪酬系统-福利台账，补差tab添加
|
2022-12-16 11:13:28 +08:00 |
|
sy
|
cf08bbd842
|
薪酬系统-福利台账，补差相关加解密替换为新方法
|
2022-12-15 17:11:38 +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
|
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 |
|
fcli
|
b58e71989d
|
feat: 统一修改到内存分页
|
2022-12-12 10:25:55 +08:00 |
|
sy
|
43157d25e3
|
薪酬系统-福利台账，补差列表v1
|
2022-12-09 14:50:29 +08:00 |
|
sy
|
f31e176cab
|
薪酬系统-福利台账，billBatch统计数据刷新方法优化（不需要统计补差数据中的人数信息）
|
2022-12-07 17:50:25 +08:00 |
|
sy
|
ccfffc200e
|
薪酬系统-福利台账，补差数据导入功能
|
2022-12-07 17:09:53 +08:00 |
|
sy
|
3fa017b13a
|
薪酬系统-福利台账，补差福利项列表功能和补差模板导出功能
|
2022-12-06 11:44:04 +08:00 |
|
sy
|
e412be8d5e
|
薪酬系统-福利台账，退差数据编辑、删除后，刷新bill_batch表中统计数据
|
2022-11-24 14:19:58 +08:00 |
|
sy
|
931b3d8a82
|
薪酬系统-福利台账，修改退差数据单条查看返回格式v2
|
2022-11-24 11:04:12 +08:00 |