 钱涛
|
3e11d7240b
|
Merge branch 'release/个税版本' into feature/在线算税
|
2024-06-06 15:56:37 +08:00 |
|
钱涛
|
eca321ee4c
|
Merge branch 'release/个税版本2.14.3.2406.01' into release/个税版本
|
2024-06-06 15:54:23 +08:00 |
|
钱涛
|
b7b1dc8aac
|
Merge branch 'release/2.14.3.2406.01' into release/个税版本2.14.3.2406.01
|
2024-06-06 15:54:07 +08:00 |
|
钱涛
|
789b77ba0b
|
档案导入模板注释
|
2024-06-06 14:54:58 +08:00 |
|
钱涛
|
e1e00f4db0
|
在线算税v1
|
2024-06-06 13:51:33 +08:00 |
Harryxzy
|
91444e9495
|
修复薪资核算高级搜索ISNOTEMPTY 中文显示
|
2024-06-05 16:54:53 +08:00 |
|
Harryxzy
|
16f5ffcf29
|
优化 - 社保福利台账小数位数
|
2024-06-05 15:30:57 +08:00 |
|
Harryxzy
|
91b8809c03
|
修复薪资核算搜索，合并计税bug
|
2024-06-05 13:43:49 +08:00 |
|
Harryxzy
|
b6331b952c
|
修复
1、社保福利台账补差下载导入模板，显示的是补差数据；
2、报表分享不设置起始日期时oracle数据库兼容问题；
|
2024-06-05 11:02:59 +08:00 |
|
钱涛
|
440a64aece
|
补充日志
|
2024-06-03 13:52:39 +08:00 |
|
钱涛
|
572b114f28
|
Merge branch 'release/2.14.3.2406.01' into release/个税版本2.14.3.2406.01
# Conflicts:
# src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml
# src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
|
2024-06-03 11:18:01 +08:00 |
|
Harryxzy
|
47f6701d29
|
Merge branch 'release/个税版本' into custom/艾志工业
|
2024-05-31 16:50:39 +08:00 |
|
钱涛
|
36fb0da4dc
|
Merge branch 'release/2.14.2.2405.02' into release/个税版本
|
2024-05-31 11:39:26 +08:00 |
|
钱涛
|
6b164ece2a
|
处理隐藏bug
|
2024-05-31 11:39:08 +08:00 |
|
钱涛
|
abba78ead3
|
处理隐藏bug
|
2024-05-31 11:36:56 +08:00 |
|
Harryxzy
|
bdecf26b09
|
Merge branch 'release/个税版本' into custom/艾志工业
|
2024-05-30 17:24:24 +08:00 |
|
钱涛
|
c86b53fd27
|
Merge branch 'feature/锁定人员' into release/2.14.3.2406.01
|
2024-05-30 17:06:57 +08:00 |
|
钱涛
|
cdcdfabe9b
|
处理申报类型问题
|
2024-05-30 15:19:15 +08:00 |
|
钱涛
|
c28bbf4d1d
|
处理冲突
|
2024-05-30 14:49:02 +08:00 |
|
钱涛
|
5efe84dd2d
|
Merge branch 'release/2.14.2.2405.02' into release/个税版本
|
2024-05-30 14:42:00 +08:00 |
|
钱涛
|
9aa2a03425
|
Merge branch 'release/2.14.2.2405.02' into release/2.14.3.2406.01
|
2024-05-30 14:41:45 +08:00 |
|
钱涛
|
9e8e7f1f09
|
删除隐藏
|
2024-05-30 14:41:28 +08:00 |
|
钱涛
|
ec7b251981
|
显示薪资项目显示申报类型
|
2024-05-30 14:21:27 +08:00 |
|
钱涛
|
98d4bb79a3
|
Merge branch 'release/2.14.2.2405.02' into release/个税版本
# Conflicts:
# src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml
|
2024-05-30 12:03:34 +08:00 |
|
钱涛
|
3569519b12
|
Merge branch 'release/2.14.2.2405.02' into release/2.14.3.2406.01
|
2024-05-30 12:02:18 +08:00 |
|
钱涛
|
18a4f7c3e7
|
隐藏数据迁移
|
2024-05-30 12:01:53 +08:00 |
|
Harryxzy
|
76bb2faced
|
Merge branch 'release/个税版本' into custom/艾志工业
# Conflicts:
# src/com/engine/salary/service/impl/SIArchivesServiceImpl.java
|
2024-05-30 09:27:26 +08:00 |
|
Harryxzy
|
69877f518f
|
艾志 个税申报管理员功能，且注释上一次所开发的分权功能（通过建模按照部门维度所设置的权限）
|
2024-05-29 18:56:19 +08:00 |
|
Harryxzy
|
399852fe8a
|
艾志 个税申报管理员功能，且注释上一次所开发的分权功能（通过建模按照部门维度所设置的权限）
|
2024-05-29 18:52:12 +08:00 |
|
钱涛
|
7952e93d01
|
考勤引用显示证件号码
|
2024-05-29 16:53:51 +08:00 |
|
钱涛
|
63851a1fe7
|
社保福利通过证件号码导入
|
2024-05-29 15:32:19 +08:00 |
|
钱涛
|
238438897b
|
处理工资单证件号码不显示
|
2024-05-29 14:04:16 +08:00 |
|
钱涛
|
2c79afa65e
|
锁定人员
|
2024-05-28 17:29:18 +08:00 |
|
钱涛
|
0e1242daa7
|
根据身份证导入
|
2024-05-28 14:10:45 +08:00 |
|
钱涛
|
f595b1782a
|
Merge branch 'release/2.14.3.2406.01' into release/个税版本2.14.3.2406.01
|
2024-05-28 11:29:37 +08:00 |
|
钱涛
|
bc5735135c
|
Merge branch 'feature/身份证导入' into release/2.14.3.2406.01
|
2024-05-28 11:28:18 +08:00 |
|
钱涛
|
11802dad91
|
根据身份证导入
|
2024-05-28 11:18:19 +08:00 |
|
钱涛
|
ffdbf20160
|
Merge branch 'release/2.14.2.2405.02' into release/个税版本
|
2024-05-27 13:48:02 +08:00 |
|
钱涛
|
98d45ebd32
|
处理内存溢出
|
2024-05-27 11:36:05 +08:00 |
|
钱涛
|
e2dec06735
|
隐藏身份证号
|
2024-05-27 10:52:26 +08:00 |
|
钱涛
|
24b2154cb3
|
隐藏身份证号
|
2024-05-27 10:48:46 +08:00 |
|
钱涛
|
ec5463c050
|
Merge branch 'release/2.14.2.2405.02' into release/个税版本
# Conflicts:
# src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml
# src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
|
2024-05-27 10:37:39 +08:00 |
|
钱涛
|
43db025d98
|
Merge branch 'feature/账套副本' into release/2.14.2.2405.02
|
2024-05-23 11:36:38 +08:00 |
|
Harryxzy
|
bf50976849
|
Merge branch 'fix/240302-社保福利编辑保存改造' into release/2.14.2.2405.02
|
2024-05-23 10:58:30 +08:00 |
|
钱涛
|
1b3da7dfc0
|
身份证
|
2024-05-23 09:16:28 +08:00 |
|
Harryxzy
|
51b4a3198c
|
修复报表数值项目出现文本值
|
2024-05-21 15:04:52 +08:00 |
|
钱涛
|
bb751c0df3
|
Merge branch 'release/个税版本' into custom/艾志工业
# Conflicts:
# src/com/engine/salary/entity/datacollection/AddUpSituation.java
|
2024-05-21 13:28:13 +08:00 |
|
钱涛
|
8bf2cda7c3
|
修复日期问题
|
2024-05-21 12:29:42 +08:00 |
|
钱涛
|
79cfa0cbc0
|
删除往期累计多余项目
往期累计别名设置
|
2024-05-21 10:50:17 +08:00 |
|
Harryxzy
|
0facbabf55
|
薪资项目增加默认值temp
|
2024-05-20 15:04:14 +08:00 |
|
钱涛
|
3dc8f6d57c
|
Merge branch 'release/2.14.1.2405.01' into release/个税版本
|
2024-05-20 09:56:12 +08:00 |
|
钱涛
|
6a1b28c555
|
解决工资单null
|
2024-05-17 17:11:51 +08:00 |
|
钱涛
|
26d6efd827
|
pdf日志
|
2024-05-17 10:58:38 +08:00 |
|
Harryxzy
|
b76a87b125
|
社保福利编辑保存改造
|
2024-05-17 09:40:52 +08:00 |
|
钱涛
|
c146537684
|
修改计时说明
|
2024-05-16 15:56:49 +08:00 |
|
钱涛
|
3b9981e189
|
处理短信发送空值
|
2024-05-14 15:18:32 +08:00 |
|
钱涛
|
11cbf23b8f
|
统一进位规则
|
2024-05-14 14:27:19 +08:00 |
|
钱涛
|
0f1473801e
|
维护工具效率
|
2024-05-14 14:12:14 +08:00 |
|
钱涛
|
38ebbb9928
|
解决并发问题
|
2024-05-14 13:28:58 +08:00 |
|
钱涛
|
04978dd8e6
|
Merge branch 'release/2.14.1.2405.01' into release/个税版本
|
2024-05-13 14:01:22 +08:00 |
|
Harryxzy
|
dd54a10433
|
核算固定列头数优化
|
2024-05-11 16:19:25 +08:00 |
|
Harryxzy
|
509257b419
|
pdf导出前先校验生成pdf
|
2024-05-11 15:07:54 +08:00 |
|
Harryxzy
|
8d18c0e5cb
|
优化“薪资项目同步至账套”，薪酬总管理员能选到所有义务人下账套
|
2024-05-10 18:25:32 +08:00 |
|
Harryxzy
|
1c1a77d387
|
移动端工资单列表返回登陆人id
|
2024-05-10 15:41:40 +08:00 |
|
Harryxzy
|
845586cba2
|
test
|
2024-05-10 14:54:02 +08:00 |
|
钱涛
|
6d4265acf1
|
职称显示为中午
|
2024-05-08 15:31:36 +08:00 |
|
钱涛
|
b136c71814
|
Merge branch 'release/个税版本' into custom/艾志工业
|
2024-05-08 13:48:03 +08:00 |
|
钱涛
|
ec27cf5a08
|
Merge branch 'release/2.13.1.2404.02' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/AddUpDeductionService.java
# src/com/engine/salary/wrapper/AddUpDeductionWrapper.java
|
2024-05-08 11:17:40 +08:00 |
|
钱涛
|
c97618bd97
|
修复社保福利修改时没有小数位问题
|
2024-05-08 11:15:52 +08:00 |
|
钱涛
|
6f2d65a4be
|
修复社保福利新建时没有小数位和进位规则对应问题
|
2024-05-08 10:49:08 +08:00 |
|
钱涛
|
bb32bdfe11
|
核算详细信息
|
2024-05-07 18:48:38 +08:00 |
|
钱涛
|
6b0606f5a4
|
自适应
|
2024-05-07 17:37:02 +08:00 |
|
钱涛
|
5c90909c0e
|
账套快照-解决导入、公式、详细详细不对应问题
|
2024-05-07 15:25:43 +08:00 |
|
钱涛
|
1cb89a9d1b
|
账套快照-工资单模板
|
2024-05-06 17:41:39 +08:00 |
|
钱涛
|
3428de9e33
|
账套快照
|
2024-05-06 16:03:29 +08:00 |
|
Harryxzy
|
b5b2c9ef1e
|
累计专项附加扣除一键累计，能根据义务人进行累计
|
2024-04-30 15:00:43 +08:00 |
|
Harryxzy
|
4b474f864f
|
累计专项附加扣除一键累计，能根据义务人进行累计
|
2024-04-30 14:43:37 +08:00 |
|
Harryxzy
|
8ae76f9b65
|
Merge branch 'release/2.13.1.2404.02' into feature/工资单审批
|
2024-04-30 10:26:58 +08:00 |
|
Harryxzy
|
1800c02e58
|
盛威
|
2024-04-29 16:08:18 +08:00 |
|
Harryxzy
|
d7de02696d
|
工资单审批，增加规则配置
|
2024-04-28 16:58:33 +08:00 |
|
钱涛
|
7d7d2dc309
|
处理公式数组问题
|
2024-04-28 16:21:44 +08:00 |
|
Harryxzy
|
e7c46bc5e8
|
优化同步离职日期
|
2024-04-26 15:13:54 +08:00 |
|
Harryxzy
|
4f391a2159
|
工资单审批
|
2024-04-26 11:24:47 +08:00 |
|
Harryxzy
|
34fe103055
|
工资单审批
|
2024-04-25 15:30:25 +08:00 |
|
Harryxzy
|
ea968c316e
|
解决数据透视薪资项目排序问题
|
2024-04-25 14:04:13 +08:00 |
|
钱涛
|
353a007149
|
Merge branch 'release/2.13.1.2404.02' into release/个税版本
|
2024-04-25 13:46:13 +08:00 |
|
钱涛
|
c9075058d5
|
跳过人员范围校验
|
2024-04-25 13:45:59 +08:00 |
|
钱涛
|
0661406c97
|
Merge branch 'release/2.13.1.2404.02' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
|
2024-04-25 11:47:47 +08:00 |
|
钱涛
|
c206538aa6
|
Merge remote-tracking branch 'origin/release/2.13.1.2404.02' into release/2.13.1.2404.02
|
2024-04-25 11:45:53 +08:00 |
|
钱涛
|
d802d890d6
|
处理解密问题
|
2024-04-25 11:45:37 +08:00 |
|
Harryxzy
|
f46a18fa27
|
薪资审批
|
2024-04-25 09:39:28 +08:00 |
|
Harryxzy
|
11304bebed
|
薪资审批
|
2024-04-24 15:55:41 +08:00 |
|
Harryxzy
|
0bf4b8ed09
|
修复往期累计导入时未加密
|
2024-04-23 15:45:24 +08:00 |
|
钱涛
|
8f76daf0d1
|
Merge branch 'feature/外籍人员' into release/个税版本
|
2024-04-23 11:15:37 +08:00 |
|
钱涛
|
1120e840c7
|
Merge branch 'feature/外籍人员' into custom/艾志工业-外籍人员
|
2024-04-16 20:27:06 +08:00 |
|
钱涛
|
a27ad1f070
|
并档案接口
|
2024-04-16 20:26:56 +08:00 |
|
钱涛
|
9f903daf65
|
Merge branch 'feature/外籍人员' into custom/艾志工业-外籍人员
# Conflicts:
# src/com/engine/salary/service/EmployeeDeclareService.java
|
2024-04-16 20:13:30 +08:00 |
|
钱涛
|
1496745488
|
作废人员接口
|
2024-04-16 20:12:48 +08:00 |
|
钱涛
|
95a7f26d60
|
Merge remote-tracking branch 'origin/release/2.13.1.2404.02' into release/2.13.1.2404.02
|
2024-04-16 16:05:53 +08:00 |
|
钱涛
|
68d0003f62
|
新增核算结果的代理
|
2024-04-16 16:05:42 +08:00 |
|
Harryxzy
|
916baf623c
|
fix导出文本
|
2024-04-16 09:57:12 +08:00 |
|
钱涛
|
b8fb4457e6
|
Merge branch 'feature/外籍人员' into custom/艾志工业-0412
# Conflicts:
# src/com/engine/salary/service/impl/EmployeeDeclareServiceImpl.java
# src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java
|
2024-04-12 17:58:05 +08:00 |
|
钱涛
|
12d832c693
|
Merge branch 'release/2.12.1.2403.02' into custom/艾志工业
|
2024-04-12 17:53:40 +08:00 |
|
钱涛
|
6cfeb70f9c
|
Merge branch 'release/2.12.1.2403.02' into release/个税版本
|
2024-04-12 17:47:40 +08:00 |
|
钱涛
|
0e6449e1e2
|
外籍人员
|
2024-04-12 17:46:53 +08:00 |
|
Harryxzy
|
8d7d3c3ec3
|
非系统人员部门id、分部id删除失败
|
2024-04-12 15:06:32 +08:00 |
|
钱涛
|
4aa66ea587
|
外籍人员更新
|
2024-04-11 18:57:56 +08:00 |
|
钱涛
|
23eba4950b
|
处理pdf生成
|
2024-04-11 15:23:23 +08:00 |
|
钱涛
|
a2a18245bd
|
处理缴款反馈
|
2024-04-11 10:59:36 +08:00 |
|
钱涛
|
691f4c42ce
|
内置算税结果
|
2024-04-10 14:48:58 +08:00 |
|
钱涛
|
6a05269b2d
|
处理LIKE函数
|
2024-04-10 14:20:30 +08:00 |
|
钱涛
|
917c9f87c1
|
个税申报
|
2024-04-10 09:18:05 +08:00 |
|
钱涛
|
d1b6a78238
|
人员报送
|
2024-04-10 09:08:24 +08:00 |
|
Harryxzy
|
44ed332ed5
|
修复ecology的多语言导致乱码
|
2024-04-08 17:57:59 +08:00 |
|
Harryxzy
|
a9dd2c2cb3
|
Merge branch 'release/2.12.1.2403.02' into release/个税版本
|
2024-04-08 15:53:13 +08:00 |
|
钱涛
|
e994a61037
|
申报状态拆分
|
2024-04-08 14:40:47 +08:00 |
|
钱涛
|
be85c47a68
|
申报表状态更新主记录
|
2024-04-07 15:59:36 +08:00 |
|
Harryxzy
|
ff19e46ac2
|
fix
|
2024-04-07 15:52:07 +08:00 |
|
Harryxzy
|
93f9e9aca7
|
1、修复工资单员工信息分部显示问题
2、修复日志功能查询参数超1000导致的报错
|
2024-04-07 13:56:00 +08:00 |
|
钱涛
|
fbc9c1a187
|
申报表状态更新主记录
|
2024-04-07 11:29:09 +08:00 |
|
Harryxzy
|
2242723d3f
|
Merge branch 'feature/240302-薪资核算导出模板' into release/2.12.1.2403.02
|
2024-04-03 11:39:30 +08:00 |
|
钱涛
|
7f965c41c9
|
申报表状态更新主记录
|
2024-04-02 15:50:33 +08:00 |
|
Harryxzy
|
2e44e2cd86
|
解决冲突
|
2024-04-02 13:56:19 +08:00 |
|
Harryxzy
|
422cc687e9
|
Merge branch 'release/个税版本' into custom/艾志工业
# Conflicts:
# src/com/engine/salary/mapper/archive/SalaryArchiveMapper.java
# src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml
# src/com/engine/salary/mapper/datacollection/EmployMapper.java
# src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.java
# src/com/engine/salary/service/SalaryArchiveService.java
# src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
# src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
|
2024-04-02 13:52:46 +08:00 |
|
Harryxzy
|
f15fdef375
|
艾志优化
|
2024-04-02 10:39:28 +08:00 |
|
Harryxzy
|
de1efcfd7f
|
艾志优化
|
2024-04-02 10:38:52 +08:00 |
|
钱涛
|
a06a54f574
|
去除objectUtil
|
2024-04-01 20:25:23 +08:00 |
|
钱涛
|
57a0030cc8
|
处理外籍人员
|
2024-04-01 17:07:36 +08:00 |
|
Harryxzy
|
f9d7c05190
|
核算导出模板修改表名
|
2024-04-01 10:17:45 +08:00 |
|
Harryxzy
|
d57d5f7e13
|
薪资核算导出模板优化
|
2024-03-29 16:23:08 +08:00 |
|
Harryxzy
|
7557c1b330
|
薪资核算导出模板优化
|
2024-03-29 15:45:45 +08:00 |
|
钱涛
|
b3cde42f31
|
解决冲突
|
2024-03-29 14:41:31 +08:00 |
|
钱涛
|
5f64acc269
|
Merge branch 'release/2.12.1.2403.02' into release/个税版本
# Conflicts:
# src/com/engine/salary/mapper/datacollection/EmployMapper.java
# src/com/engine/salary/mapper/datacollection/EmployMapper.xml
# src/com/engine/salary/mapper/extemp/ExternalEmployeeMapper.java
# src/com/engine/salary/service/ExtEmpService.java
# src/com/engine/salary/service/SalaryEmployeeService.java
# src/com/engine/salary/service/impl/ExtEmpServiceImpl.java
# src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
|
2024-03-29 14:37:00 +08:00 |
|
钱涛
|
8e2ff975a9
|
暂存
|
2024-03-29 14:01:12 +08:00 |
|
Harryxzy
|
47e0f5da52
|
fix冲突
|
2024-03-29 10:52:46 +08:00 |
|
Harryxzy
|
330d1363fc
|
Merge branch 'fix/240302-调薪前端保留位数优化' into release/2.12.1.2403.02
|
2024-03-29 10:49:58 +08:00 |
|
Harryxzy
|
5d2cc92bf8
|
Merge branch 'feature/240302-薪资明细表' into release/2.12.1.2403.02
# Conflicts:
# src/com/engine/salary/mapper/datacollection/EmployMapper.java
# src/com/engine/salary/mapper/datacollection/EmployMapper.xml
# src/com/engine/salary/service/SalaryEmployeeService.java
# src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
|
2024-03-29 10:49:39 +08:00 |
|
Harryxzy
|
4e25dd4f0d
|
Merge branch 'feature/240302-报表明细导出' into release/2.12.1.2403.02
|
2024-03-29 10:47:44 +08:00 |
|
Harryxzy
|
582abc061a
|
薪资核算导出模板
|
2024-03-29 10:46:51 +08:00 |
|
钱涛
|
2a692b13b4
|
外籍人员v1
|
2024-03-29 10:44:55 +08:00 |
|
Harryxzy
|
0d6bf4dfe3
|
薪资核算导出模板修复
|
2024-03-28 18:28:22 +08:00 |
|
Harryxzy
|
130be31d99
|
薪资核算导出模板
|
2024-03-27 11:33:56 +08:00 |
|
Harryxzy
|
3c8d1dc6ee
|
薪资明细表
|
2024-03-27 09:35:47 +08:00 |
|
Harryxzy
|
1c40ed0ecd
|
薪资核算导出模板
|
2024-03-26 17:04:56 +08:00 |
|
Harryxzy
|
92ba8e8fcf
|
薪资明细合计接口
|
2024-03-26 13:49:37 +08:00 |
|
Harryxzy
|
ccc2744bee
|
薪资明细
|
2024-03-26 09:12:59 +08:00 |
|
Harryxzy
|
faabf1dad3
|
薪酬报表-人事状态
|
2024-03-25 17:29:40 +08:00 |
|
Harryxzy
|
e3c528c649
|
薪资明细表
|
2024-03-25 16:08:34 +08:00 |
|
Harryxzy
|
25c2e2f1c1
|
其他维度
|
2024-03-22 15:23:03 +08:00 |
|
Harryxzy
|
18c496c009
|
多部门多分部筛选
|
2024-03-21 14:19:36 +08:00 |
|
Harryxzy
|
0c444acd38
|
多部门多分部筛选
|
2024-03-21 14:19:03 +08:00 |
|
Harryxzy
|
216a2c67d3
|
社保福利编辑保存改造
|
2024-03-20 14:47:41 +08:00 |
|
Harryxzy
|
2691b1e099
|
调薪显示位数前端优化
|
2024-03-19 17:36:58 +08:00 |
|
Harryxzy
|
649dd8f7d5
|
社保福利台账补缴新增
|
2024-03-19 17:23:53 +08:00 |
|
Harryxzy
|
1a4059f7ba
|
报表数据透视导出
|
2024-03-19 13:35:37 +08:00 |
|
Harryxzy
|
19732b39b8
|
艾志修复二开操作权限
|
2024-03-19 10:47:38 +08:00 |
|
Harryxzy
|
5d0b8e7759
|
导出excel单元格格式
|
2024-03-18 14:01:08 +08:00 |
|
钱涛
|
3a79ed9574
|
Merge branch 'release/2.11.2.2403.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
# src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java
# src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
|
2024-03-15 15:44:15 +08:00 |
|
Harryxzy
|
69d94731a0
|
Merge branch 'feature/240301_阅后即焚' into release/3.0.0.2403.01
|
2024-03-15 10:15:12 +08:00 |
|
Harryxzy
|
08b2c240ab
|
提示修复
|
2024-03-15 10:14:59 +08:00 |
|
Harryxzy
|
0f8b16d473
|
Merge branch 'feature/240301_同步起始缴纳月、起始发薪日期' into release/3.0.0.2403.01
|
2024-03-15 09:19:17 +08:00 |
|
Harryxzy
|
b17d2b70de
|
Merge branch 'feature/240301_阅后即焚' into release/3.0.0.2403.01
|
2024-03-15 09:19:03 +08:00 |
|
Harryxzy
|
d28321bcad
|
Merge branch 'fix/240302_加密解密社保福利错误' into release/3.0.0.2403.01
# Conflicts:
# src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
|
2024-03-15 09:18:57 +08:00 |
|
Harryxzy
|
ea2a8540ef
|
Merge branch 'fix/240301-加解密开关后社保台账线下对比bug' into release/3.0.0.2403.01
|
2024-03-15 09:18:30 +08:00 |
|
钱涛
|
0a7334ddef
|
考勤导入，多语言
|
2024-03-14 18:16:20 +08:00 |
|
钱涛
|
29e81e03c2
|
优化公式不显示未启用的考勤字段
|
2024-03-14 16:08:16 +08:00 |
|
钱涛
|
417c9f703d
|
下载模板时带出数据
|
2024-03-14 15:28:14 +08:00 |
|
Harryxzy
|
0c42e1cb35
|
同步社保、薪资档案起始发薪日为入职日定时任务
|
2024-03-14 14:05:36 +08:00 |
|
钱涛
|
a70a2061a5
|
部门改多选
|
2024-03-14 11:19:02 +08:00 |
|
Harryxzy
|
8543d70a66
|
社保加解密
|
2024-03-14 11:07:01 +08:00 |
|
钱涛
|
f23b23cd92
|
优化IF解释
|
2024-03-14 10:25:39 +08:00 |
|
Harryxzy
|
26a3199b1e
|
社保线下对比加解密
|
2024-03-13 17:58:24 +08:00 |
|
Harryxzy
|
3c624fe859
|
Merge branch 'release/个税版本' into custom/艾志工业
|
2024-03-12 18:58:57 +08:00 |
|
钱涛
|
1d8a1b91c0
|
解决冲突
|
2024-03-12 18:58:36 +08:00 |
|
钱涛
|
452d7bc57c
|
Merge branch 'release/3.0.0.2403.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/entity/datacollection/AddUpSituation.java
# src/com/engine/salary/entity/salarysob/po/SalarySobPO.java
# src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
# src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
# src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java
# src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
|
2024-03-12 18:56:12 +08:00 |
|
Harryxzy
|
dca445810d
|
Merge branch 'fix/240301_薪资核算、社保台账导入提示缺失' into fix/240302_加密解密社保福利错误
|
2024-03-12 18:31:30 +08:00 |
|
Harryxzy
|
43c57cb10b
|
阅后即焚功能
|
2024-03-12 16:17:24 +08:00 |
|
Harryxzy
|
b5afaa54df
|
Merge branch 'release/3.0.0.2403.01' into feature/240301_阅后即焚
|
2024-03-12 15:13:34 +08:00 |
|
Harryxzy
|
af57e8ecf4
|
Merge remote-tracking branch 'origin/release/3.0.0.2403.01' into release/3.0.0.2403.01
|
2024-03-12 14:58:21 +08:00 |
|
钱涛
|
836947725f
|
切换了elog位置
|
2024-03-12 14:34:44 +08:00 |
|
Harryxzy
|
83624be06e
|
Merge branch 'fix/240301_薪资核算、社保台账导入提示缺失' into release/3.0.0.2403.01
|
2024-03-12 14:26:42 +08:00 |
|
Harryxzy
|
46626b4c25
|
Merge branch 'release/3.0.0.2403.01' into custom/艾志工业
|
2024-03-12 13:28:28 +08:00 |
|
Harryxzy
|
32f8e8a828
|
Merge branch 'fix/240301_薪资核算、社保台账导入提示缺失' into custom/艾志工业
|
2024-03-12 13:28:12 +08:00 |
|
Harryxzy
|
17b65fca28
|
Merge branch 'release/个税版本' into custom/艾志工业
|
2024-03-12 13:27:25 +08:00 |
|
Harryxzy
|
69480c05cb
|
艾志工业人员信息报送逻辑修改
|
2024-03-12 13:27:19 +08:00 |
|
Harryxzy
|
a44d42e9d2
|
修复加密解密：社保档案、社保台账加解密失败问题
|
2024-03-12 11:27:13 +08:00 |
|
Harryxzy
|
afb4bfd7ad
|
修复bug：
1、薪资核算结果导入提示缺失
2、社保福利台账导入操作日志导致报错
|
2024-03-11 17:23:20 +08:00 |
|
钱涛
|
4b823ccca7
|
国际化注解
|
2024-03-11 16:50:47 +08:00 |
|
Harryxzy
|
78d4f5e2ae
|
阅后即焚
|
2024-03-11 10:35:56 +08:00 |
|
Harryxzy
|
a7b3b7578f
|
增加个税申报表日志
|
2024-03-08 16:33:34 +08:00 |
|
Harryxzy
|
a85e646e9a
|
Merge branch 'release/个税版本' into custom/艾志工业-个税申报-0308bak
|
2024-03-08 15:11:25 +08:00 |
|
Harryxzy
|
f89c13a95f
|
艾志处理空指针
|
2024-03-08 15:11:12 +08:00 |
|
钱涛
|
ddc9188cd9
|
只获取正常且报送成功的
|
2024-03-08 15:09:42 +08:00 |
|
钱涛
|
9415dd8e71
|
可删除报送成功人员
|
2024-03-08 11:34:50 +08:00 |
|
Harryxzy
|
73df953ae5
|
Merge branch 'release/个税版本' into custom/艾志工业-个税申报-0308bak
|
2024-03-08 11:14:31 +08:00 |
|
Harryxzy
|
6aef2856e8
|
个税日志
|
2024-03-08 11:14:00 +08:00 |
|
Harryxzy
|
4516f74d2e
|
艾志-合并0301冲突
|
2024-03-08 10:38:20 +08:00 |
|
Harryxzy
|
878735cbc8
|
Merge branch 'release/个税版本' into custom/艾志工业-个税申报-0308bak
# Conflicts:
# src/com/engine/salary/entity/datacollection/AddUpSituation.java
# src/com/engine/salary/entity/employeedeclare/bo/EmployeeDeclareRefresh.java
# src/com/engine/salary/service/SIArchivesService.java
# src/com/engine/salary/service/impl/SIArchivesServiceImpl.java
# src/com/engine/salary/service/impl/SISchemeServiceImpl.java
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
# src/com/engine/salary/wrapper/SalaryFormulaWrapper.java
|
2024-03-08 09:59:40 +08:00 |
|
Harryxzy
|
d890ab5a84
|
Merge remote-tracking branch 'origin/release/个税版本' into release/个税版本
|
2024-03-08 09:26:57 +08:00 |
|
钱涛
|
8516a23bba
|
修改人员报送刷新逻辑
刷新人员会集成上月所有人员
|
2024-03-07 21:12:09 +08:00 |
|
钱涛
|
72861b9a93
|
Merge branch 'release/3.0.0.2403.01' into release/个税版本
|
2024-03-07 16:57:03 +08:00 |
|
Harryxzy
|
0f82b8ce10
|
Merge branch 'feature/操作日志组件' into release/2.11.1.2402.01
|
2024-03-07 14:23:46 +08:00 |
|
Harryxzy
|
17428c621e
|
非系统人员范围操作日志
|
2024-03-07 14:23:12 +08:00 |
|
钱涛
|
729c6c7d3a
|
处理空指针
|
2024-03-07 14:12:16 +08:00 |
|
Harryxzy
|
a4f4c8c5a4
|
Merge remote-tracking branch 'origin/release/个税版本' into release/个税版本
|
2024-03-07 11:14:43 +08:00 |
|
钱涛
|
e851944e8f
|
优化薪资账套项目保存逻辑
|
2024-03-07 11:11:24 +08:00 |
|
钱涛
|
6d4993f4ff
|
Merge branch 'release/2.11.1.2402.01' into release/个税版本
|
2024-03-07 10:45:36 +08:00 |
|
钱涛
|
3b1edddf00
|
优化薪资账套项目保存逻辑
|
2024-03-07 10:21:06 +08:00 |
|
钱涛
|
730166d771
|
Merge branch 'release/2.11.1.2402.01' into release/个税版本
|
2024-03-07 09:54:35 +08:00 |
|
钱涛
|
e187ee57e0
|
获取所有账套列表接口
|
2024-03-07 09:52:21 +08:00 |
|
钱涛
|
427ce223e7
|
核算闭环提醒
|
2024-03-07 09:43:22 +08:00 |
|
Harryxzy
|
381c705cf8
|
人员信息报送、个税申报表日志
|
2024-03-07 09:29:59 +08:00 |
|
钱涛
|
a52788aa1b
|
往期累计日志调整
|
2024-03-06 16:12:15 +08:00 |
|
钱涛
|
4196a8c596
|
合并冲突
|
2024-03-06 16:05:55 +08:00 |
|
钱涛
|
5a9d45f92b
|
Merge branch 'release/2.11.1.2402.01' into release/个税版本
# Conflicts:
# resource/WEB-INF/prop/hrmSalaryCustom.properties
# src/com/engine/salary/entity/datacollection/AddUpSituation.java
# src/com/engine/salary/entity/datacollection/po/SpecialAddDeductionPO.java
# src/com/engine/salary/entity/salarysob/po/SalarySobPO.java
# src/com/engine/salary/formlua/entity/parameter/ExcelFuncs.java
# src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
# src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
# src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobServiceImpl.java
# src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java
# src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java
# src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
# src/com/engine/salary/util/page/SalaryPageUtil.java
|
2024-03-06 15:54:07 +08:00 |
|
钱涛
|
78c1d6f51c
|
项目日志字段解释
|
2024-03-06 15:20:21 +08:00 |
|
Harryxzy
|
20d7266db9
|
Merge branch 'feature/240201_社保福利台账导入字段缓存' into release/2.11.1.2402.01
# Conflicts:
# src/com/engine/salary/service/impl/SIAccountServiceImpl.java
|
2024-03-06 13:50:56 +08:00 |
|
Harryxzy
|
0ac291d83d
|
Merge branch 'feature/操作日志组件' into release/2.11.1.2402.01
|
2024-03-06 09:23:21 +08:00 |
|
Harryxzy
|
8984369343
|
薪资档案、社保档案查看日志
|
2024-03-05 15:15:20 +08:00 |
|
Harryxzy
|
6c2d20a5a7
|
Merge branch 'feature/240101_我的薪资福利显示页签支持配置' into release/2.11.1.2402.01
|
2024-03-05 14:24:19 +08:00 |
|
钱涛
|
1c62be09d1
|
Merge branch 'feature/操作日志组件' into release/2.11.1.2402.01
|
2024-03-05 13:58:50 +08:00 |
|
钱涛
|
2fc387cc40
|
账套条件
|
2024-03-05 13:44:34 +08:00 |
|
Harryxzy
|
3f76b5bbbf
|
非系统人员管理日志
|
2024-03-04 16:12:30 +08:00 |
|
Harryxzy
|
8c6c6a4966
|
社保福利台账，非系统人员导入报错
|
2024-03-04 14:30:25 +08:00 |
|
Harryxzy
|
15b6c80cdc
|
在线对比相关功能
|
2024-03-04 14:07:51 +08:00 |
|
钱涛
|
c081581ba7
|
Merge branch 'feature/报表支持账套筛选' into release/2.11.1.2402.01
|
2024-03-04 14:01:33 +08:00 |
|
钱涛
|
f325674673
|
Merge branch 'release/2.11.1.2402.01' into feature/操作日志组件
|
2024-03-04 09:41:35 +08:00 |
|
Harryxzy
|
28f7c57e12
|
社保福利台账导入，表单字段缓存
|
2024-03-04 09:18:00 +08:00 |
|
Harryxzy
|
5485f7d260
|
社保福利台账导入，表单字段缓存
|
2024-03-01 17:40:19 +08:00 |
|
钱涛
|
34f6b76fb1
|
修复核算数据为null
|
2024-03-01 16:55:40 +08:00 |
|
Harryxzy
|
bcfcd1de9a
|
个税申报-在线对比显示列定制
|
2024-03-01 13:52:27 +08:00 |
|
Harryxzy
|
54823f2fbd
|
个税申报-在线对比
|
2024-02-29 18:09:58 +08:00 |
|
钱涛
|
8ae06f27b8
|
fix导入性能，导入方法类型改完外层引用
|
2024-02-29 15:53:22 +08:00 |
|
Harryxzy
|
efa556ddd9
|
操作日志修复
|
2024-02-29 11:31:18 +08:00 |
|
Harryxzy
|
89787332e3
|
操作日志修复
|
2024-02-28 18:03:55 +08:00 |
|
Harryxzy
|
066222400b
|
操作日志修复
|
2024-02-28 16:44:52 +08:00 |
|
Harryxzy
|
adff178a7c
|
义务人日志优化
|
2024-02-28 15:01:44 +08:00 |
|
钱涛
|
a1ab3c79f4
|
添加账套筛选条件
|
2024-02-28 14:43:27 +08:00 |
|
Harryxzy
|
f9163340e5
|
分片
|
2024-02-28 09:17:28 +08:00 |
|
Harryxzy
|
616ddce092
|
艾志《2024-01个税申报问题汇总》1、3、5、6
|
2024-02-27 16:22:16 +08:00 |
|
Harryxzy
|
7dafb37263
|
艾志《2024-01个税申报问题汇总》1、3、5、6
|
2024-02-27 15:39:03 +08:00 |
|
Harryxzy
|
9072bc164c
|
Merge branch 'release/个税版本' into custom/艾志工业-个税申报
# Conflicts:
# src/com/engine/salary/mapper/datacollection/EmployMapper.java
# src/com/engine/salary/mapper/datacollection/EmployMapper.xml
# src/com/engine/salary/service/SalaryEmployeeService.java
# src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
|
2024-02-27 15:17:57 +08:00 |
|
Harryxzy
|
3a9b772cb9
|
人员信息报送增加模糊查询
|
2024-02-27 15:16:13 +08:00 |
|
Harryxzy
|
1261194d88
|
操作日志优化
|
2024-02-27 11:30:14 +08:00 |
|
钱涛
|
9e8fbbef89
|
去除pagehelper jar包
|
2024-02-26 16:25:17 +08:00 |
|
钱涛
|
f11d6a035c
|
去除pagehelper jar包
|
2024-02-26 15:40:52 +08:00 |
|
钱涛
|
7cab0e117d
|
Merge branch 'release/个税版本' into custom/艾志工业-个税申报
|
2024-02-23 16:54:36 +08:00 |
sy
|
4ea2499d85
|
Merge remote-tracking branch 'origin/feature/操作日志组件' into feature/操作日志组件
|
2024-02-23 16:11:18 +08:00 |
|
sy
|
624c7db09f
|
薪酬系统-福利台账，核算功能操作日志逻辑添加
|
2024-02-23 16:11:11 +08:00 |
|
Harryxzy
|
093cb34f77
|
操作日志fix some bugs
|
2024-02-23 15:11:56 +08:00 |
|
钱涛
|
229186e510
|
Merge branch 'release/2.11.1.2402.01' into release/个税版本
|
2024-02-23 14:45:39 +08:00 |
|
sy
|
721f6046da
|
Merge remote-tracking branch 'remotes/origin/fix/240101-福利台账列表分权问题修复' into release/2.11.1.2402.01
|
2024-02-23 14:07:08 +08:00 |
|
Harryxzy
|
4775d8683a
|
fix调薪原因value值相同
|
2024-02-23 11:42:36 +08:00 |
|
sy
|
dce7f684a5
|
薪酬系统-福利台账，列表分权问题修复
|
2024-02-23 11:34:48 +08:00 |
|
Harryxzy
|
a39806bb92
|
我的薪资福利显示页签支持配置
|
2024-02-23 11:04:14 +08:00 |
|
sy
|
e4cbcdd400
|
Merge remote-tracking branch 'origin/feature/操作日志组件' into feature/操作日志组件
|
2024-02-22 15:24:12 +08:00 |
|
sy
|
1654e041b9
|
薪酬系统-福利档案，相关功能操作日志逻辑优化
|
2024-02-22 15:23:59 +08:00 |
|
钱涛
|
a78c45f8f9
|
Merge branch 'master' into feature/操作日志组件
# Conflicts:
# src/com/engine/salary/report/entity/po/SalaryStatisticsItemPO.java
|
2024-02-22 15:20:14 +08:00 |
|
Harryxzy
|
bec6443dcf
|
Merge branch 'release/个税版本' into custom/艾志工业-个税申报
# Conflicts:
# src/com/engine/salary/biz/SIArchivesBiz.java
# src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationPO.java
# src/com/engine/salary/service/impl/SIAccountServiceImpl.java
# src/com/engine/salary/service/impl/SIArchivesServiceImpl.java
# src/com/engine/salary/service/impl/SIImportServiceImpl.java
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
# src/com/engine/salary/web/SIArchivesController.java
|
2024-02-22 14:57:39 +08:00 |
|
Harryxzy
|
5c5dcdabb2
|
Merge remote-tracking branch 'origin/feature/操作日志组件' into feature/操作日志组件
|
2024-02-22 09:44:02 +08:00 |
|
Harryxzy
|
f591074fc1
|
日志
|
2024-02-22 09:43:47 +08:00 |
|
sy
|
f7eb698c4c
|
Merge remote-tracking branch 'origin/feature/操作日志组件' into feature/操作日志组件
|
2024-02-22 09:34:09 +08:00 |
|
sy
|
75dd4235af
|
薪酬系统-福利台账，补缴、补差、退差页相关功能操作日志添加
|
2024-02-22 09:33:35 +08:00 |
|
Harryxzy
|
dee20149bb
|
日志
|
2024-02-21 18:19:02 +08:00 |
|
钱涛
|
079b7de258
|
合并240101
|
2024-02-21 15:35:08 +08:00 |
|
钱涛
|
53806d9262
|
Merge branch 'release/2.10.1.2401.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
# src/com/engine/salary/util/excel/ExcelUtil.java
|
2024-02-21 15:28:33 +08:00 |
|
钱涛
|
1e12138ca1
|
Merge branch 'feature/报表维度' into release/2.10.1.2401.01
|
2024-02-21 14:17:30 +08:00 |
|
sy
|
e813a195f5
|
Merge remote-tracking branch 'origin/feature/操作日志组件' into feature/操作日志组件
|
2024-02-20 17:05:04 +08:00 |
|
sy
|
4f372645ec
|
Merge remote-tracking branch 'remotes/origin/fix/240101-福利方案，自定义福利详情获取接口增加返回参数' into release/2.10.1.2401.01
|
2024-02-20 17:00:25 +08:00 |
|
sy
|
7804936e52
|
薪酬系统-福利方案，自定义福利列表返回结果优化
|
2024-02-20 16:59:18 +08:00 |
|
sy
|
088a5c1d72
|
薪酬系统-福利台账，正常缴纳页相关功能操作日志添加
|
2024-02-20 16:50:45 +08:00 |
|
Harryxzy
|
117dbeb211
|
Merge branch 'fix/240101_考勤引用查看数据报错' into feature/操作日志组件
|
2024-02-20 10:10:22 +08:00 |
|
Harryxzy
|
400d22cc93
|
修复考勤引用查看报错
|
2024-02-20 10:06:17 +08:00 |
|
Harryxzy
|
4158f9f708
|
Merge remote-tracking branch 'origin/release/2.10.1.2401.01' into release/2.10.1.2401.01
|
2024-02-20 09:51:17 +08:00 |
|
Harryxzy
|
b4f36ab101
|
Merge branch 'feature/240102_工资单确认和反馈按钮分开' into release/2.10.1.2401.01
|
2024-02-20 09:51:00 +08:00 |
|
sy
|
cfb82cb9b2
|
薪酬系统-福利方案、档案、台账，相关实现类代码梳理，去除sqlsession形式的mpper调用
|
2024-02-19 17:27:42 +08:00 |
|
Harryxzy
|
ee82d1cb9a
|
工资单确认反馈优化
|
2024-02-19 14:16:47 +08:00 |
|
Harryxzy
|
c64e9b4b76
|
工资单确认反馈sql
|
2024-02-19 14:01:30 +08:00 |
|
sy
|
5525d9881c
|
薪酬系统-福利方案，自定义福利项详情获取接口增加返回参数
|
2024-02-19 10:33:48 +08:00 |
|
Harryxzy
|
7fe03ac7a1
|
工资单确认反馈优化
|
2024-02-19 10:09:49 +08:00 |
|
钱涛
|
b2972e8aca
|
增加操作日志类型
|
2024-02-18 11:40:59 +08:00 |
|
钱涛
|
8f8bc5256d
|
增加操作日志类型
|
2024-02-18 11:39:49 +08:00 |
|
sy
|
69513fa148
|
Merge remote-tracking branch 'origin/feature/操作日志组件' into feature/操作日志组件
|
2024-02-07 17:39:57 +08:00 |
|
sy
|
6a79b22c17
|
薪酬系统-福利档案，增加操作日志
|
2024-02-07 17:39:26 +08:00 |
|
钱涛
|
405fe226d9
|
删除elog
|
2024-02-05 16:33:43 +08:00 |
|
sy
|
146a21a377
|
Merge remote-tracking branch 'origin/feature/操作日志组件' into feature/操作日志组件
|
2024-02-05 15:13:21 +08:00 |
|
sy
|
1c61c0004d
|
薪酬系统-福利方案，方案明细编辑并保存，主表增加操作日志
|
2024-02-05 15:04:39 +08:00 |
|
钱涛
|
395d3f567f
|
sqlserver字段类型改成nvarchar(max)
|
2024-02-05 14:48:29 +08:00 |
|
钱涛
|
1c252b79da
|
sqlserver字段类型改成nvarchar(max)
|
2024-02-05 14:34:16 +08:00 |
|
sy
|
43d10c4ba0
|
Merge remote-tracking branch 'origin/feature/操作日志组件' into feature/操作日志组件
|
2024-02-05 14:07:08 +08:00 |
|
sy
|
5783342b01
|
薪酬系统-福利方案，方案新建、复制、删除功能增加操作日志
|
2024-02-05 14:06:52 +08:00 |
|
钱涛
|
133933e287
|
修改sqlserver批量插入和oracle类型
|
2024-02-05 14:04:47 +08:00 |
|
sy
|
6efbd9deb0
|
薪酬系统，将部分新增代码中labelId入参统一置为0，方便后期多语言逻辑适配时定位
|
2024-02-04 15:10:35 +08:00 |
|
Harryxzy
|
3dd1c44459
|
核算时核算校验bug
|
2024-02-04 10:55:40 +08:00 |
|
sy
|
306af48291
|
薪酬系统-福利档案，SICategoryBiz、SISchemeBiz方法迁移到对应是实现类，并修改调用方相关代码
|
2024-02-04 10:11:10 +08:00 |
|
Harryxzy
|
7976c24d05
|
艾志工业-新建核算时核算校验bug
|
2024-02-04 09:33:09 +08:00 |
|
sy
|
9074fb46fc
|
薪酬系统-福利档案，SIArchivesBiz方法迁移到对应是实现类，并修改调用方相关代码
|
2024-02-02 15:23:26 +08:00 |
|
Harryxzy
|
a4e598dc95
|
个税申报明细删除
|
2024-02-02 14:48:01 +08:00 |
|
Harryxzy
|
26e04ec9a5
|
人员信息报送日期支持yyyy/mm/dd写法
|
2024-02-01 12:05:57 +08:00 |
|
Harryxzy
|
cfeaa4fa73
|
人员信息报送日期支持yyyy/mm/dd写法
|
2024-02-01 12:03:24 +08:00 |
|
sy
|
f4ecb19ef2
|
Merge branch 'release/2.10.1.2401.01' into feature/操作日志组件
|
2024-02-01 10:21:47 +08:00 |
|
sy
|
f5d21042c8
|
Merge remote-tracking branch 'remotes/origin/feature/240101-减员action优化以及福利档案拷贝action开发' into release/2.10.1.2401.01
|
2024-01-31 16:32:45 +08:00 |
|
Harryxzy
|
e75cfae309
|
Merge branch 'feature/240101_工资单反馈区分pc和移动端' into release/2.10.1.2401.01
|
2024-01-31 16:13:27 +08:00 |
|
Harryxzy
|
a502cd84a2
|
Merge branch 'fix/240101_回算工资单发放后不能再次回算' into release/2.10.1.2401.01
|
2024-01-31 16:12:52 +08:00 |
|
钱涛
|
335964e2df
|
去除无效代码
|
2024-01-30 17:21:13 +08:00 |
|
sy
|
3281b138fa
|
薪酬系统-福利档案，复制action功能优化
|
2024-01-30 15:58:42 +08:00 |
|
Harryxzy
|
2331ef354e
|
工资单确认和反馈按钮分开
|
2024-01-30 15:53:55 +08:00 |
|
钱涛
|
336aaeabea
|
文本维度，无分组排序放到末尾
|
2024-01-30 15:45:48 +08:00 |
|
sy
|
8237ed48a6
|
Merge remote-tracking branch 'remotes/origin/feature/240101工资单模板复制优化及福利基数调整记录优化' into release/2.10.1.2401.01
|
2024-01-30 14:32:59 +08:00 |
|
sy
|
b1d3d2c445
|
薪酬系统-福利档案，复制action开发
|
2024-01-30 14:31:21 +08:00 |
|
钱涛
|
b6f7281cbd
|
记录日志
|
2024-01-30 14:17:06 +08:00 |
|
Harryxzy
|
12f66512df
|
工资单反馈区分pc和移动端
|
2024-01-30 13:50:05 +08:00 |
|
钱涛
|
60616e8462
|
Merge branch 'release/2.10.1.2401.01' into feature/报表维度
|
2024-01-30 11:39:44 +08:00 |
|
钱涛
|
e5a0a85179
|
增加调薪原因，晋升、降职、调岗
|
2024-01-30 11:18:54 +08:00 |
|
钱涛
|
65f972846f
|
处理id超过2100
|
2024-01-30 10:26:44 +08:00 |
|
钱涛
|
a8bfe83030
|
操作日志
|
2024-01-30 09:58:13 +08:00 |
|
钱涛
|
3a0646df9c
|
修复日志分页问题
|
2024-01-29 16:21:17 +08:00 |
|
钱涛
|
a78a10cad6
|
合并
|
2024-01-29 15:12:12 +08:00 |
|
钱涛
|
d2216eee13
|
Merge branch 'release/2.10.1.2401.01' into feature/操作日志组件
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
|
2024-01-29 15:07:58 +08:00 |
|
sy
|
c4adecf436
|
薪酬系统-福利档案，减员action优化
|
2024-01-29 11:30:04 +08:00 |
|
钱涛
|
9c9a8e2661
|
Merge remote-tracking branch 'origin/release/2.10.1.2401.01' into release/2.10.1.2401.01
|
2024-01-29 10:05:45 +08:00 |
|
钱涛
|
6a8c9aebe3
|
修复考勤引用数据失败bug
|
2024-01-29 10:05:30 +08:00 |
|
Harryxzy
|
5e9956fbbf
|
修复新建工资单模板时没有模板id，导致添加薪资项目时取到了其他模板的重命名的信息。
|
2024-01-26 14:56:58 +08:00 |
|
sy
|
f215b45afa
|
薪酬系统-工资单模板，复制功能改造，获取带选择薪资项目逻辑改造
|
2024-01-26 10:04:53 +08:00 |
|
钱涛
|
2aa4ed05d8
|
去除达梦驱动
|
2024-01-25 13:56:18 +08:00 |
|
sy
|
78f96c5008
|
薪酬系统，拉取20240101分支更新内容，并处理冲突
|
2024-01-25 13:37:35 +08:00 |
|
sy
|
56c9557b3a
|
Merge remote-tracking branch 'remotes/origin/release/2.10.1.2401.01' into feature/240101工资单模板复制优化及福利基数调整记录优化
# Conflicts:
# src/com/engine/salary/service/impl/SIAccountServiceImpl.java
|
2024-01-25 11:43:11 +08:00 |
|
sy
|
8eeb358dcc
|
Merge remote-tracking branch 'remotes/origin/release/2.10.1.2401.01' into feature/240101工资单模板复制优化及福利基数调整记录优化
|
2024-01-25 11:41:44 +08:00 |
|
sy
|
e92e134d21
|
薪酬系统-工资单模板，复制功能改造，补发工资单模板名称更改
|
2024-01-25 11:41:35 +08:00 |
|
钱涛
|
6fc8d8fdee
|
去除达梦驱动
|
2024-01-25 11:38:38 +08:00 |
|
sy
|
4da07b9e80
|
薪酬系统-福利档案、台账，基数调整记录列表查询增加分权，台账查询条件支持个税扣缴义务人多选
|
2024-01-24 14:35:55 +08:00 |
|
钱涛
|
5bf00a98aa
|
记录核算日志
|
2024-01-24 09:50:58 +08:00 |
|
Harryxzy
|
71f90882d3
|
工资单反馈区分pc和移动端
|
2024-01-23 16:45:09 +08:00 |
|
sy
|
163c436b3d
|
Merge remote-tracking branch 'remotes/origin/fix/231202-福利档案编辑页详情返回参数缺失' into feature/240101工资单模板复制优化及福利基数调整记录优化
|
2024-01-23 15:38:11 +08:00 |
|
sy
|
b84b5d1d6e
|
Merge remote-tracking branch 'remotes/origin/feature/231202-福利台账自动核算并归档' into feature/240101工资单模板复制优化及福利基数调整记录优化
|
2024-01-23 15:37:46 +08:00 |
|
sy
|
ead242cdb6
|
Merge remote-tracking branch 'remotes/origin/release/2.9.10.2312.02' into release/2.10.1.2401.01
|
2024-01-23 15:29:14 +08:00 |
|
sy
|
56bb9a5af3
|
薪酬系统-福利档案，编辑页详情返回编辑框对应参数缺失问题修复
|
2024-01-23 15:08:53 +08:00 |
|
sy
|
60e792d481
|
薪酬系统-福利台账，自动核算并归档功能优化
|
2024-01-23 14:46:29 +08:00 |
|
钱涛
|
a5303b42a8
|
Merge branch 'release/2.10.1.2401.01' into feature/操作日志组件
|
2024-01-23 14:08:14 +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 |
|
Harryxzy
|
790d2a2d16
|
艾志-末次薪资发放日期同步
|
2024-01-10 14:30:41 +08:00 |
|
sy
|
3b761341fc
|
薪酬系统-福利档案，档案导入功能优化，增加基数自动调整逻辑
|
2024-01-10 11:20:36 +08:00 |
|
Harryxzy
|
58f9ba9d5b
|
艾志
|
2024-01-10 10:56:11 +08:00 |
|
Harryxzy
|
f5aa425f2c
|
fix公式，人员状态变量没有值bug
|
2024-01-09 13:21:45 +08:00 |
|
钱涛
|
e0d4820e2e
|
暂存
|
2024-01-09 10:53:59 +08:00 |
|
Harryxzy
|
83e4fe9f95
|
艾志，社保福利调整acton，社保、公积金、其他福利方案均为空，跳过
|
2024-01-09 10:53:28 +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
|
3b2fb9bf4b
|
艾志优化，定时任务空则跳过
|
2024-01-03 09:52:29 +08:00 |
|
Harryxzy
|
7945c84fbb
|
薪资项目宽度
|
2024-01-02 16:37:07 +08:00 |
|
Harryxzy
|
fe00f5c0e7
|
工资单发送action
|
2024-01-02 14:40:33 +08:00 |
|
Harryxzy
|
41ef617c28
|
Merge branch 'release/个税版本' into custom/艾志工业-个税申报
|
2024-01-02 13:46:54 +08:00 |
|
Harryxzy
|
dbcd6cc0b2
|
人员信息报送导入，申报状态
|
2024-01-02 13:46:14 +08:00 |
|
Harryxzy
|
4c233fb168
|
人员信息报送导入，申报状态
|
2024-01-02 13:44:57 +08:00 |
|
钱涛
|
f2b78c3ac0
|
Merge branch 'release/个税版本' into custom/艾志工业-个税申报
|
2024-01-02 10:19:21 +08:00 |
|
钱涛
|
4cdd7616d9
|
申报前清除错误日志
|
2024-01-02 10:18:25 +08:00 |
|
Harryxzy
|
85e84ad1b3
|
Merge branch 'release/个税版本' into custom/艾志工业-个税申报
|
2024-01-02 09:42:18 +08:00 |
|
Harryxzy
|
42dfa6e1dd
|
Merge remote-tracking branch 'origin/custom/艾志工业-个税申报' into custom/艾志工业-个税申报
|
2024-01-02 09:42:01 +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 |
|
Harryxzy
|
90aedee761
|
过滤空数据
|
2024-01-02 09:40:01 +08:00 |
|
钱涛
|
121ae53c09
|
Merge branch 'release/个税版本' into custom/艾志工业-个税申报
|
2023-12-29 17:25:38 +08:00 |
|
钱涛
|
ac2046a8e7
|
新增、删除申报表
|
2023-12-29 17:24:52 +08:00 |
|
钱涛
|
b0a23483e1
|
Merge branch 'release/个税版本' into custom/艾志工业-个税申报
|
2023-12-29 11:46:42 +08:00 |
|
钱涛
|
bca7697d75
|
取消全年一次性奖金限制
|
2023-12-29 11:46:00 +08:00 |
|
Harryxzy
|
f03c0d0147
|
薪资项目同步至账套功能，过滤没有权限的账套
|
2023-12-29 10:27:35 +08:00 |
|
钱涛
|
4e46d632e4
|
Merge branch 'feature/艾志-正常申报补足年终奖人员' into custom/艾志工业-个税申报
|
2023-12-28 21:00:15 +08:00 |
|
钱涛
|
79ba7c754c
|
申报反馈
|
2023-12-28 20:59:13 +08:00 |
|
Harryxzy
|
810058634a
|
非系统人员bug
|
2023-12-28 18:53:16 +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 |
|
Harryxzy
|
81ba840385
|
艾志 -3、薪资档案新增“首次薪资发放日期”、“末次薪资发放日期” 支持前端修改，个税申报中，“任职受雇从业日期”，“离职日期”取薪资档案中日期；
|
2023-12-22 10:45:31 +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 |
|
钱涛
|
9a5a0f4c00
|
Merge branch 'release/个税版本' into custom/艾志工业-个税申报
|
2023-12-18 15:25:05 +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 |
|
钱涛
|
76dc439a62
|
Merge branch 'release/个税版本' into custom/艾志工业-个税申报
|
2023-12-08 18:16:32 +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 |
|
钱涛
|
6cabf58c2e
|
Merge branch 'release/个税版本' into custom/艾志工业-个税申报
# Conflicts:
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
|
2023-12-07 15:56:01 +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 |