Harryxzy
|
489cfa9536
|
Merge branch 'release/2.9.5.2309.01' into custom/艾志工业-个税申报
|
2023-09-12 11:27:23 +08:00 |
sy
|
eb1966b703
|
薪酬系统-福利档案，编辑后保存功能，校验档案人员是否为非系统人员逻辑问题修复
|
2023-09-12 11:21:48 +08:00 |
|
Harryxzy
|
59d3aa758d
|
Merge branch 'release/个税版本' into custom/艾志工业-个税申报
# Conflicts:
# src/com/engine/salary/service/SalaryArchiveService.java
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
|
2023-09-12 11:19:30 +08:00 |
|
Harryxzy
|
8c81fa6da1
|
Merge branch 'release/2.9.5.2309.01' into custom/艾志工业-个税申报
|
2023-09-12 11:12:00 +08:00 |
|
sy
|
39971f726d
|
Merge remote-tracking branch 'remotes/origin/feature/230901-福利档案-非系统人员tab' into release/2.9.5.2309.01
|
2023-09-08 17:02:03 +08:00 |
 钱涛
|
83e0b1668e
|
往期累计
|
2023-09-07 18:21:22 +08:00 |
|
钱涛
|
02100c2ee3
|
有向无环拓扑排序
|
2023-09-07 15:15:59 +08:00 |
|
sy
|
a8e118b33a
|
薪酬系统-非系统人员管理，导入时增加对多级部门的识别
|
2023-09-07 15:11:10 +08:00 |
|
Harryxzy
|
8ec5def53d
|
Merge branch 'feature/230901-同步薪资项目至账套' into release/2.9.5.2309.01
|
2023-09-07 10:05:14 +08:00 |
|
sy
|
a672c71e5a
|
薪酬系统-福利档案，导入初始、最后缴纳月取值逻辑优化
|
2023-09-06 17:39:09 +08:00 |
|
钱涛
|
464bb9d623
|
Merge branch 'release/个税二期' into release/个税版本
|
2023-09-06 17:06:07 +08:00 |
|
钱涛
|
34406cf843
|
Merge branch 'release/个税一期' into release/个税二期
|
2023-09-06 16:22:54 +08:00 |
|
钱涛
|
2ff2e8d48b
|
Merge branch 'release/2.9.5.2309.01' into release/个税一期
|
2023-09-06 16:21:13 +08:00 |
|
钱涛
|
d0382ca239
|
核算优先级
|
2023-09-06 16:20:25 +08:00 |
|
钱涛
|
43cdf98411
|
核算优先级
|
2023-09-06 15:48:43 +08:00 |
|
Harryxzy
|
e48f64e814
|
Merge branch 'fix/230801-修改jackson解析方法' into release/2.9.5.2309.01
# Conflicts:
# src/com/engine/salary/service/impl/FormulaRunServiceImpl.java
|
2023-09-06 15:42:53 +08:00 |
|
钱涛
|
d03aed1d1b
|
核算优先级
|
2023-09-06 14:01:56 +08:00 |
|
钱涛
|
d49b33c66f
|
Merge branch 'release/个税一期' into release/个税版本
|
2023-09-06 11:40:34 +08:00 |
|
钱涛
|
f9611212d4
|
个税解析
|
2023-09-06 11:40:22 +08:00 |
|
sy
|
eb6fed2079
|
Merge remote-tracking branch 'remotes/origin/release/2.9.4.2308.02' into fix/230901-福利核算中处理核算结果逻辑中，查询sql分片
|
2023-09-06 10:17:41 +08:00 |
|
sy
|
d7b9485d18
|
薪酬系统-福利台账，核算数据中间表查询分片
|
2023-09-06 10:17:20 +08:00 |
|
钱涛
|
1451c4b192
|
定位解析异常
|
2023-09-06 10:14:52 +08:00 |
|
钱涛
|
8de418b28b
|
定位解析异常
|
2023-09-06 10:13:22 +08:00 |
|
sy
|
f6094cbc7a
|
薪酬系统-福利档案，非系统人员tab页列表
|
2023-09-06 10:04:58 +08:00 |
|
钱涛
|
6059174e7c
|
往期累计的在线获取
|
2023-09-06 09:40:50 +08:00 |
|
钱涛
|
f245bd2f49
|
新增往期累计字段
|
2023-09-05 11:04:53 +08:00 |
|
Harryxzy
|
6438558e7d
|
Merge branch 'release/2.9.4.2308.02' into custom/艾志工业-个税申报
|
2023-09-04 17:44:45 +08:00 |
|
Harryxzy
|
6f2436d808
|
新建调薪调整返回数据，为null时不返回“null”
|
2023-09-04 16:38:18 +08:00 |
|
钱涛
|
9867728d2e
|
在线获取累计专项附加扣除
|
2023-09-04 16:18:02 +08:00 |
|
钱涛
|
96bfdf05ed
|
在线获取累计专项附加扣除
|
2023-09-04 14:20:42 +08:00 |
|
Harryxzy
|
887280c763
|
Merge branch 'release/个税一期' into custom/艾志工业-个税申报
|
2023-09-04 14:16:11 +08:00 |
|
Harryxzy
|
32716cb504
|
Merge branch 'release/2.9.4.2308.02' into custom/艾志工业-个税申报
# Conflicts:
# src/com/engine/salary/service/SalaryArchiveService.java
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
|
2023-09-04 13:06:33 +08:00 |
|
钱涛
|
552eaa4589
|
Merge branch 'release/个税一期' into release/个税二期
|
2023-09-04 09:30:55 +08:00 |
|
钱涛
|
6871316f98
|
Merge branch 'release/2.9.4.2308.02' into release/个税一期
# Conflicts:
# resource/WEB-INF/prop/hrmSalaryCustom.properties
# src/com/engine/salary/service/SalaryEmployeeService.java
# src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
|
2023-09-04 09:30:24 +08:00 |
|
钱涛
|
c0c29b7472
|
在线获取累计专项附加扣除
|
2023-09-04 09:29:00 +08:00 |
|
钱涛
|
5ef4c8c909
|
解决sql202307100103.sql与组织冲突
|
2023-09-01 11:33:20 +08:00 |
|
钱涛
|
7c5e373b01
|
2
|
2023-09-01 09:23:43 +08:00 |
|
钱涛
|
0ac2fd248e
|
慢sql提醒
|
2023-08-31 16:22:02 +08:00 |
|
钱涛
|
2fad3c6c7c
|
Merge branch 'feature/慢sql检测' into release/2.9.4.2308.02
|
2023-08-31 15:46:29 +08:00 |
|
钱涛
|
283485929f
|
超时提醒
|
2023-08-31 15:31:34 +08:00 |
|
钱涛
|
feeb3d21f2
|
公式检测
|
2023-08-31 14:39:58 +08:00 |
|
sy
|
fac2bc21e0
|
Merge remote-tracking branch 'remotes/origin/feature/230802-ST数据库适配' into release/2.9.4.2308.02
|
2023-08-31 14:18:46 +08:00 |
|
sy
|
bc21cc7a2e
|
薪酬系统-福利档案，导入模板带出数据时，参考当前搜索条件
|
2023-08-31 14:18:00 +08:00 |
|
sy
|
cd5e5d2284
|
薪酬系统-ST数据库适配，神通数据库-薪酬非标初始化脚本
|
2023-08-31 14:04:41 +08:00 |
|
Harryxzy
|
f16f62304c
|
Merge branch 'feature/230901-自动同步结束发薪日期' into release/2.9.4.2308.02
|
2023-08-31 13:57:49 +08:00 |
|
Harryxzy
|
b90066e8b7
|
fixbug
|
2023-08-31 13:03:04 +08:00 |
|
Harryxzy
|
6ca1c6eae3
|
Merge branch 'fix/230802-薪资核算编辑时保留小数位数' into release/2.9.4.2308.02
|
2023-08-31 11:13:46 +08:00 |
|
Harryxzy
|
dbe659d81d
|
Merge branch 'fix/2309101-工资单模板给无分类项目重命名bug' into release/2.9.4.2308.02
|
2023-08-31 10:39:58 +08:00 |
|
钱涛
|
f7f1a85441
|
流量不足提醒
|
2023-08-31 10:34:26 +08:00 |
|
Harryxzy
|
2934a88cc2
|
同步薪资项目至账套
|
2023-08-31 10:23:14 +08:00 |