 钱涛
|
fc807ae005
|
版本
|
2024-03-05 15:43:16 +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
|
afa2cbaf97
|
Merge remote-tracking branch 'origin/feature/操作日志组件' into feature/操作日志组件
|
2024-03-04 16:12:44 +08:00 |
|
Harryxzy
|
3f76b5bbbf
|
非系统人员管理日志
|
2024-03-04 16:12:30 +08:00 |
|
钱涛
|
93a77fdb6f
|
日志包添加锁
|
2024-03-04 16:04:17 +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 |
|
钱涛
|
022b904581
|
添加账套筛选条件sql
|
2024-02-28 14:54:13 +08:00 |
|
钱涛
|
a1ab3c79f4
|
添加账套筛选条件
|
2024-02-28 14:43:27 +08:00 |
|
钱涛
|
4b77af983a
|
分页jar
|
2024-02-28 13:40:05 +08:00 |
|
Harryxzy
|
f9163340e5
|
分片
|
2024-02-28 09:17:28 +08:00 |
|
Harryxzy
|
616ddce092
|
艾志《2024-01个税申报问题汇总》1、3、5、6
|
2024-02-27 16:22:16 +08:00 |
|
钱涛
|
2edb98475b
|
更新日志版本
|
2024-02-27 15:43:36 +08:00 |
|
Harryxzy
|
7dafb37263
|
艾志《2024-01个税申报问题汇总》1、3、5、6
|
2024-02-27 15:39:03 +08:00 |
|
Harryxzy
|
9072bc164c
|
Merge branch 'release/个税版本' into custom/艾志工业-个税申报
# Conflicts:
# src/com/engine/salary/mapper/datacollection/EmployMapper.java
# src/com/engine/salary/mapper/datacollection/EmployMapper.xml
# src/com/engine/salary/service/SalaryEmployeeService.java
# src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
|
2024-02-27 15:17:57 +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 |
|
钱涛
|
7cab0e117d
|
Merge branch 'release/个税版本' into custom/艾志工业-个税申报
|
2024-02-23 16:54:36 +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 |
|
sy
|
721f6046da
|
Merge remote-tracking branch 'remotes/origin/fix/240101-福利台账列表分权问题修复' into release/2.11.1.2402.01
|
2024-02-23 14:07:08 +08:00 |
|
Harryxzy
|
4775d8683a
|
fix调薪原因value值相同
|
2024-02-23 11:42:36 +08:00 |
|
sy
|
dce7f684a5
|
薪酬系统-福利台账，列表分权问题修复
|
2024-02-23 11:34:48 +08:00 |
|
Harryxzy
|
a39806bb92
|
我的薪资福利显示页签支持配置
|
2024-02-23 11:04:14 +08:00 |
|
sy
|
e4cbcdd400
|
Merge remote-tracking branch 'origin/feature/操作日志组件' into feature/操作日志组件
|
2024-02-22 15:24:12 +08:00 |
|
sy
|
1654e041b9
|
薪酬系统-福利档案，相关功能操作日志逻辑优化
|
2024-02-22 15:23:59 +08:00 |
|
钱涛
|
a78c45f8f9
|
Merge branch 'master' into feature/操作日志组件
# Conflicts:
# src/com/engine/salary/report/entity/po/SalaryStatisticsItemPO.java
|
2024-02-22 15:20:14 +08:00 |
|
Harryxzy
|
bec6443dcf
|
Merge branch 'release/个税版本' into custom/艾志工业-个税申报
# Conflicts:
# src/com/engine/salary/biz/SIArchivesBiz.java
# src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationPO.java
# src/com/engine/salary/service/impl/SIAccountServiceImpl.java
# src/com/engine/salary/service/impl/SIArchivesServiceImpl.java
# src/com/engine/salary/service/impl/SIImportServiceImpl.java
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
# src/com/engine/salary/web/SIArchivesController.java
|
2024-02-22 14:57:39 +08:00 |
|
Harryxzy
|
5c5dcdabb2
|
Merge remote-tracking branch 'origin/feature/操作日志组件' into feature/操作日志组件
|
2024-02-22 09:44:02 +08:00 |
|
Harryxzy
|
f591074fc1
|
日志
|
2024-02-22 09:43:47 +08:00 |
|
sy
|
f7eb698c4c
|
Merge remote-tracking branch 'origin/feature/操作日志组件' into feature/操作日志组件
|
2024-02-22 09:34:09 +08:00 |