 钱涛
|
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 |
|
钱涛
|
6f2d65a4be
|
修复社保福利新建时没有小数位和进位规则对应问题
|
2024-05-08 10:49:08 +08:00 |
|
钱涛
|
4aa66ea587
|
外籍人员更新
|
2024-04-11 18:57:56 +08:00 |
|
钱涛
|
691f4c42ce
|
内置算税结果
|
2024-04-10 14:48:58 +08:00 |
|
钱涛
|
2a692b13b4
|
外籍人员v1
|
2024-03-29 10:44:55 +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 |
Harryxzy
|
8984369343
|
薪资档案、社保档案查看日志
|
2024-03-05 15:15:20 +08:00 |
|
钱涛
|
f325674673
|
Merge branch 'release/2.11.1.2402.01' into feature/操作日志组件
|
2024-03-04 09:41:35 +08:00 |
|
钱涛
|
229186e510
|
Merge branch 'release/2.11.1.2402.01' into release/个税版本
|
2024-02-23 14:45:39 +08:00 |
|
Harryxzy
|
4775d8683a
|
fix调薪原因value值相同
|
2024-02-23 11:42:36 +08:00 |
|
Harryxzy
|
dee20149bb
|
日志
|
2024-02-21 18:19:02 +08:00 |
|
钱涛
|
53806d9262
|
Merge branch 'release/2.10.1.2401.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
# src/com/engine/salary/util/excel/ExcelUtil.java
|
2024-02-21 15:28:33 +08:00 |
|
钱涛
|
8f8bc5256d
|
增加操作日志类型
|
2024-02-18 11:39:49 +08:00 |
sy
|
f4ecb19ef2
|
Merge branch 'release/2.10.1.2401.01' into feature/操作日志组件
|
2024-02-01 10:21:47 +08:00 |
|
钱涛
|
e5a0a85179
|
增加调薪原因，晋升、降职、调岗
|
2024-01-30 11:18:54 +08:00 |
|
钱涛
|
5bf00a98aa
|
记录核算日志
|
2024-01-24 09:50:58 +08:00 |
|
钱涛
|
fcf0483365
|
补充申报表未填写状态
|
2024-01-03 13:47:19 +08:00 |
|
钱涛
|
0a16415d9a
|
Merge branch 'feature/个税2312版本功能' into feature/艾志-正常申报补足年终奖人员
|
2023-12-28 10:11:55 +08:00 |
|
钱涛
|
8b78ccd43b
|
Merge branch 'release/个税版本' into feature/个税2312版本功能
|
2023-12-28 09:51:34 +08:00 |
|
钱涛
|
13f310e9e4
|
记录申报表数据来源
|
2023-12-27 17:33:53 +08:00 |
|
Harryxzy
|
2dc7e7f541
|
人员信息报送导入
|
2023-12-27 16:58:47 +08:00 |
|
钱涛
|
c581c8d74d
|
导出申报表明细
|
2023-12-20 17:21:46 +08:00 |
|
钱涛
|
d9a27c2b9a
|
Merge branch 'release/2.9.9.2312.01' into release/个税版本
|
2023-11-29 17:46:31 +08:00 |
|
钱涛
|
3f61807401
|
修复核算结果可能为0
|
2023-11-29 17:45:16 +08:00 |
|
钱涛
|
e19f00c44d
|
Merge branch 'release/2.9.6.2310.01' into release/个税版本
|
2023-10-20 09:43:24 +08:00 |
|
钱涛
|
81b9d65a22
|
过滤==
|
2023-10-19 16:26:23 +08:00 |
|
钱涛
|
6bbfc10c34
|
过滤==
|
2023-10-19 16:25:30 +08:00 |
|
钱涛
|
18527f745e
|
修复自定义核算条件
|
2023-10-19 14:21:22 +08:00 |
|
钱涛
|
e8f124d58c
|
Merge branch 'release/2.9.6.2310.01' into release/个税版本
|
2023-10-17 10:25:02 +08:00 |
|
钱涛
|
7e22c9836f
|
调整原因接口
|
2023-10-16 15:01:29 +08:00 |
|
钱涛
|
5d3e2928c9
|
Merge branch 'release/2.9.6.2310.01' into release/个税版本
|
2023-10-13 16:54:46 +08:00 |
|
钱涛
|
4a59859fa8
|
调薪记录
|
2023-10-12 17:34:09 +08:00 |
|
钱涛
|
d5f5cb07ba
|
Merge branch 'release/2.9.6.2310.01' into release/个税版本
|
2023-10-08 16:21:12 +08:00 |
|
钱涛
|
182e90676c
|
Merge branch 'feature/自定义筛选条件' into release/2.9.6.2310.01
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
|
2023-10-08 14:24:33 +08:00 |
|
钱涛
|
26bbc9c0ee
|
Merge branch 'release/2.9.6.2310.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
|
2023-10-08 14:21:25 +08:00 |
|
钱涛
|
8166e76081
|
账套增加状态字段
|
2023-10-08 13:38:37 +08:00 |
|
钱涛
|
b6508067f1
|
过滤枚举
|
2023-10-08 09:16:54 +08:00 |
|
钱涛
|
37e9b3c33c
|
sql可以使用薪资项目作为变量
|
2023-10-07 17:00:02 +08:00 |
|
钱涛
|
5d203b0783
|
自定义搜索
|
2023-09-25 16:53:01 +08:00 |
|
钱涛
|
faeafbe5ad
|
暂存
|
2023-09-25 15:38:14 +08:00 |
|
钱涛
|
0545c6eb8c
|
Merge branch 'release/2.9.5.2309.01' into release/个税版本
|
2023-09-21 16:58:15 +08:00 |
|
钱涛
|
2b13d0c7ef
|
定薪账套
|
2023-09-14 11:56:00 +08:00 |
|
钱涛
|
c0c29b7472
|
在线获取累计专项附加扣除
|
2023-09-04 09:29:00 +08:00 |
|
钱涛
|
45e69cd6c8
|
导出
|
2023-08-24 11:36:17 +08:00 |
|
钱涛
|
9e416123dd
|
账套薪资项目添加code
|
2023-08-23 16:49:45 +08:00 |
|
钱涛
|
988139610b
|
Merge branch 'release/2.9.4.2308.02' into release/230803对接个税
# Conflicts:
# src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml
# src/com/engine/salary/web/SalarySobController.java
|
2023-08-18 09:36:26 +08:00 |
|
钱涛
|
cf22685fca
|
账套-个税字段对应、累计字段对应
|
2023-08-15 20:48:09 +08:00 |
|
钱涛
|
b1817142b0
|
个税对接，个税申报接口
|
2023-08-14 20:07:29 +08:00 |
|
Harryxzy
|
58eaddc33e
|
人员信息报送temp
|
2023-08-08 09:21:14 +08:00 |
|
Harryxzy
|
da18b0f884
|
薪资账套项目页面改造temp
|
2023-07-25 16:46:57 +08:00 |