Harryxzy
|
6aef2856e8
|
个税日志
|
2024-03-08 11:14:00 +08:00 |
|
Harryxzy
|
d890ab5a84
|
Merge remote-tracking branch 'origin/release/个税版本' into release/个税版本
|
2024-03-08 09:26:57 +08:00 |
 钱涛
|
8516a23bba
|
修改人员报送刷新逻辑
刷新人员会集成上月所有人员
|
2024-03-07 21:12:09 +08:00 |
|
钱涛
|
72861b9a93
|
Merge branch 'release/3.0.0.2403.01' into release/个税版本
|
2024-03-07 16:57:03 +08:00 |
|
Harryxzy
|
0f82b8ce10
|
Merge branch 'feature/操作日志组件' into release/2.11.1.2402.01
|
2024-03-07 14:23:46 +08:00 |
|
Harryxzy
|
17428c621e
|
非系统人员范围操作日志
|
2024-03-07 14:23:12 +08:00 |
|
钱涛
|
729c6c7d3a
|
处理空指针
|
2024-03-07 14:12:16 +08:00 |
|
Harryxzy
|
a4f4c8c5a4
|
Merge remote-tracking branch 'origin/release/个税版本' into release/个税版本
|
2024-03-07 11:14:43 +08:00 |
|
钱涛
|
e851944e8f
|
优化薪资账套项目保存逻辑
|
2024-03-07 11:11:24 +08:00 |
|
钱涛
|
6d4993f4ff
|
Merge branch 'release/2.11.1.2402.01' into release/个税版本
|
2024-03-07 10:45:36 +08:00 |
|
钱涛
|
3b1edddf00
|
优化薪资账套项目保存逻辑
|
2024-03-07 10:21:06 +08:00 |
|
钱涛
|
730166d771
|
Merge branch 'release/2.11.1.2402.01' into release/个税版本
|
2024-03-07 09:54:35 +08:00 |
|
钱涛
|
e187ee57e0
|
获取所有账套列表接口
|
2024-03-07 09:52:21 +08:00 |
|
钱涛
|
427ce223e7
|
核算闭环提醒
|
2024-03-07 09:43:22 +08:00 |
|
Harryxzy
|
381c705cf8
|
人员信息报送、个税申报表日志
|
2024-03-07 09:29:59 +08:00 |
|
钱涛
|
a52788aa1b
|
往期累计日志调整
|
2024-03-06 16:12:15 +08:00 |
|
钱涛
|
4196a8c596
|
合并冲突
|
2024-03-06 16:05: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 |
|
钱涛
|
78c1d6f51c
|
项目日志字段解释
|
2024-03-06 15:20:21 +08:00 |
|
Harryxzy
|
20d7266db9
|
Merge branch 'feature/240201_社保福利台账导入字段缓存' into release/2.11.1.2402.01
# Conflicts:
# src/com/engine/salary/service/impl/SIAccountServiceImpl.java
|
2024-03-06 13:50:56 +08:00 |
|
Harryxzy
|
0ac291d83d
|
Merge branch 'feature/操作日志组件' into release/2.11.1.2402.01
|
2024-03-06 09:23:21 +08:00 |
|
Harryxzy
|
8984369343
|
薪资档案、社保档案查看日志
|
2024-03-05 15:15:20 +08:00 |
|
Harryxzy
|
6c2d20a5a7
|
Merge branch 'feature/240101_我的薪资福利显示页签支持配置' into release/2.11.1.2402.01
|
2024-03-05 14:24:19 +08:00 |
|
钱涛
|
1c62be09d1
|
Merge branch 'feature/操作日志组件' into release/2.11.1.2402.01
|
2024-03-05 13:58:50 +08:00 |
|
钱涛
|
2fc387cc40
|
账套条件
|
2024-03-05 13:44:34 +08:00 |
|
Harryxzy
|
3f76b5bbbf
|
非系统人员管理日志
|
2024-03-04 16:12:30 +08:00 |
|
Harryxzy
|
8c6c6a4966
|
社保福利台账，非系统人员导入报错
|
2024-03-04 14:30:25 +08:00 |
|
Harryxzy
|
15b6c80cdc
|
在线对比相关功能
|
2024-03-04 14:07:51 +08:00 |
|
钱涛
|
c081581ba7
|
Merge branch 'feature/报表支持账套筛选' into release/2.11.1.2402.01
|
2024-03-04 14:01:33 +08:00 |
|
钱涛
|
f325674673
|
Merge branch 'release/2.11.1.2402.01' into feature/操作日志组件
|
2024-03-04 09:41:35 +08:00 |
|
Harryxzy
|
28f7c57e12
|
社保福利台账导入，表单字段缓存
|
2024-03-04 09:18:00 +08:00 |
|
Harryxzy
|
5485f7d260
|
社保福利台账导入，表单字段缓存
|
2024-03-01 17:40:19 +08:00 |
|
钱涛
|
34f6b76fb1
|
修复核算数据为null
|
2024-03-01 16:55:40 +08:00 |
|
Harryxzy
|
bcfcd1de9a
|
个税申报-在线对比显示列定制
|
2024-03-01 13:52:27 +08:00 |
|
Harryxzy
|
54823f2fbd
|
个税申报-在线对比
|
2024-02-29 18:09:58 +08:00 |
|
钱涛
|
8ae06f27b8
|
fix导入性能，导入方法类型改完外层引用
|
2024-02-29 15:53:22 +08:00 |
|
Harryxzy
|
efa556ddd9
|
操作日志修复
|
2024-02-29 11:31:18 +08:00 |
|
Harryxzy
|
89787332e3
|
操作日志修复
|
2024-02-28 18:03:55 +08:00 |
|
Harryxzy
|
066222400b
|
操作日志修复
|
2024-02-28 16:44:52 +08:00 |
|
Harryxzy
|
adff178a7c
|
义务人日志优化
|
2024-02-28 15:01:44 +08:00 |
|
钱涛
|
a1ab3c79f4
|
添加账套筛选条件
|
2024-02-28 14:43:27 +08:00 |
|
Harryxzy
|
f9163340e5
|
分片
|
2024-02-28 09:17:28 +08:00 |
|
Harryxzy
|
3a9b772cb9
|
人员信息报送增加模糊查询
|
2024-02-27 15:16:13 +08:00 |
|
Harryxzy
|
1261194d88
|
操作日志优化
|
2024-02-27 11:30:14 +08:00 |
|
钱涛
|
9e8fbbef89
|
去除pagehelper jar包
|
2024-02-26 16:25:17 +08:00 |
|
钱涛
|
f11d6a035c
|
去除pagehelper jar包
|
2024-02-26 15:40:52 +08:00 |
sy
|
4ea2499d85
|
Merge remote-tracking branch 'origin/feature/操作日志组件' into feature/操作日志组件
|
2024-02-23 16:11:18 +08:00 |
|
sy
|
624c7db09f
|
薪酬系统-福利台账，核算功能操作日志逻辑添加
|
2024-02-23 16:11:11 +08:00 |
|
Harryxzy
|
093cb34f77
|
操作日志fix some bugs
|
2024-02-23 15:11:56 +08:00 |
|
钱涛
|
229186e510
|
Merge branch 'release/2.11.1.2402.01' into release/个税版本
|
2024-02-23 14:45:39 +08:00 |