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 |
|
钱涛
|
ed29be3701
|
日志
|
2023-12-26 18:47:45 +08:00 |
|
钱涛
|
7d1ce983dd
|
日志
|
2023-12-26 17:49:50 +08:00 |
|
Harryxzy
|
2797745448
|
人员信息报送-导入
|
2023-12-26 17:45:06 +08:00 |
|
钱涛
|
b7435554e8
|
操作日志前端接口
|
2023-12-26 16:12:44 +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 |
|
钱涛
|
8b5703c894
|
薪资项目操作日志
|
2023-12-25 09:36:23 +08:00 |
|
钱涛
|
ea8d51c493
|
薪资项目操作日志
|
2023-12-22 16:36:11 +08:00 |
|
钱涛
|
7a23324744
|
修改elog版本表名
|
2023-12-22 14:52:09 +08:00 |
|
钱涛
|
bd0edcf8e2
|
日志组件
|
2023-12-22 14:50:16 +08:00 |
|
钱涛
|
7e980db4b3
|
日志组件
|
2023-12-21 20:25:00 +08:00 |
|
钱涛
|
83a41da11d
|
日志组件
|
2023-12-21 14:30:21 +08:00 |
|
sy
|
a5eb86ab06
|
薪酬系统-福利台账，线下对比导入功能优化，适配福利基数个人和公司导入
|
2023-12-21 13:33:21 +08:00 |
|
钱涛
|
b20a3ef103
|
暂存
|
2023-12-20 21:00:48 +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 |
|
Harryxzy
|
5fba05bc43
|
Merge branch 'fix/核算、线下对比导出优化' into release/2.9.9.2312.01
|
2023-12-12 14:22:44 +08:00 |
|
Harryxzy
|
51022c0a16
|
薪资核算结果、线下对比下载导入模板优化fix
|
2023-12-12 14:22:18 +08:00 |
|
Harryxzy
|
d38ef4769b
|
Merge remote-tracking branch 'origin/release/2.9.9.2312.01' into release/2.9.9.2312.01
|
2023-12-12 14:12:19 +08:00 |
|
Harryxzy
|
5c50b61cd5
|
Merge branch 'fix/核算、线下对比导出优化' into release/2.9.9.2312.01
|
2023-12-12 14:12:14 +08:00 |
|
Harryxzy
|
9602e48e74
|
薪资核算结果、线下对比下载导入模板优化fix
|
2023-12-12 14:11:48 +08:00 |
|
钱涛
|
b78f4302e0
|
小数位
|
2023-12-12 13:18:17 +08:00 |
|
钱涛
|
4d573956c8
|
修复账套税款所属期初始化bug
|
2023-12-12 11:06:25 +08:00 |
|
Harryxzy
|
9c454623bc
|
Merge branch 'fix/核算、线下对比导出优化' into release/2.9.9.2312.01
|
2023-12-12 10:32:30 +08:00 |
|
Harryxzy
|
559ba88e9f
|
薪资核算结果、线下对比下载导入模板优化
|
2023-12-12 10:32:04 +08:00 |
|
Harryxzy
|
929bcc7877
|
薪资核算结果、线下对比下载导入模板优化
|
2023-12-12 10:18:10 +08:00 |
|
钱涛
|
04e3225c98
|
自适应
|
2023-12-12 10:07:31 +08:00 |
|
Harryxzy
|
d6705e8917
|
产品-批量编辑
|
2023-12-11 13:09:20 +08:00 |
|
Harryxzy
|
2b6b1ef2c4
|
Merge branch 'custom/鲁控数字' into feature/231202-批量编辑
|
2023-12-11 11:36:59 +08:00 |
|
钱涛
|
e495c1799f
|
自定义
|
2023-12-11 09:52:47 +08:00 |
|
钱涛
|
82ec08bfd9
|
导出申报明细
|
2023-12-08 18:15:56 +08:00 |
|
sy
|
9d0d7a00fc
|
薪酬系统-福利台账，线下对比列表、导入、导出，适配拆分福利档案个人和公司基数逻辑
|
2023-12-08 18:06:54 +08:00 |
|
钱涛
|
942f6baa32
|
Merge branch 'release/个税版本' into feature/申报明细
# Conflicts:
# src/com/engine/salary/web/EmployeeDeclareController.java
|
2023-12-08 16:44:38 +08:00 |
|
Harryxzy
|
8138b5297f
|
薪酬报表添加文本统计项目时，字符去值规则没有保存进去
|
2023-12-08 11:41:13 +08:00 |
|
sy
|
1c5249c76e
|
薪酬系统-福利台账，福利核算、明细列表、导出数据，适配拆分福利档案个人和公司基数逻辑
|
2023-12-08 11:16:18 +08:00 |
|
钱涛
|
48f5d5ab0e
|
适配分部门企业注册
|
2023-12-07 15:48:06 +08:00 |
|
sy
|
bb1b785f55
|
薪酬系统-福利档案，导出功能，根据区分个人和公司福利基数逻辑改造
|
2023-12-07 11:06:19 +08:00 |
|
sy
|
1287a97fe5
|
薪酬系统-福利档案，导入模板下载、导入、基数调整记录功能，根据区分个人和公司福利基数逻辑改造
|
2023-12-07 09:41:46 +08:00 |
|
钱涛
|
009a3e3c74
|
人员报送导出
修复清除离职日期bug
|
2023-12-06 16:37:42 +08:00 |
|
Harryxzy
|
419baeb8cd
|
鲁控数字
|
2023-12-06 16:05:08 +08:00 |
|
Harryxzy
|
2a02e17c15
|
temp
|
2023-12-06 15:55:47 +08:00 |
|
sy
|
6dca2a4380
|
薪酬系统-福利档案，开启开关时，档案列表展示，区分个人和公司福利基数
|
2023-12-06 15:38:19 +08:00 |
|
钱涛
|
e093c6aa7e
|
申报明细
|
2023-12-06 15:19:07 +08:00 |
|
sy
|
ec8cb6214d
|
薪酬系统-福利档案，档案明细编辑保存功能改造，适配福利档案福利基数拆分个人和公司需求
|
2023-12-06 14:04:12 +08:00 |
|
sy
|
451c9fb07b
|
薪酬系统-福利档案，档案明细获取逻辑改造，根据应用设置中的区分开关，判定后将公司的福利基数信息单独区分返回
|
2023-12-06 09:51:07 +08:00 |
|
钱涛
|
54d8f3ef39
|
修复人员信息无法置空问题
|
2023-12-05 17:17:11 +08:00 |
|
钱涛
|
1a061aa346
|
同步所有人员报送发薪日期为入职日期
|
2023-12-05 17:08:35 +08:00 |
|
钱涛
|
791bc2ffca
|
Merge branch 'release/2.9.9.2312.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/SalaryArchiveService.java
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
|
2023-12-05 15:09:40 +08:00 |
|
钱涛
|
390251bd63
|
Merge remote-tracking branch 'origin/release/2.9.9.2312.01' into release/2.9.9.2312.01
|
2023-12-05 15:08:44 +08:00 |
|
钱涛
|
dd48bff747
|
同步所有档案起始发薪日期为入职日期
|
2023-12-05 15:08:37 +08:00 |
|
钱涛
|
045873525c
|
个税云查询报税明细
|
2023-12-05 14:58:02 +08:00 |
|
Harryxzy
|
4eb931686e
|
鲁控数字temp
|
2023-12-05 14:57:34 +08:00 |
|
Harryxzy
|
3687bdfcdc
|
Merge remote-tracking branch 'origin/release/2.9.9.2312.01' into release/2.9.9.2312.01
|
2023-12-05 11:30:04 +08:00 |
|
Harryxzy
|
b093717e46
|
Merge branch 'fix/231102_账套增加义务人筛选' into release/2.9.9.2312.01
|
2023-12-05 11:28:47 +08:00 |
|
sy
|
ce10204dab
|
Merge remote-tracking branch 'remotes/origin/feature/231102-福利台账，补差待编辑项扩充其他可缴纳福利项' into release/2.9.9.2312.01
|
2023-12-05 11:26:48 +08:00 |
|
Harryxzy
|
a0331112be
|
Merge branch 'fie/231102_线下对比列头改造' into release/2.9.9.2312.01
|
2023-12-05 11:26:22 +08:00 |
|
sy
|
362c4d4459
|
薪酬系统-福利台账，正常缴纳和补缴中未设置缴纳的福利项导入校验优化，忽略为null的福利类缴纳map
|
2023-12-05 10:21:47 +08:00 |
|
sy
|
cecbd16508
|
薪酬系统-福利台账，正常缴纳和补缴中未设置缴纳的福利项，不允许导入核算数据
|
2023-12-04 15:10:46 +08:00 |
|
钱涛
|
121da2f7ad
|
个税云参数调整
|
2023-12-01 11:46:21 +08:00 |
|
钱涛
|
819937edeb
|
修复税号查询
|
2023-11-30 10:09:26 +08:00 |
|
钱涛
|
d9a27c2b9a
|
Merge branch 'release/2.9.9.2312.01' into release/个税版本
|
2023-11-29 17:46:31 +08:00 |
|
钱涛
|
3f61807401
|
修复核算结果可能为0
|
2023-11-29 17:45:16 +08:00 |
|
Harryxzy
|
df25f99544
|
薪资核算固定列头
|
2023-11-29 16:48:09 +08:00 |
|
sy
|
eaa8a45376
|
薪酬系统-福利台账，编辑功能带出福利项数据逻辑优化，增加缴纳对象（公司或个人）标志字段
|
2023-11-29 13:50:25 +08:00 |
|
sy
|
ce8ac2c125
|
薪酬系统-福利台账，编辑功能带出福利项数据逻辑优化，增加福利类别标志字段
|
2023-11-29 11:04:14 +08:00 |
|
sy
|
22d749dcb3
|
Merge remote-tracking branch 'remotes/origin/fix/231101-福利档案及模板导出后文件损坏问题修复' into feature/231102-福利台账，补差待编辑项扩充其他可缴纳福利项
|
2023-11-28 16:05:29 +08:00 |
|
钱涛
|
895da67d46
|
Merge branch 'release/2.9.8.2311.02' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
# src/com/engine/salary/util/SalaryDateUtil.java
|
2023-11-28 15:09:51 +08:00 |
|
sy
|
1bd20b2686
|
薪酬系统-福利台账，台账查询增加个税扣缴义务人
|
2023-11-27 11:20:36 +08:00 |
|
sy
|
bf99fd81c6
|
薪酬系统-福利核算，补差数据新增功能接口
|
2023-11-24 17:42:34 +08:00 |
|
钱涛
|
3ab8840ccd
|
增加搜索条件颗粒度
|
2023-11-24 16:49:54 +08:00 |
|
sy
|
c8e3d6312b
|
薪酬系统-福利核算，补差待编辑福利项列表功能接口，补缴第三种方式的待编辑福利项获取逻辑优化，补差编辑tab页待编辑福利项获取逻辑优化
|
2023-11-24 14:05:03 +08:00 |
|
钱涛
|
f77b4c063b
|
去除文化遗产
|
2023-11-23 10:25:33 +08:00 |
|
钱涛
|
a143b4fba5
|
新增工资单模板短信字段
|
2023-11-23 09:31:09 +08:00 |
|
sy
|
9876bc49cf
|
薪酬系统-福利核算，对于处于在缴员工列表，但是不在起始缴纳月和最后缴纳月区间的核算月的人员，不生成核算记录
|
2023-11-22 16:47:36 +08:00 |
|
钱涛
|
e0f7ec3256
|
申报表提示日期优化
|
2023-11-22 16:37:48 +08:00 |
|
钱涛
|
f16f93fd43
|
过滤pdf中的空或0值
|
2023-11-22 14:06:34 +08:00 |
|
sy
|
9f8c5f9c07
|
薪酬系统-福利档案，福利档案列表显示、导入导出数据中不带出福利方案中停止缴费的福利数据
|
2023-11-22 11:32:32 +08:00 |
|
钱涛
|
afabde3b18
|
短信模板配置
|
2023-11-22 10:54:32 +08:00 |
|
钱涛
|
addd937b7b
|
Merge branch 'feature/支持工资单短信' into release/2.9.8.2311.02
|
2023-11-22 10:40:30 +08:00 |
|
sy
|
30e6bed471
|
Merge remote-tracking branch 'remotes/origin/feature/231001-福利档案基数调整记录' into release/2.9.8.2311.02
|
2023-11-22 09:38:16 +08:00 |
|
sy
|
4ebad5ec83
|
Merge remote-tracking branch 'remotes/origin/feature/231001-福利档案基数调整记录' into fix/231102-福利档案，导入数据中的年月数据校验优化
|
2023-11-21 16:02:30 +08:00 |
|
sy
|
9bbbd80d36
|
薪酬系统-福利档案，福利档案导入时，年月格式兼容2001/01一类格式
|
2023-11-21 16:02:12 +08:00 |
|
sy
|
c9b279049d
|
薪酬系统-福利台账，福利核算出现异常时，优化核算进度获取逻辑
|
2023-11-21 14:40:30 +08:00 |
|
钱涛
|
a026a8ff88
|
清除异常信息
|
2023-11-20 17:48:49 +08:00 |
|
Harryxzy
|
805fb9ff3c
|
1、薪资账套页面增加义务人筛选条件
2、薪资核算页面增加义务人列表
|
2023-11-20 16:14:51 +08:00 |
|
Harryxzy
|
a237f75d79
|
核算结果超过1000导入bug
|
2023-11-20 11:21:58 +08:00 |
|
Harryxzy
|
c8838f2528
|
Merge branch 'fix/薪资核算编辑保存BUG' into fix/核算结果导入超过1000
|
2023-11-20 11:21:14 +08:00 |
|
Harryxzy
|
301144214a
|
薪资核算编辑保存时删除了隐藏项目
|
2023-11-20 11:09:43 +08:00 |
|
Harryxzy
|
2656ce7c90
|
薪资核算结果导入超过1000报错
|
2023-11-20 10:56:03 +08:00 |
|
钱涛
|
753eaa5b22
|
检查闭环
|
2023-11-17 16:00:59 +08:00 |
|
钱涛
|
1d1d322188
|
Merge branch 'release/2.9.8.2311.02' into release/个税版本
|
2023-11-17 14:21:15 +08:00 |
|
Harryxzy
|
c0ca63129e
|
线下对比优化
|
2023-11-16 16:56:50 +08:00 |
|
钱涛
|
a2f63dee2b
|
短信模板设置接口
|
2023-11-16 15:42:11 +08:00 |
|
钱涛
|
e1a4e275ff
|
短信模板设置接口
|
2023-11-16 15:41:29 +08:00 |
|
钱涛
|
c0e311bf57
|
不使用系统算税支持重新核算之前月份
|
2023-11-16 11:42:02 +08:00 |
|
钱涛
|
3de1e62f6b
|
短信模板
|
2023-11-16 11:38:21 +08:00 |
|
Harryxzy
|
97a5d4ab91
|
线下对比表头改造成分组的样式
|
2023-11-15 17:12:52 +08:00 |
|
钱涛
|
d2127cccff
|
短信模板
|
2023-11-15 13:32:37 +08:00 |
|
sy
|
e0fcff792d
|
薪酬系统-福利档案，福利档案及模板导出参数设置优化
|
2023-11-15 10:17:12 +08:00 |
|
钱涛
|
7f68931cc5
|
获取考勤假期余额
|
2023-11-13 17:23:33 +08:00 |
|
钱涛
|
7befa9f408
|
获取考勤假期余额
|
2023-11-13 17:23:09 +08:00 |
|
钱涛
|
443f2a749e
|
Merge branch 'release/3.0.0.2311.01' into release/2.9.8.2311.01
|
2023-11-13 17:20:04 +08:00 |
|
钱涛
|
fcd5846d08
|
Merge branch 'release/3.0.0.2311.02' into release/个税版本
|
2023-11-13 17:13:28 +08:00 |
|
钱涛
|
2c12b10171
|
1、减少人员bug
2、档案项目输入bug
|
2023-11-13 17:12:25 +08:00 |
|
钱涛
|
f3bc735fae
|
短信发送
|
2023-11-13 16:52:19 +08:00 |
|
钱涛
|
8eefec2e57
|
跳过考勤报表假期余额权限
|
2023-11-13 11:15:49 +08:00 |
|
钱涛
|
526c8f8514
|
Merge branch 'release/3.0.0.2311.01' into release/个税版本
|
2023-11-10 15:29:39 +08:00 |
|
钱涛
|
3dc5cc3a44
|
修改报表bug
|
2023-11-10 14:22:58 +08:00 |
|
钱涛
|
eb61811766
|
假期余额
|
2023-11-10 10:55:38 +08:00 |
|
钱涛
|
d86b00e5f7
|
清除加解密状态
|
2023-11-09 17:01:08 +08:00 |
|
钱涛
|
9ec0daa3f6
|
加密描述
|
2023-11-09 16:40:30 +08:00 |
|
Harryxzy
|
c88db43e55
|
Merge remote-tracking branch 'origin/release/3.0.0.2311.01' into release/3.0.0.2311.01
|
2023-11-09 16:19:35 +08:00 |
|
Harryxzy
|
025cb73a21
|
Merge branch 'feature/231101_返聘action' into release/3.0.0.2311.01
|
2023-11-09 16:18:00 +08:00 |
|
钱涛
|
0cfbe05c54
|
报表日期
|
2023-11-09 16:14:35 +08:00 |
|
钱涛
|
675e5d7972
|
扩展人员属性
|
2023-11-09 11:34:00 +08:00 |
|
钱涛
|
fdfeae9344
|
合并1101
|
2023-11-08 16:21:53 +08:00 |
|
钱涛
|
75717871d0
|
Merge branch 'release/3.0.0.2311.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/SalaryEmployeeService.java
# src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
# src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
|
2023-11-08 16:20:31 +08:00 |
|
钱涛
|
e677207eac
|
新增统计维度展示
|
2023-11-08 15:59:54 +08:00 |
|
钱涛
|
d2ac1aec23
|
修改维度展示
|
2023-11-08 09:38:24 +08:00 |
|
钱涛
|
61d0e0f659
|
去除无效代码
|
2023-11-07 20:14:23 +08:00 |
|
钱涛
|
fbd19ecf75
|
缓存
|
2023-11-07 19:11:16 +08:00 |
|
钱涛
|
00f806a8e9
|
Merge branch 'release/3.0.0.2311.01' into feature/报表支持自定义维度
|
2023-11-07 19:06:57 +08:00 |
|
钱涛
|
bcee3c5e5a
|
人员属性扩展
|
2023-11-07 19:06:43 +08:00 |
|
钱涛
|
5f371a8e58
|
报表复制
|
2023-11-07 15:55:03 +08:00 |
|
钱涛
|
b30c9b1ca9
|
Merge branch 'feature/扩展人员维度属性' into feature/报表支持自定义维度
|
2023-11-07 14:45:27 +08:00 |
|
Harryxzy
|
3353cd67ce
|
Merge remote-tracking branch 'origin/release/3.0.0.2311.01' into release/3.0.0.2311.01
|
2023-11-07 11:24:59 +08:00 |
|
Harryxzy
|
f2a840576e
|
Merge branch 'fix/薪资核算导入下载模板bug' into release/3.0.0.2311.01
|
2023-11-07 11:24:25 +08:00 |
|
钱涛
|
68bc79ab0b
|
修改关键字
|
2023-11-07 11:00:00 +08:00 |
|
钱涛
|
b9d119bcf0
|
修改关闭解密方法
|
2023-11-07 10:00:51 +08:00 |
|
钱涛
|
36a77a8e0f
|
自定义报表维度
|
2023-11-06 18:46:49 +08:00 |
|
钱涛
|
43d627c23a
|
扩展维度属性
|
2023-11-06 11:32:25 +08:00 |
|
钱涛
|
74f7c71ffe
|
扩展维度属性
|
2023-11-06 11:19:00 +08:00 |
|
Harryxzy
|
0048001c54
|
返聘
|
2023-11-03 16:53:23 +08:00 |
|
Harryxzy
|
e018ec629f
|
返聘
|
2023-11-03 16:37:09 +08:00 |
|
Harryxzy
|
44233d74a8
|
返聘
|
2023-11-03 15:28:04 +08:00 |
|
钱涛
|
0634a139b9
|
显示字符统计规则
|
2023-11-02 18:41:58 +08:00 |
|
Harryxzy
|
f85f0af44a
|
下载核算导入模板，直接从缓存拿选的字段
|
2023-11-02 16:39:58 +08:00 |
|
Harryxzy
|
5d2218b8f0
|
返聘action
|
2023-11-02 16:22:24 +08:00 |
|
钱涛
|
83f38d1d74
|
显示字符统计规则
|
2023-11-02 14:43:15 +08:00 |
|
Harryxzy
|
f80bb620dd
|
返聘action
|
2023-11-02 14:21:33 +08:00 |
|
钱涛
|
8f333c4ad4
|
优化核算校验日期提示
|
2023-11-01 16:44:37 +08:00 |
|
钱涛
|
22a946d9ad
|
报表支持文本
|
2023-11-01 16:09:19 +08:00 |
|
钱涛
|
7fa3c31aac
|
报表支持文本
|
2023-11-01 09:54:09 +08:00 |
|
钱涛
|
b050888b7b
|
Merge branch 'release/3.0.0.2311.01' into release/个税版本
|
2023-10-31 17:19:09 +08:00 |
|
钱涛
|
4c11c54973
|
统一解密位置
|
2023-10-31 17:16:48 +08:00 |
|
钱涛
|
0c77031e46
|
报表功能暂存
|
2023-10-31 17:08:28 +08:00 |
|
钱涛
|
3d8919da25
|
账套增加证件号码字段
|
2023-10-31 15:08:43 +08:00 |
|
钱涛
|
e70a17cd19
|
捕获社保模块导出异常
|
2023-10-31 11:21:48 +08:00 |
|
钱涛
|
4bf60c0370
|
公式负数符号特殊处理
|
2023-10-31 09:41:02 +08:00 |
|
钱涛
|
2b4ded9dd0
|
修复合计没有根据自定义字段过滤
|
2023-10-30 19:19:07 +08:00 |
|
钱涛
|
49f949b673
|
Merge branch 'release/3.0.0.2311.01' into release/个税版本
|
2023-10-30 10:34:33 +08:00 |
|
钱涛
|
872ca0a805
|
恢复档案pageid
|
2023-10-26 13:45:38 +08:00 |
|
sy
|
da04a951d2
|
薪酬系统-福利档案，福利档案基数调整记录列表排序优化
|
2023-10-26 10:00:14 +08:00 |
|
sy
|
267cced46b
|
薪酬系统-福利档案，福利档案基数调整记录列表功能优化，可展示非系统人员姓名
|
2023-10-25 19:14:02 +08:00 |
|
钱涛
|
16f46ae2da
|
报表人员维度增加部门和工号
|
2023-10-25 14:33:19 +08:00 |
|
钱涛
|
b08d3bdd2c
|
修复报表多部门查询
|
2023-10-25 11:19:47 +08:00 |
|
sy
|
dba2f48785
|
薪酬系统-福利档案，福利档案基数调整记录生成逻辑优化，过滤空值变更
|
2023-10-25 11:18:10 +08:00 |
|
钱涛
|
adc8bce395
|
薪资档案改个pageid
|
2023-10-25 10:14:33 +08:00 |
|
钱涛
|
61c72a2587
|
Merge branch 'release/3.0.0.2311.01' into release/个税版本
|
2023-10-24 17:33:49 +08:00 |
|
sy
|
05b2c1868b
|
Merge remote-tracking branch 'remotes/origin/feature/231001-福利档案基数调整记录' into release/2.9.6.2310.01
|
2023-10-24 14:11:22 +08:00 |
|
钱涛
|
cf2d2552a2
|
Merge branch 'feature/假期余额' into release/3.0.0.2311.01
|
2023-10-24 11:44:01 +08:00 |
|
钱涛
|
bf67fe17fc
|
年假余额
|
2023-10-24 11:43:14 +08:00 |
|
钱涛
|
7249c749c0
|
年假余额
|
2023-10-24 10:24:10 +08:00 |
|
sy
|
1c0b00d163
|
薪酬系统-福利档案，福利档案基数调整记录列表查询入参调整
|
2023-10-23 18:07:37 +08:00 |
|
钱涛
|
fe4e138317
|
个税调差累计字段对应
|
2023-10-23 14:44:26 +08:00 |
|
钱涛
|
026fa54a0e
|
Merge branch 'release/2.9.6.2310.01' into release/个税版本
|
2023-10-23 10:07:24 +08:00 |
|
钱涛
|
328158204d
|
个税调差累计字段对应
|
2023-10-23 10:03:04 +08:00 |
|
钱涛
|
05b9a2a57e
|
Merge branch 'feature/公式短路' into release/2.9.6.2310.01
|
2023-10-20 14:19:54 +08:00 |
|
钱涛
|
35550aa788
|
假期余额
|
2023-10-20 13:26:25 +08:00 |
|
钱涛
|
1f5edd039a
|
Merge branch 'release/2.9.6.2310.01' into release/个税版本
|
2023-10-20 10:56:07 +08:00 |
|
钱涛
|
a19f86c624
|
一键累计bug修复
|
2023-10-20 10:29:46 +08:00 |
|
sy
|
1db16d6fa6
|
Merge remote-tracking branch 'remotes/origin/fix/231001-福利档案导入bug修复，档案主表查询人员ids分片' into release/2.9.6.2310.01
|
2023-10-20 09:51:39 +08:00 |
|
sy
|
f8f5ea7782
|
薪酬系统-福利档案，薪资核算时调用福利核算数据查询时人员ids分片
|
2023-10-20 09:50:44 +08:00 |
|
钱涛
|
e19f00c44d
|
Merge branch 'release/2.9.6.2310.01' into release/个税版本
|
2023-10-20 09:43:24 +08:00 |
|
钱涛
|
83e16cedf6
|
一键累计bug修复
|
2023-10-20 09:43:04 +08:00 |
|
钱涛
|
0dd9040408
|
一键累计bug修复
|
2023-10-19 17:35:33 +08:00 |
|
钱涛
|
81b9d65a22
|
过滤==
|
2023-10-19 16:26:23 +08:00 |
|
钱涛
|
6bbfc10c34
|
过滤==
|
2023-10-19 16:25:30 +08:00 |
|
钱涛
|
3745be2c5c
|
状态编码
|
2023-10-19 15:52:52 +08:00 |
|
sy
|
d247353530
|
Merge remote-tracking branch 'remotes/origin/fix/231001-福利档案导入bug修复，档案主表查询人员ids分片' into release/2.9.6.2310.01
|
2023-10-19 14:31:49 +08:00 |