sy
|
60e792d481
|
薪酬系统-福利台账，自动核算并归档功能优化
|
2024-01-23 14:46:29 +08:00 |
 钱涛
|
70b7e556af
|
Merge remote-tracking branch 'origin/release/2.10.1.2401.01' into release/2.10.1.2401.01
|
2024-01-23 14:07:02 +08:00 |
|
钱涛
|
887ec2084a
|
导出excel工具类
|
2024-01-23 14:06:56 +08:00 |
|
sy
|
2a67ca9238
|
薪酬系统-工资单模板，复制功能改造2
|
2024-01-23 13:55:49 +08:00 |
Harryxzy
|
2d24fbfa23
|
回算工资单发放后不能再次回算
|
2024-01-23 11:34:36 +08:00 |
|
钱涛
|
ce5c106845
|
对比功能添加筛选是否显示差异人员和差异项
|
2024-01-23 11:23:50 +08:00 |
|
sy
|
94d72cd93c
|
薪酬系统-工资单模板，复制功能改造
|
2024-01-23 10:52:53 +08:00 |
|
Harryxzy
|
c9220d62e1
|
Merge branch 'fix/240101_非系统人员搜索不生效' into release/2.10.1.2401.01
|
2024-01-23 10:01:53 +08:00 |
|
Harryxzy
|
a3e281b3fe
|
修复非系统人员搜索不生效
|
2024-01-23 10:00:26 +08:00 |
|
钱涛
|
6ee8b5f044
|
解决短信不换行问题
|
2024-01-22 15:41:38 +08:00 |
|
钱涛
|
a168aeef53
|
对比线下结果，分页显示
|
2024-01-22 14:15:36 +08:00 |
|
钱涛
|
5d3a371f56
|
报表支持文本
|
2024-01-22 11:45:40 +08:00 |
|
sy
|
56651196fa
|
Merge remote-tracking branch 'remotes/origin/release/2.9.10.2312.02' into feature/231202-福利台账自动核算并归档
|
2024-01-22 11:03:37 +08:00 |
|
钱涛
|
d09034b17b
|
报表支持文本
|
2024-01-22 10:38:18 +08:00 |
|
sy
|
e8aee9ab64
|
薪酬系统-福利档案，档案编辑页详情接口增加返回缺失福利项数值
|
2024-01-19 17:32:52 +08:00 |
|
sy
|
f236b8e655
|
薪酬系统-福利台账，核算相关方法梳理和优化
|
2024-01-19 11:35:11 +08:00 |
|
钱涛
|
40013d698b
|
暂存
|
2024-01-18 15:12:00 +08:00 |
|
钱涛
|
e71edd1a7b
|
申报表对比功能
|
2024-01-18 09:54:56 +08:00 |
|
sy
|
29e5c27ffb
|
薪酬系统-福利台账，自动核算并归档任务类开发
|
2024-01-17 16:07:27 +08:00 |
|
钱涛
|
4846cfcf18
|
Merge branch 'release/2.9.10.2312.02' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
|
2024-01-17 14:14:32 +08:00 |
|
钱涛
|
a3aa0f5ca1
|
自适应文字长度
|
2024-01-17 10:55:42 +08:00 |
|
钱涛
|
3f49076a19
|
Merge remote-tracking branch 'origin/release/2.9.10.2312.02' into release/2.9.10.2312.02
|
2024-01-16 16:35:45 +08:00 |
|
钱涛
|
db4b44e62c
|
修复非系统人员状态bug
|
2024-01-16 16:35:37 +08:00 |
|
Harryxzy
|
f4bb757538
|
Merge branch 'feature/240101_薪资档案增加起始、结束发薪筛选' into release/2.9.10.2312.02
|
2024-01-15 18:48:16 +08:00 |
|
Harryxzy
|
0a6467aaa6
|
薪资档案增加起始、结束发薪筛选
|
2024-01-15 18:48:05 +08:00 |
|
Harryxzy
|
e38fd9be99
|
薪资档案增加起始、结束发薪筛选
|
2024-01-15 10:51:53 +08:00 |
|
sy
|
e9aba73172
|
Merge remote-tracking branch 'remotes/origin/feature/231202-福利档案导入基数值自动调整' into release/2.9.10.2312.02
|
2024-01-15 09:46:29 +08:00 |
|
sy
|
3b761341fc
|
薪酬系统-福利档案，档案导入功能优化，增加基数自动调整逻辑
|
2024-01-10 11:20:36 +08:00 |
|
Harryxzy
|
f5aa425f2c
|
fix公式，人员状态变量没有值bug
|
2024-01-09 13:21:45 +08:00 |
|
钱涛
|
e0d4820e2e
|
暂存
|
2024-01-09 10:53:59 +08:00 |
|
钱涛
|
c54f9daa2d
|
暂存
|
2024-01-08 16:00:15 +08:00 |
|
Harryxzy
|
8164660ebf
|
Merge branch 'feature/231202-批量编辑' into release/2.9.10.2312.02
# Conflicts:
# src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
|
2024-01-08 15:34:32 +08:00 |
|
Harryxzy
|
5ecf069a79
|
Merge branch 'feature/240101_工资单发送action' into release/2.9.10.2312.02
|
2024-01-08 15:33:16 +08:00 |
|
Harryxzy
|
5f7c1c641b
|
Merge remote-tracking branch 'origin/release/2.9.10.2312.02' into release/2.9.10.2312.02
|
2024-01-08 15:33:11 +08:00 |
|
Harryxzy
|
9232dedbbf
|
Merge branch 'feature/240101_薪资项目宽度' into release/2.9.10.2312.02
|
2024-01-08 15:33:11 +08:00 |
|
sy
|
a16ed64ac0
|
Merge remote-tracking branch 'remotes/origin/feature/231201-福利档案拆分个人和公司福利基数' into release/2.9.10.2312.02
|
2024-01-08 13:54:25 +08:00 |
|
sy
|
681c0fb18e
|
薪酬系统-福利档案，档案编辑中更新档案主表和子表的关联关系
|
2024-01-08 10:57:55 +08:00 |
|
钱涛
|
2670236f9c
|
暂存
|
2024-01-08 09:52:04 +08:00 |
|
钱涛
|
be25234e0e
|
对比
|
2024-01-04 15:56:42 +08:00 |
|
钱涛
|
f3fa6c6f32
|
对比
|
2024-01-04 15:35:23 +08:00 |
|
Harryxzy
|
9ca420b5e6
|
fix删除义务人时，没分片
|
2024-01-04 10:39:41 +08:00 |
|
钱涛
|
482c461ce9
|
fix作废接口bug
|
2024-01-03 15:36:53 +08:00 |
|
钱涛
|
fcf0483365
|
补充申报表未填写状态
|
2024-01-03 13:47:19 +08:00 |
|
钱涛
|
4150948599
|
撤销更正申报
|
2024-01-03 10:40:55 +08:00 |
|
Harryxzy
|
7945c84fbb
|
薪资项目宽度
|
2024-01-02 16:37:07 +08:00 |
|
Harryxzy
|
fe00f5c0e7
|
工资单发送action
|
2024-01-02 14:40:33 +08:00 |
|
Harryxzy
|
dbcd6cc0b2
|
人员信息报送导入，申报状态
|
2024-01-02 13:46:14 +08:00 |
|
Harryxzy
|
4c233fb168
|
人员信息报送导入，申报状态
|
2024-01-02 13:44:57 +08:00 |
|
钱涛
|
4cdd7616d9
|
申报前清除错误日志
|
2024-01-02 10:18:25 +08:00 |
|
Harryxzy
|
573fa6b917
|
Merge remote-tracking branch 'origin/release/个税版本' into release/个税版本
|
2024-01-02 09:41:42 +08:00 |
|
Harryxzy
|
dc3533d753
|
人员信息报送导入分页
|
2024-01-02 09:41:30 +08:00 |
|
钱涛
|
ac2046a8e7
|
新增、删除申报表
|
2023-12-29 17:24:52 +08:00 |
|
钱涛
|
bca7697d75
|
取消全年一次性奖金限制
|
2023-12-29 11:46:00 +08:00 |
|
Harryxzy
|
f03c0d0147
|
薪资项目同步至账套功能，过滤没有权限的账套
|
2023-12-29 10:27:35 +08:00 |
|
钱涛
|
79ba7c754c
|
申报反馈
|
2023-12-28 20:59:13 +08:00 |
|
钱涛
|
8456692b29
|
Merge branch 'feature/个税2312版本功能' into feature/艾志-正常申报补足年终奖人员
|
2023-12-28 18:49:05 +08:00 |
|
钱涛
|
b1e1aeffd7
|
Merge branch 'release/个税版本' into feature/个税2312版本功能
|
2023-12-28 18:48:52 +08:00 |
|
钱涛
|
df16be5dd7
|
导入申报表
|
2023-12-28 18:45:52 +08:00 |
|
钱涛
|
463e56d2cf
|
导入申报表
|
2023-12-28 18:12:38 +08:00 |
|
Harryxzy
|
97f640b39a
|
Merge remote-tracking branch 'origin/release/个税版本' into release/个税版本
|
2023-12-28 16:44:14 +08:00 |
|
Harryxzy
|
622bd9ceb8
|
人员信息报送导入
|
2023-12-28 16:44:01 +08:00 |
|
钱涛
|
4d84164d48
|
Merge branch 'feature/个税2312版本功能' into feature/艾志-正常申报补足年终奖人员
|
2023-12-28 15:49:50 +08:00 |
|
钱涛
|
e2b341b675
|
Merge branch 'release/个税版本' into feature/个税2312版本功能
|
2023-12-28 15:49:28 +08:00 |
|
钱涛
|
4a2996e211
|
Merge branch 'release/2.9.10.2312.02' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java
# src/com/engine/salary/util/excel/ExcelUtil.java
|
2023-12-28 15:48:54 +08:00 |
|
钱涛
|
7e22711dcd
|
导入工具
|
2023-12-28 15:47:05 +08:00 |
|
钱涛
|
06fe3144ba
|
导入模板
|
2023-12-28 15:37:01 +08:00 |
|
钱涛
|
fefb8264c8
|
导入功能
|
2023-12-28 15:36:27 +08:00 |
|
钱涛
|
4e0a5b4b7f
|
下载内置算税明细
|
2023-12-28 14:09:34 +08:00 |
|
钱涛
|
0a16415d9a
|
Merge branch 'feature/个税2312版本功能' into feature/艾志-正常申报补足年终奖人员
|
2023-12-28 10:11:55 +08:00 |
|
Harryxzy
|
0f4d92f302
|
人员信息报送身份中号转为大写
|
2023-12-28 10:10:08 +08:00 |
|
钱涛
|
8b78ccd43b
|
Merge branch 'release/个税版本' into feature/个税2312版本功能
|
2023-12-28 09:51:34 +08:00 |
|
钱涛
|
1c499ffd94
|
补充正常工资薪金的申报
|
2023-12-28 09:39:09 +08:00 |
|
钱涛
|
7e561527ac
|
补充正常工资薪金的申报
|
2023-12-27 17:35:16 +08:00 |
|
钱涛
|
13f310e9e4
|
记录申报表数据来源
|
2023-12-27 17:33:53 +08:00 |
|
Harryxzy
|
2dc7e7f541
|
人员信息报送导入
|
2023-12-27 16:58:47 +08:00 |
|
钱涛
|
14c97d8df9
|
日志
|
2023-12-27 14:26:25 +08:00 |
|
Harryxzy
|
e976c7aaec
|
oracle工资单模板保存异常
|
2023-12-27 09:32:31 +08:00 |
|
Harryxzy
|
2797745448
|
人员信息报送-导入
|
2023-12-26 17:45:06 +08:00 |
|
Harryxzy
|
2ed856ac18
|
Merge branch 'fix/231202-个税扣缴以为人根据名称查询' into release/2.9.10.2312.02
|
2023-12-25 16:32:11 +08:00 |
|
Harryxzy
|
e67cb5bf83
|
个税扣缴义务人like分成3个
|
2023-12-25 16:31:36 +08:00 |
|
sy
|
a5eb86ab06
|
薪酬系统-福利台账，线下对比导入功能优化，适配福利基数个人和公司导入
|
2023-12-21 13:33:21 +08:00 |
|
钱涛
|
c581c8d74d
|
导出申报表明细
|
2023-12-20 17:21:46 +08:00 |
|
钱涛
|
e8223a832b
|
缓存识别条件
|
2023-12-16 12:40:33 +08:00 |
|
钱涛
|
bda3d7080b
|
缓存识别条件
|
2023-12-16 12:36:56 +08:00 |
|
钱涛
|
4f8606b00e
|
缓存识别条件
|
2023-12-16 12:35:24 +08:00 |
|
sy
|
7cb0e68623
|
薪酬系统-福利档案，福利档案编辑页公司基数信息返回逻辑优化
|
2023-12-15 09:50:20 +08:00 |
|
钱涛
|
d9c952e80c
|
申报表明细新增、编辑
|
2023-12-14 17:55:48 +08:00 |
|
Harryxzy
|
14cb45f4bc
|
Merge remote-tracking branch 'origin/release/2.9.10.2312.02' into release/2.9.10.2312.02
|
2023-12-14 16:00:46 +08:00 |
|
Harryxzy
|
85f009984c
|
Merge branch 'fix/231202_补发工资单回算项' into release/2.9.10.2312.02
|
2023-12-14 16:00:24 +08:00 |
|
Harryxzy
|
e97a35f158
|
新建补发工资单模板时，已发补发项目fix
|
2023-12-14 15:57:55 +08:00 |
|
sy
|
2685c724e4
|
薪酬系统-福利档案，福利档案编辑页方案基础信息返回逻辑优化
|
2023-12-14 13:59:39 +08:00 |
|
钱涛
|
4810bfb73e
|
Merge branch 'release/个税版本' into feature/个税2312版本功能
|
2023-12-14 10:42:15 +08:00 |
|
钱涛
|
0856f63ca5
|
Merge branch 'release/2.9.10.2312.02' into release/个税版本
# Conflicts:
# src/com/engine/salary/util/page/SalaryPageUtil.java
|
2023-12-14 10:41:37 +08:00 |
|
钱涛
|
d53897d147
|
Merge remote-tracking branch 'origin/release/2.9.10.2312.02' into release/2.9.10.2312.02
|
2023-12-14 10:40:06 +08:00 |
|
钱涛
|
96d37b1b68
|
修复申报表明细
|
2023-12-14 10:39:49 +08:00 |
|
钱涛
|
0a54fe5f80
|
新增申报
|
2023-12-14 10:35:10 +08:00 |
|
钱涛
|
a5ffe12509
|
身份证最后一位x转大写
|
2023-12-13 19:34:10 +08:00 |
|
钱涛
|
fa30083d07
|
人员报送导入模板
|
2023-12-13 17:52:51 +08:00 |
|
Harryxzy
|
cfbddef42a
|
核算记录归档action
|
2023-12-13 09:58:00 +08:00 |
|
钱涛
|
f53922a3ab
|
去除作废接口限制
|
2023-12-12 17:18:56 +08:00 |