 钱涛
|
9dc41706b2
|
Merge branch 'release/2.7.4.2304.02' into feature/公式
|
2023-05-04 14:40:50 +08:00 |
|
钱涛
|
790d24b7db
|
Merge branch 'feature/维护工具' into release/2.7.4.2304.02
|
2023-04-28 14:38:11 +08:00 |
|
钱涛
|
0aabcd0471
|
将除重新核算的项目外的所有的值都锁定
|
2023-04-28 14:37:59 +08:00 |
|
钱涛
|
0bd16c3f25
|
Merge branch 'feature/维护工具' into release/2.7.4.2304.02
|
2023-04-28 14:07:32 +08:00 |
|
钱涛
|
1529a30768
|
薪资项目取消过滤档案，使得导入功能一页面为准
|
2023-04-27 09:22:20 +08:00 |
|
钱涛
|
f47ad2a7a3
|
注释接口
|
2023-04-25 18:04:05 +08:00 |
sy
|
6ad8c84a04
|
Merge remote-tracking branch 'remotes/origin/feature/v4-siAcctImprove-0420' into release/2.7.4.2304.02
|
2023-04-25 17:40:05 +08:00 |
|
钱涛
|
40cd70e2a3
|
Merge branch 'release/2.7.4.2304.02' into feature/公式
|
2023-04-25 17:39:33 +08:00 |
|
sy
|
cb36dc2904
|
薪酬系统-福利档案，档案编辑功能增加对年月的格式校验
|
2023-04-25 17:38:54 +08:00 |
|
钱涛
|
59c32b24e6
|
补算
|
2023-04-25 17:08:42 +08:00 |
|
钱涛
|
77ce806b37
|
sysadmin不显示申报记录
|
2023-04-25 10:43:40 +08:00 |
|
钱涛
|
a611301651
|
Merge remote-tracking branch 'origin/release/2.7.4.2304.02' into release/2.7.4.2304.02
|
2023-04-25 10:12:01 +08:00 |
|
钱涛
|
c0060ba358
|
Merge branch 'feature/维护工具' into release/2.7.4.2304.02
|
2023-04-25 10:11:40 +08:00 |
|
sy
|
cea8d14c18
|
Merge remote-tracking branch 'remotes/origin/feature/v4-siAcctImprove-0420' into release/2.7.4.2304.02
|
2023-04-25 09:22:03 +08:00 |
|
钱涛
|
cef3d26693
|
维护工具
|
2023-04-24 14:55:32 +08:00 |
|
sy
|
1f7c271519
|
薪酬系统-福利档案，待减员tab页删除待办，添加个税扣缴义务人范围过滤
|
2023-04-24 14:47:28 +08:00 |
|
sy
|
61326928df
|
Merge remote-tracking branch 'remotes/origin/feature/v4-siAcctImprove-0420' into release/2.7.4.2304.02
|
2023-04-24 14:07:28 +08:00 |
Harryxzy
|
e2570dc520
|
Merge branch 'feature/salaryItemFieldsCanCopy_0420' into release/2.7.4.2304.02
|
2023-04-24 11:03:17 +08:00 |
|
sy
|
27969cff80
|
薪酬系统-福利台账，补差导入处理合计值为null的情况
|
2023-04-24 10:11:02 +08:00 |
|
钱涛
|
4034c5cdb0
|
Merge branch 'feature/维护工具' into release/2.7.4.2304.02
|
2023-04-24 09:26:46 +08:00 |
|
钱涛
|
c94d5169f0
|
维护工具
|
2023-04-24 09:19:18 +08:00 |
|
sy
|
c686f52153
|
薪酬系统-福利台账，补差导入部分福利项缴费信息相关合计逻辑优化
|
2023-04-23 18:05:32 +08:00 |
|
钱涛
|
598ff0cf9a
|
Merge remote-tracking branch 'origin/feature/维护工具' into feature/维护工具
|
2023-04-23 18:00:41 +08:00 |
|
钱涛
|
5c936a0334
|
补算
|
2023-04-23 18:00:30 +08:00 |
|
Harryxzy
|
468dd092a7
|
恢复往期累计数据 接口
|
2023-04-23 17:43:02 +08:00 |
|
Harryxzy
|
ad6b9a1eb0
|
Merge remote-tracking branch 'origin/feature/维护工具' into feature/维护工具
|
2023-04-23 17:37:14 +08:00 |
|
Harryxzy
|
31235096bb
|
恢复往期累计数据
|
2023-04-23 17:37:06 +08:00 |
|
钱涛
|
f4ebcf987c
|
维护估计控制层
|
2023-04-23 17:30:43 +08:00 |
|
sy
|
37310f02f6
|
薪酬系统-福利台账，补差导入相关合计项计算逻辑优化
|
2023-04-23 16:35:52 +08:00 |
|
钱涛
|
413de52d6a
|
维护工具v1
|
2023-04-23 16:27:11 +08:00 |
|
sy
|
c9a5228f3e
|
Merge remote-tracking branch 'remotes/origin/feature/v4-siAcctImprove-0420' into release/2.7.4.2304.02
|
2023-04-23 13:36:28 +08:00 |
|
sy
|
d56e9aff82
|
薪酬系统，导出excel的title行背景置为灰色
|
2023-04-23 13:35:17 +08:00 |
|
钱涛
|
ce8ca9cdb8
|
分部实现逻辑
|
2023-04-21 13:52:57 +08:00 |
|
钱涛
|
4a9df2276d
|
分部计算类
|
2023-04-21 11:25:16 +08:00 |
|
钱涛
|
d2b304e690
|
全量数据
|
2023-04-20 18:04:18 +08:00 |
|
钱涛
|
135530d3b7
|
全量数据
|
2023-04-20 17:55:37 +08:00 |
|
Harryxzy
|
3a555c1866
|
修复已发
|
2023-04-20 13:08:58 +08:00 |
|
钱涛
|
ef171db128
|
公式函数
|
2023-04-19 19:28:05 +08:00 |
|
钱涛
|
9994ae3df9
|
公式
|
2023-04-19 15:22:42 +08:00 |
|
钱涛
|
34f33d21d8
|
公式
|
2023-04-19 13:35:35 +08:00 |
|
钱涛
|
a19b19e23d
|
公式
|
2023-04-19 10:15:01 +08:00 |
|
sy
|
62af02522c
|
薪酬系统-福利台账，线下对比（列表、导入、导出）福利项字段根据正常缴纳中的核算字段获得
|
2023-04-18 14:21:05 +08:00 |
|
钱涛
|
aeab5c75f5
|
往期修复
|
2023-04-18 11:45:30 +08:00 |
|
钱涛
|
c5d9ea5421
|
累计个人养老金bug
|
2023-04-18 11:03:09 +08:00 |
|
sy
|
f68981baac
|
薪酬系统-福利台账，福利核算、核算明细列表逻辑优化（取消对档案状态的过滤）
|
2023-04-17 10:27:31 +08:00 |
|
Harryxzy
|
b5d3acf418
|
Merge branch 'feature/salaryItemFieldsCanCopy_0420' into release/2.7.3.2304.01
|
2023-04-14 09:04:23 +08:00 |
|
钱涛
|
a87c344581
|
个人养老金
|
2023-04-13 17:14:58 +08:00 |
|
钱涛
|
15d6a63df6
|
薪酬上下文
|
2023-04-13 11:53:43 +08:00 |
|
钱涛
|
deb2e367f4
|
薪酬上下文
|
2023-04-13 11:53:08 +08:00 |
|
钱涛
|
59a38954bc
|
Merge branch 'feature/个人养老金' into release/2.7.3.2304.01
# Conflicts:
# src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java
|
2023-04-13 09:35:29 +08:00 |