 钱涛
|
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
|
a39806bb92
|
我的薪资福利显示页签支持配置
|
2024-02-23 11:04:14 +08:00 |
|
钱涛
|
0545c6eb8c
|
Merge branch 'release/2.9.5.2309.01' into release/个税版本
|
2023-09-21 16:58:15 +08:00 |
|
Harryxzy
|
5f1ef51892
|
报表共享temp
|
2023-09-18 18:20:53 +08:00 |
|
钱涛
|
1b4c9ce7a7
|
流量不足提醒
|
2023-08-28 15:19:57 +08:00 |
|
钱涛
|
45e69cd6c8
|
导出
|
2023-08-24 11:36:17 +08:00 |
|
钱涛
|
9e416123dd
|
账套薪资项目添加code
|
2023-08-23 16:49:45 +08:00 |
|
钱涛
|
fdc1df3dba
|
个税对接v6
|
2023-08-22 17:48:23 +08:00 |
|
钱涛
|
827420c2bd
|
个税对接，人员报送相关接口
|
2023-08-08 19:39:53 +08:00 |
|
Harryxzy
|
58eaddc33e
|
人员信息报送temp
|
2023-08-08 09:21:14 +08:00 |
|
钱涛
|
e75d5ab427
|
v1
|
2023-07-20 10:36:29 +08:00 |
|
钱涛
|
873b90474f
|
Merge branch 'feature/230701qt' into feature/外部人员
|
2023-07-13 16:55:36 +08:00 |
|
钱涛
|
1d32b4b015
|
授权文件id过长
|
2023-07-13 14:36:11 +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 |
|
钱涛
|
797d5095eb
|
适配if
|
2023-05-09 10:43:51 +08:00 |
|
钱涛
|
ae719ad65b
|
修复人员过多时bug
|
2023-05-04 11:56:34 +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 |
|
钱涛
|
f4ebcf987c
|
维护估计控制层
|
2023-04-23 17:30:43 +08:00 |
|
钱涛
|
6933d63cb1
|
自定义报表项目
|
2023-04-17 09:46:01 +08:00 |
|
钱涛
|
739904d48f
|
暂存
|
2023-04-10 09:47:33 +08:00 |
|
钱涛
|
b30a58c1d9
|
报表功能
|
2023-04-07 14:38:38 +08:00 |
|
钱涛
|
1568b1e03d
|
外部人员基础类
|
2023-03-01 09:05:03 +08:00 |
|
钱涛
|
eee39ae972
|
jar引用变更
|
2023-02-21 14:33:15 +08:00 |
fcli
|
bd2597541d
|
feat: 字段管理
|
2023-01-18 09:38:43 +08:00 |
|
fcli
|
cc105ca051
|
Merge branch 'feat/SalarySendRange' into release/2.3.2.2212.01
|
2022-12-08 16:41:04 +08:00 |
|
fcli
|
4f9e2d8f80
|
feat: 路径修改接近e10
|
2022-11-29 14:36:37 +08:00 |
|
fcli
|
fc81955b15
|
feat: 全部范围部分发放撤回功能
|
2022-11-25 10:53:23 +08:00 |
sy
|
f3dc63244f
|
薪酬系统-福利档案，福利档案新增接口v3
|
2022-11-11 11:15:33 +08:00 |
|
fcli
|
9b77bf7139
|
feat: 专项附加扣除模块, 一键清空、分页bug等
|
2022-11-09 10:40:38 +08:00 |
|
fcli
|
fafc157e63
|
feat: 专项附加扣除模块
|
2022-11-09 10:40:19 +08:00 |
|
钱涛
|
a4e6042adf
|
调薪流程按钮
|
2022-08-24 20:00:57 +08:00 |
|
钱涛
|
e7968f2545
|
1、公共枚举接口
2、薪资档案封存标识
|
2022-07-26 18:01:39 +08:00 |
 liuliang
|
4ff9290d73
|
Merge branch 'feature_liuliang_20220705' into develop
|
2022-07-20 16:06:27 +08:00 |
|
liuliang
|
32c15c1c35
|
Merge branch 'feature_liuliang_20220705' into develop
|
2022-07-20 15:58:49 +08:00 |
|
钱涛
|
f65f3c01eb
|
流程对接
|
2022-07-19 10:20:21 +08:00 |
|
liuliang
|
758a78996d
|
导入薪酬档案对接流程功能
|
2022-07-13 18:59:30 +08:00 |
|
钱涛
|
1d5c69278f
|
描述异常
|
2022-07-13 11:45:16 +08:00 |
|
钱涛
|
12917f4f8b
|
去除无用todo
|
2022-07-08 11:30:10 +08:00 |
|
钱涛
|
053c436d49
|
获取薪酬版本信息
|
2022-07-05 16:56:09 +08:00 |
MustangDeng
|
5f2c20eaec
|
默认不启用非标功能
|
2022-05-23 13:38:48 +08:00 |
|
钱涛
|
f2f678c6d1
|
核算进度
|
2022-04-29 17:15:22 +08:00 |
|
钱涛
|
d521bf5bf7
|
账套周期
|
2022-04-26 14:44:42 +08:00 |
|
钱涛
|
3b342d4ec7
|
我的薪资福利
|
2022-04-22 19:22:40 +08:00 |
 Chengliang
|
72e9e152d6
|
福利台账相关
|
2022-04-20 19:12:01 +08:00 |
|
钱涛
|
941a34990f
|
Merge branch 'feature/acct' into develop
# Conflicts:
# src/com/engine/salary/entity/salaryformula/dto/SalaryFormulaEmployeeDTO.java
# src/com/engine/salary/entity/salarysob/bo/SalarySobItemAggregateBO.java
|
2022-04-14 20:49:24 +08:00 |
|
钱涛
|
4db39902b5
|
公式v2
|
2022-04-14 20:46:17 +08:00 |
|
MustangDeng
|
50c03b19e0
|
Merge branch 'develop' into feature/salaryBill
# Conflicts:
# src/com/engine/salary/annotation/SalaryFormulaVar.java
|
2022-04-13 11:09:41 +08:00 |
|
MustangDeng
|
bd8305763e
|
工资单发放-编译
|
2022-04-12 10:11:53 +08:00 |
|
Chengliang
|
568cc1811e
|
薪资台账列表
|
2022-04-11 19:07:35 +08:00 |
|
MustangDeng
|
1573abd1ee
|
Revert "工资单发放-todo"
This reverts commit b850f5ad
|
2022-04-11 14:30:30 +08:00 |