 钱涛
|
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 |
|
钱涛
|
858ac8f005
|
申报表对比功能sql
|
2024-01-18 11:44:57 +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
|
be68f01145
|
薪酬系统-福利档案，mysql环境中sql脚本优化
|
2024-01-15 09:45:19 +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 |
|
Harryxzy
|
c0c93490fe
|
sql
|
2024-01-08 15:32:49 +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 |