 钱涛
|
f595b1782a
|
Merge branch 'release/2.14.3.2406.01' into release/个税版本2.14.3.2406.01
|
2024-05-28 11:29:37 +08:00 |
|
钱涛
|
1b3da7dfc0
|
身份证
|
2024-05-23 09:16:28 +08:00 |
|
钱涛
|
04978dd8e6
|
Merge branch 'release/2.14.1.2405.01' into release/个税版本
|
2024-05-13 14:01:22 +08:00 |
Harryxzy
|
845586cba2
|
test
|
2024-05-10 14:54:02 +08:00 |
|
钱涛
|
ec27cf5a08
|
Merge branch 'release/2.13.1.2404.02' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/AddUpDeductionService.java
# src/com/engine/salary/wrapper/AddUpDeductionWrapper.java
|
2024-05-08 11:17:40 +08:00 |
|
Harryxzy
|
b5b2c9ef1e
|
累计专项附加扣除一键累计，能根据义务人进行累计
|
2024-04-30 15:00:43 +08:00 |
|
Harryxzy
|
4b474f864f
|
累计专项附加扣除一键累计，能根据义务人进行累计
|
2024-04-30 14:43:37 +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 |
|
钱涛
|
0a7334ddef
|
考勤导入，多语言
|
2024-03-14 18:16:20 +08:00 |
|
钱涛
|
417c9f703d
|
下载模板时带出数据
|
2024-03-14 15:28:14 +08:00 |
|
钱涛
|
a70a2061a5
|
部门改多选
|
2024-03-14 11:19:02 +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 |
|
钱涛
|
836947725f
|
切换了elog位置
|
2024-03-12 14:34:44 +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 |
|
钱涛
|
f325674673
|
Merge branch 'release/2.11.1.2402.01' into feature/操作日志组件
|
2024-03-04 09:41:35 +08:00 |
|
钱涛
|
8ae06f27b8
|
fix导入性能，导入方法类型改完外层引用
|
2024-02-29 15:53:22 +08:00 |
|
Harryxzy
|
dee20149bb
|
日志
|
2024-02-21 18:19:02 +08:00 |
|
钱涛
|
079b7de258
|
合并240101
|
2024-02-21 15:35:08 +08:00 |
sy
|
6efbd9deb0
|
薪酬系统，将部分新增代码中labelId入参统一置为0，方便后期多语言逻辑适配时定位
|
2024-02-04 15:10:35 +08:00 |
|
钱涛
|
a8bfe83030
|
操作日志
|
2024-01-30 09:58:13 +08:00 |
|
钱涛
|
f245bd2f49
|
新增往期累计字段
|
2023-09-05 11:04:53 +08:00 |
|
钱涛
|
9867728d2e
|
在线获取累计专项附加扣除
|
2023-09-04 16:18:02 +08:00 |
|
钱涛
|
96bfdf05ed
|
在线获取累计专项附加扣除
|
2023-09-04 14:20:42 +08:00 |
|
钱涛
|
c0c29b7472
|
在线获取累计专项附加扣除
|
2023-09-04 09:29:00 +08:00 |
|
钱涛
|
89ecf0984d
|
fix外部人员
|
2023-07-12 09:45:00 +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
|
5e4f32dbab
|
累计专项附加扣除更新插入时间修正
|
2023-07-03 10:34:30 +08:00 |
|
Harryxzy
|
2bf99d3ec1
|
累计专项附加扣除防抖动修复
|
2023-07-03 10:33:01 +08:00 |
|
Harryxzy
|
eb0c59c0b9
|
累计专项附加扣除列表提速-2
|
2023-06-29 14:05:33 +08:00 |
|
Harryxzy
|
33593311df
|
累计专项附加扣除列表提速
|
2023-06-29 14:04:11 +08:00 |
|
Harryxzy
|
e3e0bcd66b
|
累计专项附加扣除防抖动
|
2023-06-29 13:53:07 +08:00 |
|
钱涛
|
6b19445a1a
|
Merge branch 'release/2.8.2.2305.02' into feature/公式
# Conflicts:
# src/com/engine/salary/service/impl/TaxDeclarationDetailServiceImpl.java
|
2023-05-08 11:22:23 +08:00 |
|
钱涛
|
a19b19e23d
|
公式
|
2023-04-19 10:15:01 +08:00 |
|
Harryxzy
|
82ee707f16
|
employebiz改成employeeservice
|
2023-04-12 15:27:35 +08:00 |
|
钱涛
|
62d124efb1
|
外部人员终极版
|
2023-03-15 22:48:01 +08:00 |
|
钱涛
|
a423790a35
|
获取人员信息
|
2023-03-06 17:57:20 +08:00 |
|
钱涛
|
6de22b142d
|
1、工资单模板
2、一键累计
|
2023-03-02 17:11:42 +08:00 |
fcli
|
d1f62e8b49
|
Merge remote-tracking branch 'origin/release/2.5.3.2301.01' into release/2.5.3.2301.01
|
2023-01-06 09:06:41 +08:00 |
|
fcli
|
eb3c75197b
|
feat: 往期累计一键清空校验bug修复
|
2023-01-05 09:40:43 +08:00 |
|
fcli
|
3863a10c27
|
fix: 一月份不累计上年数据
|
2023-01-04 14:15:59 +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
|
1431308cc5
|
feat: 加密统一，薪资核算结果
|
2022-12-12 16:42:44 +08:00 |
|
fcli
|
b58e71989d
|
feat: 统一修改到内存分页
|
2022-12-12 10:25:55 +08:00 |
|
钱涛
|
8dc2ddc3c8
|
加密方法
|
2022-12-12 09:37:15 +08:00 |
|
钱涛
|
309cb2047d
|
配置文件
|
2022-12-09 15:28:29 +08:00 |
|
fcli
|
b3cd118c21
|
feat: 自动累计功能
|
2022-11-17 14:28:15 +08:00 |
|
fcli
|
459f7e5053
|
Merge branch 'feature/SpecialAddUpMerge' into release/2.1.3.2211.03
|
2022-11-10 09:33:22 +08:00 |
|
fcli
|
63ee9c9b8e
|
fix: 一键累计添加日期与校验
|
2022-11-09 18:57:28 +08:00 |
|
fcli
|
815e37e50b
|
fix: 一键累计添加日期与校验
|
2022-11-09 16:55:00 +08:00 |