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 |
|
钱涛
|
36863c3695
|
报表
|
2023-04-23 10:14:32 +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 |
|
钱涛
|
19d5e979bb
|
修复删除报表和维度分页
|
2023-04-19 16:32:27 +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 |
|
钱涛
|
95dd20dc7b
|
报表接口
|
2023-04-18 18:55:38 +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 |
|
钱涛
|
6933d63cb1
|
自定义报表项目
|
2023-04-17 09:46:01 +08:00 |
|
钱涛
|
bc590b9ee8
|
自定义报表
|
2023-04-14 15:18:18 +08:00 |
|
钱涛
|
abf255d03c
|
暂存
|
2023-04-14 10:31:20 +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 |
|
钱涛
|
87701c7229
|
暂存
|
2023-04-13 15:13:05 +08:00 |
|
钱涛
|
2d8b538897
|
Merge remote-tracking branch 'origin/fix/employeeServiceFormat_0412' into feature/报表
|
2023-04-13 14:54:22 +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 |
|
钱涛
|
5ec4f9e649
|
暂存
|
2023-04-13 09:32:20 +08:00 |
|
Harryxzy
|
82ee707f16
|
employebiz改成employeeservice
|
2023-04-12 15:27:35 +08:00 |
|
钱涛
|
dc5c776d97
|
暂存
|
2023-04-12 15:03:19 +08:00 |
|
钱涛
|
58dbdb0d05
|
养老金
|
2023-04-12 09:39:53 +08:00 |
|
钱涛
|
1cbb889748
|
报表删除
|
2023-04-11 18:43:33 +08:00 |
|
钱涛
|
a4a829d201
|
年终奖数据
|
2023-04-11 17:24:31 +08:00 |
|
钱涛
|
0749fffcdb
|
统计维度
|
2023-04-11 14:00:41 +08:00 |
|
Harryxzy
|
e21b53c2df
|
Merge branch 'fix/deleteSalarySobAddCheck_0414' into release/2.7.3.2304.01
|
2023-04-11 14:00:26 +08:00 |
|
Harryxzy
|
bbe7edaa22
|
Merge branch 'feature/salaryBillAddSum-0323' into release/2.7.3.2304.01
|
2023-04-11 13:56:18 +08:00 |
|
钱涛
|
d7ab77dab1
|
暂存
|
2023-04-11 13:43:00 +08:00 |
|
Harryxzy
|
0bfe0b62a7
|
fix 字段重复无法保存
|
2023-04-11 11:43:32 +08:00 |
|
钱涛
|
95c8ee6a4f
|
修复mybatis
|
2023-04-11 11:31:20 +08:00 |
|
钱涛
|
bbcaa1a1e8
|
暂存
|
2023-04-11 11:02:03 +08:00 |
|
Harryxzy
|
8c58cf01b3
|
字段拷贝调整
|
2023-04-11 10:48:41 +08:00 |
|
Harryxzy
|
482f4dfc25
|
薪资项目名不允许包含大括号
|
2023-04-11 10:36:06 +08:00 |
|
Harryxzy
|
a286ac6f44
|
Merge branch 'fix/salaryArchiveImportByRuleBug_0407' into release/2.7.3.2304.01
|
2023-04-11 10:18:54 +08:00 |
|
Harryxzy
|
0ef8a2ae12
|
Merge branch 'fix/salaryItemHideDuplicateItem_0407' into release/2.7.3.2304.01
|
2023-04-11 10:16:28 +08:00 |
|
Harryxzy
|
593ad0d3a4
|
Merge branch 'fix/specialAddDeduction_cannotImport' into release/2.7.3.2304.01
|
2023-04-11 10:16:00 +08:00 |
|
sy
|
6bb5f8ddb4
|
Merge remote-tracking branch 'remotes/origin/feature/v4-closeEncryptSettingWithChange-0406' into release/2.7.3.2304.01
|
2023-04-11 10:10:59 +08:00 |
|
sy
|
8544abe1bc
|
Merge remote-tracking branch 'origin/release/2.7.3.2304.01' into release/2.7.3.2304.01
|
2023-04-11 10:08:05 +08:00 |
|
Harryxzy
|
c3dfc5692e
|
薪资项目拷贝
|
2023-04-11 09:56:20 +08:00 |
|
钱涛
|
09b2bf54e1
|
暂存
|
2023-04-11 09:22:09 +08:00 |
|
钱涛
|
ce0b8ce186
|
暂存
|
2023-04-10 12:43:48 +08:00 |
|
钱涛
|
739904d48f
|
暂存
|
2023-04-10 09:47:33 +08:00 |
|
Harryxzy
|
d9f041c9bb
|
账套删除前校验是否存在工资单模板
|
2023-04-07 16:06:47 +08:00 |
|
Harryxzy
|
207d338ec2
|
薪资账套重复薪资项目
|
2023-04-07 15:14:07 +08:00 |
|
钱涛
|
b0284022c1
|
核算导出全部功能修复
|
2023-04-07 14:39:22 +08:00 |
|
钱涛
|
b30a58c1d9
|
报表功能
|
2023-04-07 14:38:38 +08:00 |
|
Harryxzy
|
d5f6d053b3
|
修复累计专项附加扣除导出全部bug
|
2023-04-06 16:20:58 +08:00 |
|
Harryxzy
|
75d66e4cb9
|
专项附加扣除导入 批量更新分片
|
2023-04-06 16:07:42 +08:00 |
|
钱涛
|
bb76df3718
|
个人养老金
|
2023-04-04 17:29:56 +08:00 |
|
Harryxzy
|
accb0d3d2b
|
社保福利台账 - 合计列
|
2023-04-04 17:21:29 +08:00 |
|
sy
|
6a9d2a6fab
|
Merge remote-tracking branch 'origin/release/2.7.3.2304.01' into release/2.7.3.2304.01
|
2023-04-04 16:28:25 +08:00 |
|
sy
|
add7051759
|
薪酬系统, 适配金仓-个税申报单逻辑优化、薪资部分发放逻辑优化、删除initserviceimpl文件
|
2023-04-04 16:28:15 +08:00 |
|
钱涛
|
44fe9203ab
|
个人养老金
|
2023-04-04 14:21:25 +08:00 |
|
钱涛
|
cb46fccb16
|
工资单推送
|
2023-04-03 18:49:28 +08:00 |
|
sy
|
eb1d441de7
|
薪酬系统, 关闭加密方法优化
|
2023-04-03 16:07:37 +08:00 |
|
sy
|
521db08cde
|
Merge remote-tracking branch 'remotes/origin/feature/v4-salaryExcelFormat-0328' into release/2.7.3.2304.01
# Conflicts:
# src/com/engine/salary/service/SalaryAcctExcelService.java
# src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
|
2023-04-03 15:59:58 +08:00 |
|
Harryxzy
|
5847f3f449
|
Merge branch 'fix/salaryTemplateUpdateBug_0407' into release/2.7.3.2304.01
|
2023-04-03 11:31:49 +08:00 |
|
Harryxzy
|
c97407c2ac
|
工资单模板修复
|
2023-04-03 11:31:09 +08:00 |
|
Harryxzy
|
dcfe6479ed
|
Merge branch 'feature/cancelSuspend' into release/2.7.3.2304.01
|
2023-04-03 11:12:20 +08:00 |
|
Harryxzy
|
4faa9e36a6
|
取消待办优化
|
2023-03-31 10:17:31 +08:00 |
|
Harryxzy
|
40b38b5347
|
社保福利档案列表提速
|
2023-03-30 22:52:52 +08:00 |
|
sy
|
31bf7cfd99
|
薪酬系统-薪资核算和档案，excel导出行高自适应
|
2023-03-30 17:26:55 +08:00 |
|
Harryxzy
|
30660ce04b
|
工资单模板，无法修改薪资项为0时不显示
|
2023-03-30 13:33:52 +08:00 |
|
sy
|
0427ec5ed4
|
薪酬系统, 关闭加密方法优化
|
2023-03-30 11:44:21 +08:00 |
|
Harryxzy
|
52decb10ff
|
Merge branch 'feature/salaryBillAddSum-0323' into release/2.7.3.2304.01
|
2023-03-30 11:03:22 +08:00 |
|
Harryxzy
|
f0c80f3287
|
薪资档案导入无法带出工号数据
|
2023-03-30 10:02:09 +08:00 |
|
Harryxzy
|
295331d1a5
|
按照工号导入，支持不输入姓名
|
2023-03-30 09:49:49 +08:00 |
|
Harryxzy
|
2fc4560488
|
薪资档案按照工号导入无效
|
2023-03-29 16:46:10 +08:00 |
|
Harryxzy
|
ef3260085f
|
修复重新核算，往期累计删多数据
|
2023-03-28 14:18:01 +08:00 |
|
Harryxzy
|
b331152d27
|
修复合计列
|
2023-03-28 13:59:57 +08:00 |
|
Harryxzy
|
d99e6147d3
|
Merge branch 'feature/salaryBillAddSum-0323' into release/2.7.3.2304.01
|
2023-03-28 13:40:12 +08:00 |
|
Harryxzy
|
952a8e845c
|
修复合计列
|
2023-03-28 11:00:18 +08:00 |
|
Harryxzy
|
2dc40a7b91
|
取消待办
|
2023-03-28 10:10:54 +08:00 |
|
Harryxzy
|
95cf271c80
|
修复薪资档案导入，重复数据报错行数少一
|
2023-03-28 09:31:00 +08:00 |
|
Harryxzy
|
530dcd7028
|
Merge branch 'feature/SalaryAcctResult-ImportField-cache_0324' into release/2.7.3.2304.01
|
2023-03-27 17:36:41 +08:00 |
|
钱涛
|
9f6950d8ae
|
工资单发放
|
2023-03-20 17:36:29 +08:00 |
|
Harryxzy
|
1ab7fcc7b8
|
Merge branch 'feature/salaryBillAddSum-0323' into release/2.7.1.2303.02
|
2023-03-16 17:20:43 +08:00 |
|
Harryxzy
|
3304ffdbd5
|
薪资核算导入，添加表头字段缓存功能
|
2023-03-16 16:19:23 +08:00 |
|
Harryxzy
|
e1b4927eaa
|
删除多余代码
|
2023-03-16 14:52:08 +08:00 |
|
sy
|
dc2cb5f448
|
薪酬系统-薪资核算，薪资核算和薪资档案导出excel通用格式改造
|
2023-03-16 13:51:41 +08:00 |
|
Harryxzy
|
b9c40955ac
|
Merge branch 'fix/AddUpSituationCantImport_0316' into release/2.7.1.2303.02
|
2023-03-16 11:38:38 +08:00 |
|
Harryxzy
|
cdf7dd916b
|
往期累计情况编辑
|
2023-03-16 11:37:43 +08:00 |
|
Harryxzy
|
6a7e5eacdc
|
社保福利台账合计列
|
2023-03-16 11:17:18 +08:00 |
|
Harryxzy
|
521de26b51
|
Merge branch 'fix/AddUpSituationCantImport_0316' into release/2.7.1.2303.02
|
2023-03-16 09:54:49 +08:00 |