sy
|
3571797e12
|
薪酬系统-薪资核算，薪资项目函数中增加福利核算明细项根据缴纳状态的细分项
|
2023-07-14 09:13:19 +08:00 |
 钱涛
|
942a3b2a97
|
修复工资单发送列表
|
2023-07-13 17:23:28 +08:00 |
|
钱涛
|
873b90474f
|
Merge branch 'feature/230701qt' into feature/外部人员
|
2023-07-13 16:55:36 +08:00 |
|
钱涛
|
152eeaa68e
|
所有配置文件
|
2023-07-13 16:55:23 +08:00 |
|
钱涛
|
385726fa76
|
所有配置文件
|
2023-07-13 16:51:01 +08:00 |
|
sy
|
b007b1b351
|
薪酬系统-薪资核算，自定义导出字段
|
2023-07-13 14:43:54 +08:00 |
|
钱涛
|
0fc16efb11
|
核算界面获取外部人员
|
2023-07-13 14:11:54 +08:00 |
|
钱涛
|
4901f79066
|
核算界面获取外部人员
|
2023-07-13 14:11:32 +08:00 |
Harryxzy
|
30d61e352f
|
工资单确认反馈
|
2023-07-13 11:50:02 +08:00 |
|
钱涛
|
888938f150
|
系统设置接口
|
2023-07-13 11:33:58 +08:00 |
|
钱涛
|
23c0a78adc
|
修复外部人员初始化档案数据
|
2023-07-13 10:20:41 +08:00 |
|
sy
|
c78c8375f0
|
薪酬系统-薪资核算，自定义导出字段
|
2023-07-12 15:20:02 +08:00 |
|
Harryxzy
|
820d15d06f
|
工资单确认反馈
|
2023-07-12 15:17:59 +08:00 |
|
Harryxzy
|
58fe219cdb
|
fix 工资单反馈bug
|
2023-07-12 11:25:44 +08:00 |
|
钱涛
|
89ecf0984d
|
fix外部人员
|
2023-07-12 09:45:00 +08:00 |
|
sy
|
47dc9e35bd
|
薪酬系统-福利台账，已归档状态下重新核算按钮增加是否被薪资核算引用校验逻辑
|
2023-07-11 17:56:45 +08:00 |
|
Harryxzy
|
56c1666542
|
工资单发放
|
2023-07-11 17:51:52 +08:00 |
|
Harryxzy
|
5dc2dadd46
|
工资单自动确认
|
2023-07-11 17:28:15 +08:00 |
|
钱涛
|
aec6918c12
|
Merge branch 'release/2.9.1.2307.01' into feature/外部人员
# Conflicts:
# src/com/engine/salary/biz/EmployBiz.java
# src/com/engine/salary/biz/SIAccountBiz.java
# src/com/engine/salary/entity/salaryBill/dto/SalarySendDetailListDTO.java
# src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java
# src/com/engine/salary/mapper/archive/SalaryArchiveMapper.java
# src/com/engine/salary/service/SalaryEmployeeService.java
# src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
# src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
# src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java
# src/com/engine/salary/service/impl/SIAccountServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
# src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
# src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
# src/com/engine/salary/service/impl/SalarySendRangeServiceImpl.java
# src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java
# src/com/engine/salary/web/SalarySobController.java
# src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
# src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
# src/com/engine/salary/wrapper/SalarySendWrapper.java
# src/com/engine/salary/wrapper/TaxAgentSubAdminWrapper.java
# src/com/engine/salary/wrapper/TaxDeclarationWrapper.java
|
2023-07-11 16:08:15 +08:00 |
|
Harryxzy
|
33a0723ad2
|
Merge branch 'release/2.9.1.2307.01' into feature/230701-工资单反馈
|
2023-07-11 15:29:21 +08:00 |
|
Harryxzy
|
be895829c2
|
工资单反馈
|
2023-07-11 15:29:13 +08:00 |
|
Harryxzy
|
5918de016e
|
Merge branch 'feature/salalryItemAndFieldSort' into release/2.9.1.2307.01
# Conflicts:
# src/com/engine/salary/service/impl/SalaryItemServiceImpl.java
|
2023-07-11 13:24:37 +08:00 |
|
Harryxzy
|
fa950fb4dd
|
薪资项目排序比较
|
2023-07-11 13:23:07 +08:00 |
|
sy
|
fd9a9aef72
|
Merge remote-tracking branch 'remotes/origin/fix/salaryExportBug-0706' into release/2.9.1.2307.01
|
2023-07-11 11:31:29 +08:00 |
|
sy
|
ad37ba9af0
|
薪酬系统-薪资档案，高级搜索中工号、分部筛选问题修复
|
2023-07-11 11:30:57 +08:00 |
|
sy
|
c28f782f19
|
Merge remote-tracking branch 'remotes/origin/fix/salaryExportBug-0706' into release/2.9.1.2307.01
|
2023-07-11 11:11:15 +08:00 |
|
sy
|
83604ba534
|
薪酬系统-福利台账，修改台账列表返回台账状态值返回逻辑
|
2023-07-11 11:10:32 +08:00 |
|
钱涛
|
f53c904fde
|
Merge branch 'fix/230701修复项目添加时名称校验问题' into release/2.9.1.2307.01
|
2023-07-11 11:08:39 +08:00 |
|
钱涛
|
bb6cf386cb
|
修复
|
2023-07-11 11:05:35 +08:00 |
|
Harryxzy
|
7a72ef28d1
|
Merge remote-tracking branch 'origin/release/2.9.1.2307.01' into release/2.9.1.2307.01
|
2023-07-11 10:14:46 +08:00 |
|
Harryxzy
|
7d9ad3d79e
|
不允许删除薪资档案校验
|
2023-07-11 10:14:28 +08:00 |
|
sy
|
a55ca5182e
|
Merge remote-tracking branch 'remotes/origin/fix/salaryExportBug-0706' into release/2.9.1.2307.01
|
2023-07-11 09:59:29 +08:00 |
|
sy
|
e67530eb87
|
薪酬系统-福利档案，导出加高级搜索问题修复
|
2023-07-10 17:20:04 +08:00 |
|
sy
|
b705161492
|
薪酬系统-薪资核算、薪资档案、福利档案，高级搜索功能问题修复
|
2023-07-10 14:33:43 +08:00 |
|
Harryxzy
|
467746f7df
|
Merge branch 'release/2.9.1.2307.01' into feature/230701-工资单反馈
|
2023-07-10 11:12:03 +08:00 |
|
Harryxzy
|
584ebbc562
|
暂存
|
2023-07-10 11:11:52 +08:00 |
|
Harryxzy
|
0e2a6c8368
|
Merge branch 'feature/taxDeclarationWithdraw' into release/2.9.1.2307.01
# Conflicts:
# src/com/engine/salary/sys/constant/SalarySysConstant.java
# src/com/engine/salary/sys/entity/vo/AppSettingVO.java
# src/com/engine/salary/sys/service/SalarySysConfService.java
# src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
# src/com/engine/salary/web/SalarySystemConfigController.java
# src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java
|
2023-07-10 11:10:10 +08:00 |
|
sy
|
193e28758c
|
薪酬系统-薪资核算、薪资档案、福利档案，高级搜索中的状态条件改为数组类型的入参
|
2023-07-10 10:26:08 +08:00 |
|
Harryxzy
|
b7c58ecc11
|
Merge branch 'fix/累计专项附加扣除防抖动' into release/2.9.1.2307.01
|
2023-07-10 10:10:58 +08:00 |
|
Harryxzy
|
938f03946b
|
Merge branch 'feature/230701-系统薪资项目可配置删除' into release/2.9.1.2307.01
|
2023-07-10 10:09:52 +08:00 |
|
Harryxzy
|
9b7ba19d64
|
Merge branch 'feature/230701-工资单定时发送' into release/2.9.1.2307.01
|
2023-07-10 10:09:45 +08:00 |
|
Harryxzy
|
e90bd66489
|
Merge branch 'feature/230701-删除档案' into release/2.9.1.2307.01
|
2023-07-10 10:09:38 +08:00 |
|
sy
|
b92c7ff599
|
薪酬系统-薪资核算、薪资档案、福利档案，高级搜索中的状态条件改为数组类型的入参
|
2023-07-07 15:32:12 +08:00 |
|
sy
|
9c34fb9497
|
薪酬系统-薪资核算，搜索条件新增字段
|
2023-07-07 11:47:43 +08:00 |
|
sy
|
fa28db9c79
|
薪酬系统-薪资核算，高级搜索和导出带入筛选条件未生效问题修复
|
2023-07-07 10:15:23 +08:00 |
|
Harryxzy
|
40fc4ea13c
|
工资单定时发送 调整周期类型
|
2023-07-05 11:39:54 +08:00 |
|
Harryxzy
|
508e324dac
|
工资单定时发送 添加 发放周期
|
2023-07-05 10:36:02 +08:00 |
|
Harryxzy
|
896e0c9e34
|
工资单定时发送 添加 发放周期
|
2023-07-05 09:59:45 +08:00 |
|
Harryxzy
|
c78839d8c0
|
工资单定时发送 添加 发放周期
|
2023-07-04 18:03:57 +08:00 |
|
钱涛
|
91859e5127
|
Merge branch 'feature/230701非系统算税' into release/2.9.1.2307.01
|
2023-07-04 15:38:55 +08:00 |
|
sy
|
0e8aa4995d
|
Merge remote-tracking branch 'remotes/origin/fix/importTemplateRemarkRepair' into release/2.9.1.2307.01
|
2023-07-04 14:51:07 +08:00 |
|
sy
|
7f7e7cd453
|
薪酬系统-薪资档案，导入模板字段提示位置问题修复
|
2023-07-04 14:48:02 +08:00 |
|
Harryxzy
|
a5a05aabda
|
工资单定时发送fix
|
2023-07-04 14:35:51 +08:00 |
|
Harryxzy
|
c8cf6090ff
|
系统薪资项目可配置删除、工资单模板默认没有隐藏项目
|
2023-07-04 13:21:19 +08:00 |
|
钱涛
|
82ab6c1e11
|
非系统算税功能
|
2023-07-04 09:32:12 +08:00 |
|
Harryxzy
|
8dc3883168
|
工资单定时发送
|
2023-07-03 17:46:11 +08:00 |
|
钱涛
|
a37d6758bb
|
核算状态标识
|
2023-07-03 14:27:20 +08:00 |
|
钱涛
|
1403b22cf7
|
修复邮件保存
|
2023-07-03 14:02:34 +08:00 |
|
Harryxzy
|
11c416601d
|
工资单定时发送渲染bug
|
2023-07-03 11:21:49 +08:00 |
|
Harryxzy
|
5e4f32dbab
|
累计专项附加扣除更新插入时间修正
|
2023-07-03 10:34:30 +08:00 |
|
Harryxzy
|
2bf99d3ec1
|
累计专项附加扣除防抖动修复
|
2023-07-03 10:33:01 +08:00 |
|
Harryxzy
|
faa2b9c16e
|
工资单模板信息
|
2023-07-03 09:44:10 +08:00 |
|
Harryxzy
|
18fb376054
|
个税申报撤回fix
|
2023-06-30 16:41:06 +08:00 |
|
Harryxzy
|
9842784297
|
工资单定时发送 - 模板保存
|
2023-06-30 15:58:55 +08:00 |
|
Harryxzy
|
8cbc758131
|
删除档案开关bug
|
2023-06-30 11:40:59 +08:00 |
|
Harryxzy
|
1fa04f1515
|
个税申报撤回开关-2
|
2023-06-29 16:42:48 +08:00 |
|
Harryxzy
|
04592a58b4
|
Merge branch 'release/2.8.4.2306.02' into feature/taxDeclarationWithdraw
# Conflicts:
# src/com/engine/salary/sys/constant/SalarySysConstant.java
# src/com/engine/salary/sys/service/SalarySysConfService.java
# src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
# src/com/engine/salary/web/SalarySystemConfigController.java
# src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java
|
2023-06-29 16:40:07 +08:00 |
|
Harryxzy
|
ba85231656
|
个税申报撤回开关-1
|
2023-06-29 16:38:50 +08:00 |
|
Harryxzy
|
d10d5da364
|
Merge remote-tracking branch 'origin/release/2.8.4.2306.02' into release/2.8.4.2306.02
|
2023-06-29 15:14:10 +08:00 |
|
sy
|
a429c271f4
|
Merge branch 'feature/230602-数据库适配-PG' into release/2.8.4.2306.02
|
2023-06-29 15:12:48 +08:00 |
|
Harryxzy
|
eb0c59c0b9
|
累计专项附加扣除列表提速-2
|
2023-06-29 14:05:33 +08:00 |
|
Harryxzy
|
33593311df
|
累计专项附加扣除列表提速
|
2023-06-29 14:04:11 +08:00 |
|
Harryxzy
|
e3e0bcd66b
|
累计专项附加扣除防抖动
|
2023-06-29 13:53:07 +08:00 |
|
钱涛
|
6a5304a605
|
修复进度条
|
2023-06-29 13:38:07 +08:00 |
|
Harryxzy
|
2735661b4a
|
删除薪资档案
|
2023-06-29 10:35:55 +08:00 |
|
钱涛
|
b130fb0121
|
海康包冲突jar
|
2023-06-28 18:11:53 +08:00 |
|
Harryxzy
|
5d83326d23
|
listByAcctEmployeeIdsAndSalaryItemIds的分片问题
|
2023-06-28 16:26:20 +08:00 |
|
sy
|
faee7160e3
|
Merge remote-tracking branch 'remotes/origin/release/2.8.4.2306.02' into feature/230602-数据库适配-PG
|
2023-06-28 09:46:11 +08:00 |
|
Harryxzy
|
2bb5d18b90
|
Merge branch 'fix/薪资核算页面查看权限校验' into release/2.8.4.2306.02
|
2023-06-28 09:16:51 +08:00 |
|
Harryxzy
|
ea527d0e37
|
Merge branch 'fix/下载档案模板没有数据' into release/2.8.4.2306.02
|
2023-06-27 18:00:59 +08:00 |
|
Harryxzy
|
04f0528143
|
修复下载薪资档案模板没有带出档案数据
|
2023-06-27 18:00:39 +08:00 |
|
钱涛
|
89ae0dc786
|
报表缓存时参数变更问题
|
2023-06-27 16:18:42 +08:00 |
|
sy
|
041303275b
|
Merge remote-tracking branch 'remotes/origin/release/2.8.4.2306.02' into feature/230602-数据库适配-PG
|
2023-06-27 15:09:12 +08:00 |
|
sy
|
d65a792076
|
Merge remote-tracking branch 'remotes/origin/release/2.8.4.2306.02' into feature/230602-数据库适配-PG
|
2023-06-27 15:05:22 +08:00 |
|
sy
|
1ed02f4d07
|
薪酬系统-福利台账，(修改台账列表返回台账状态值返回逻辑)——暂时取消
|
2023-06-27 15:05:07 +08:00 |
|
Harryxzy
|
822ad87451
|
薪资核算结果校验拦截
|
2023-06-27 14:58:33 +08:00 |
|
Harryxzy
|
6ae98ce50a
|
Merge branch 'fix/新建定量维度时数据透视没有值' into release/2.8.4.2306.02
|
2023-06-26 14:23:27 +08:00 |
|
钱涛
|
6f3593f44b
|
Merge branch 'feature/短信验证码' into release/2.8.4.2306.02
# Conflicts:
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
# src/com/engine/salary/sys/constant/SalarySysConstant.java
|
2023-06-26 13:54:56 +08:00 |
|
Harryxzy
|
ca248ded98
|
发送邮件修复bug
|
2023-06-26 13:32:14 +08:00 |
|
Harryxzy
|
7c44a2ad6b
|
Merge branch 'feature/waterMark' into release/2.8.4.2306.02
# Conflicts:
# src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java
# src/com/engine/salary/web/SalaryBillController.java
|
2023-06-26 13:28:21 +08:00 |
|
Harryxzy
|
ce6ba1453c
|
Merge branch 'fix/一键累计定时任务' into release/2.8.4.2306.02
|
2023-06-26 13:27:21 +08:00 |
|
Harryxzy
|
0d23a318e8
|
Merge branch 'feature/停薪action' into release/2.8.4.2306.02
|
2023-06-26 13:27:03 +08:00 |
|
Harryxzy
|
a43123efc0
|
Merge branch 'fix/DBType修改' into release/2.8.4.2306.02
|
2023-06-26 13:26:27 +08:00 |
|
Harryxzy
|
3be6eaa16f
|
Merge branch 'feature/核算人员匹配规则（是否包含停薪列）' into release/2.8.4.2306.02
|
2023-06-26 13:26:03 +08:00 |
|
Harryxzy
|
0117624dc4
|
Merge branch 'fix/回算后无法发放第二次工资单' into release/2.8.4.2306.02
|
2023-06-26 13:25:36 +08:00 |
|
Harryxzy
|
5ecba7fa3e
|
Merge branch 'feature/taxDeclarationWithdraw' into release/2.8.4.2306.02
|
2023-06-26 13:25:01 +08:00 |
|
sy
|
cbcd53d92d
|
薪酬系统-福利台账，修改台账列表返回台账状态值返回逻辑
|
2023-06-26 10:56:03 +08:00 |
|
sy
|
f2cca4cfd7
|
Merge remote-tracking branch 'remotes/origin/fix/DBType修改' into feature/230602-数据库适配-PG
|
2023-06-26 10:15:24 +08:00 |
|
sy
|
8514f076d0
|
薪酬系统-pg数据库适配，考勤引用-设置表头字段显示异常问题修复
|
2023-06-26 10:14:07 +08:00 |
|
钱涛
|
50fa724756
|
采用线程池发送邮件
|
2023-06-26 10:11:54 +08:00 |
|
sy
|
3657abe41b
|
薪酬系统-pg数据库适配，福利档案状态变换异常问题修复
|
2023-06-25 17:56:18 +08:00 |
|
sy
|
1bb9b939f0
|
薪酬系统-pg数据库适配，薪资档案待定薪导入问题修复
|
2023-06-25 13:50:20 +08:00 |
|
钱涛
|
1e78c40e9a
|
Merge branch 'feature/报表缓存' into release/2.8.4.2306.02
|
2023-06-21 09:48:23 +08:00 |
|
Harryxzy
|
e7edb9040c
|
修复无分类
|
2023-06-20 17:27:18 +08:00 |
|
钱涛
|
3708aea0de
|
考勤引用-列表字段根据当时引用情况生成
|
2023-06-20 17:00:14 +08:00 |
|
钱涛
|
d90a1977ce
|
fix数据采集-往期累计情况导出全部字段为空时显示null
|
2023-06-20 15:58:03 +08:00 |
|
Harryxzy
|
d60d24ea2e
|
新建定量维度时数据透视没有值
|
2023-06-20 14:31:06 +08:00 |
|
钱涛
|
7719c503fe
|
Merge branch 'release/2.8.4.2306.02' into feature/报表缓存
|
2023-06-19 14:22:11 +08:00 |
|
Harryxzy
|
0e601e3967
|
修改DBType的写法
|
2023-06-19 13:59:24 +08:00 |
|
钱涛
|
16cf63018f
|
重新核算或者回算时删除报表缓存
|
2023-06-19 09:54:02 +08:00 |
|
Harryxzy
|
6850c050b8
|
薪资核算人员去除 停薪_来自待定薪
|
2023-06-19 09:16:49 +08:00 |
|
Harryxzy
|
d9f57ac258
|
修复回算后无法发放第二次核算的工资单
|
2023-06-16 16:41:49 +08:00 |
|
Harryxzy
|
1c6cf5feab
|
核算人员匹配规则（是否包含停薪列表）暂存
|
2023-06-16 15:47:24 +08:00 |
|
钱涛
|
8612f0e5b2
|
Merge branch 'release/2.8.4.2306.02' into feature/短信验证码
|
2023-06-16 14:54:24 +08:00 |
|
Harryxzy
|
3096954628
|
核算人员匹配规则（是否包含停薪列表）暂存
|
2023-06-16 14:40:36 +08:00 |
|
钱涛
|
ec67c89e7d
|
报表排除掉未归档的数据
|
2023-06-16 13:49:40 +08:00 |
|
Harryxzy
|
ee7936a9bf
|
考勤引用校验能够否删除
|
2023-06-16 13:33:38 +08:00 |
|
Harryxzy
|
512510c623
|
考勤引用校验能够否删除
|
2023-06-16 11:49:23 +08:00 |
|
Harryxzy
|
1805726387
|
限制无法打开他人工资单
|
2023-06-16 10:14:28 +08:00 |
|
Harryxzy
|
f4b3a742f0
|
系统默认水印
|
2023-06-16 09:58:54 +08:00 |
|
钱涛
|
5e6a65e47e
|
获取报表缓存，暂存方法
|
2023-06-15 18:48:31 +08:00 |
|
钱涛
|
5926697c29
|
报表缓存
|
2023-06-15 17:34:52 +08:00 |
|
sy
|
f33f309262
|
Merge remote-tracking branch 'remotes/origin/feature/v4-importAndExportHeaderUnified-0615' into release/2.8.4.2306.02
|
2023-06-15 16:35:52 +08:00 |
|
Harryxzy
|
ee14b0435b
|
一键累计定时任务
|
2023-06-15 16:18:24 +08:00 |
|
Harryxzy
|
36fc2abffc
|
停薪action
|
2023-06-15 15:23:54 +08:00 |
|
Harryxzy
|
b30c08d3ff
|
停薪action传个税扣缴义务人名
|
2023-06-15 14:48:58 +08:00 |
|
Harryxzy
|
a044335406
|
停薪actionCheck
|
2023-06-15 11:12:12 +08:00 |
|
钱涛
|
87a9338a73
|
Merge remote-tracking branch 'origin/release/2.8.4.2306.02' into release/2.8.4.2306.02
|
2023-06-15 10:44:42 +08:00 |
|
钱涛
|
2480525fa6
|
修复同步档案bug
缓存公共接口
|
2023-06-15 10:44:31 +08:00 |
|
sy
|
c87a754888
|
薪酬系统，薪资账套、个税扣缴义务人、薪资项目列表按照创建时间降序排列
|
2023-06-15 10:23:03 +08:00 |
|
Harryxzy
|
9905f406c0
|
停薪action
|
2023-06-15 10:07:06 +08:00 |
|
Harryxzy
|
d0c04688a8
|
停薪action
|
2023-06-15 10:05:27 +08:00 |
|
钱涛
|
912c80c97f
|
验证方式
|
2023-06-14 16:15:05 +08:00 |
|
钱涛
|
57798a8e3e
|
短信验证码功能
|
2023-06-14 15:51:26 +08:00 |
|
sy
|
3638fb469f
|
薪酬系统-薪资档案，列表导入、导出统一表头内容和顺序，不包括自选表头
|
2023-06-14 10:33:26 +08:00 |
|
sy
|
12b4977067
|
薪酬系统-福利台账，退差新增逻辑优化
|
2023-06-13 15:43:10 +08:00 |
|
sy
|
1460d32ae4
|
薪酬系统-社保福利，列表导入、导出统一表头内容和顺序，不包括自选表头
|
2023-06-13 14:49:26 +08:00 |
|
Harryxzy
|
a74bddf326
|
Merge branch 'fix/salaryAcctResutAutoLock' into release/2.8.4.2306.02
|
2023-06-13 13:19:13 +08:00 |
|
Harryxzy
|
e034954d79
|
Merge branch 'fix/statisticsEditDelete' into release/2.8.4.2306.02
|
2023-06-13 10:19:37 +08:00 |
|
Harryxzy
|
b544c5e2c1
|
水印预览
|
2023-06-13 10:02:11 +08:00 |
|
Harryxzy
|
b60904cc03
|
水印 - 邮件水印不支持图片
|
2023-06-12 18:55:27 +08:00 |
|
Harryxzy
|
d303110737
|
Merge branch 'fix/statisticsEditDelete' into release/2.8.3.2306.01
|
2023-06-12 15:38:03 +08:00 |
|
钱涛
|
8bde871286
|
档案返回列表状态
|
2023-06-12 15:36:27 +08:00 |
|
Harryxzy
|
7a40a31d6f
|
水印 - 暂存2
|
2023-06-12 15:19:24 +08:00 |
|
Harryxzy
|
155a00623a
|
导入编辑自动锁定 根据confValue判断
|
2023-06-12 10:45:01 +08:00 |
|
Harryxzy
|
c37750b538
|
撤回个税申报
|
2023-06-12 10:40:01 +08:00 |
|
Harryxzy
|
76977331af
|
暂存
|
2023-06-09 17:57:17 +08:00 |
|
Harryxzy
|
b2f39f56e2
|
Merge branch 'fix/sysSalaryItemSearchBUG' into release/2.8.3.2306.01
|
2023-06-09 09:50:25 +08:00 |
|
Harryxzy
|
849ea1e2d0
|
Merge remote-tracking branch 'origin/release/2.8.3.2306.01' into release/2.8.3.2306.01
|
2023-06-09 09:49:22 +08:00 |
|
Harryxzy
|
5bee0f3b4d
|
Merge branch 'feature/salalryItemAndFieldSort' into release/2.8.3.2306.01
|
2023-06-09 09:48:56 +08:00 |
|
Harryxzy
|
e24579f363
|
Merge branch 'feature/statisticDataPerspective' into release/2.8.3.2306.01
|
2023-06-09 09:48:27 +08:00 |
|
钱涛
|
892f99052b
|
报表数据接口返回报表id
|
2023-06-09 09:46:03 +08:00 |
|
Harryxzy
|
93a7dcd59f
|
数据透视 fix WeaTable
|
2023-06-08 18:04:25 +08:00 |
|
钱涛
|
f881fa2766
|
取消注释
|
2023-06-08 17:19:19 +08:00 |
|
Harryxzy
|
e464ca8ba6
|
薪资账套中薪资项目可以删除
|
2023-06-08 15:30:52 +08:00 |
|
Harryxzy
|
4b574c9e57
|
报表数据透视提速
|
2023-06-08 14:00:51 +08:00 |
|
Harryxzy
|
3d11c74d32
|
报表数据透视fixbug
|
2023-06-08 12:25:11 +08:00 |
|
Harryxzy
|
d013d14e31
|
系统薪资项目列表显示改造- 数据库适配
|
2023-06-08 11:38:53 +08:00 |
|
Harryxzy
|
dbb2a97be4
|
系统薪资项目列表显示改造
|
2023-06-08 11:10:40 +08:00 |
|
Harryxzy
|
50fd5812d4
|
数据透视功能改为post
|
2023-06-08 10:24:28 +08:00 |
|
钱涛
|
458b04703d
|
Merge remote-tracking branch 'origin/release/2.8.3.2306.01' into release/2.8.3.2306.01
|
2023-06-08 10:15:59 +08:00 |
|
钱涛
|
a4679d7a5b
|
展示底层异常
|
2023-06-08 10:14:37 +08:00 |
|
Harryxzy
|
94edee7f8c
|
Merge branch 'feature/taxAgentSorted' into release/2.8.3.2306.01
|
2023-06-08 09:03:21 +08:00 |
|
sy
|
5a54b83b4a
|
Merge remote-tracking branch 'origin/release/2.8.3.2306.01' into release/2.8.3.2306.01
|
2023-06-07 18:41:22 +08:00 |
|
sy
|
054d880afa
|
薪酬系统-福利档案，likecondition条件取消mysql指定
|
2023-06-07 18:40:55 +08:00 |
|
钱涛
|
799b3d9f64
|
Merge branch 'feature/短信邮件' into release/2.8.3.2306.01
|
2023-06-07 17:32:48 +08:00 |
|
钱涛
|
7701420430
|
邮件去除图片
|
2023-06-07 17:19:00 +08:00 |
|
Harryxzy
|
dcb28b052f
|
数据透视功能-分页+排序
|
2023-06-07 16:50:09 +08:00 |
|
Harryxzy
|
deaa9acfa0
|
Merge branch 'release/2.8.3.2306.01' into feature/statisticDataPerspective
|
2023-06-07 15:44:51 +08:00 |
|
Harryxzy
|
4617005e1f
|
数据透视功能
|
2023-06-07 15:43:23 +08:00 |
|
sy
|
4c1e7da51b
|
薪酬系统-福利档案，福利档案导出增加工号信息
|
2023-06-07 15:40:38 +08:00 |
|
钱涛
|
77e9b0a74b
|
Merge branch 'release/2.8.3.2306.01' into feature/短信邮件
|
2023-06-07 15:12:40 +08:00 |
|
Harryxzy
|
9e794c988a
|
Merge branch 'fix/balanceImportBUG_0511' into release/2.8.3.2306.01
|
2023-06-07 14:36:27 +08:00 |
|
钱涛
|
3498005a11
|
工资单发放
|
2023-06-07 14:21:47 +08:00 |
|
Harryxzy
|
a6356a7d3d
|
Merge branch 'feature/salalryItemAndFieldSort' into release/2.8.3.2306.01
|
2023-06-07 12:27:29 +08:00 |
|
Harryxzy
|
f4627b53f9
|
fix没有公式id内容bug
|
2023-06-07 12:23:05 +08:00 |
|
钱涛
|
37d9c04a30
|
去除发放状态中文转换
|
2023-06-07 09:43:54 +08:00 |
|
钱涛
|
d4c8a66fcf
|
注释优化
|
2023-06-07 09:31:46 +08:00 |
|
钱涛
|
4a258aa45b
|
替换短信发送方法
|
2023-06-06 16:40:09 +08:00 |
|
钱涛
|
f154753698
|
拦截短信
|
2023-06-06 15:02:53 +08:00 |
|
Harryxzy
|
1584a27fe8
|
个税扣缴义务人排序
|
2023-06-06 14:44:00 +08:00 |
|
钱涛
|
4358dc20a5
|
Merge branch 'release/2.8.3.2306.01' into feature/短信邮件
|
2023-06-06 14:24:23 +08:00 |
|
钱涛
|
a308ee8d1f
|
获取员工短信内容
|
2023-06-06 14:21:35 +08:00 |
|
钱涛
|
0e5eb1b11e
|
工资单发送
|
2023-06-06 11:48:19 +08:00 |
|
钱涛
|
993db67601
|
公共进度条功能
|
2023-06-06 10:30:49 +08:00 |
|
钱涛
|
4582ab1e51
|
邮件审批方法
|
2023-06-06 09:51:07 +08:00 |
|
Harryxzy
|
0d3a48e7ea
|
个税扣缴义务人排序
|
2023-06-05 15:14:25 +08:00 |
|
钱涛
|
91e3b335dd
|
工资单通道
|
2023-06-05 13:35:17 +08:00 |
|
Harryxzy
|
466412a444
|
Merge branch 'fix/salaryAcctSearchLockItem' into release/2.8.3.2306.01
|
2023-06-05 09:53:13 +08:00 |
|
Harryxzy
|
30e2c489ea
|
Merge branch 'feature/salalryItemAndFieldSort' into release/2.8.3.2306.01
|
2023-06-05 09:52:57 +08:00 |
|
sy
|
f8e9e8513d
|
Merge remote-tracking branch 'remotes/origin/feature/v4-addWorkcodeQuery-0601' into release/2.8.3.2306.01
|
2023-06-05 09:17:54 +08:00 |
|
Harryxzy
|
1294e86c8c
|
导入自动锁定添加开关
|
2023-06-02 15:25:46 +08:00 |
|
Harryxzy
|
52b592dd7e
|
薪资核算获取加锁的值时增加项目条件，提速
|
2023-06-02 15:06:07 +08:00 |
|
Harryxzy
|
d53d7a33d7
|
删除锁定多余代码
|
2023-06-02 14:47:15 +08:00 |
|
钱涛
|
0da2bfa55a
|
邮件暂存
|
2023-06-02 14:38:56 +08:00 |
|
Harryxzy
|
74c5b4f19f
|
薪资项目 和 字段管理的排序
|
2023-06-01 17:52:31 +08:00 |
|
钱涛
|
4be4acc5d8
|
Merge branch 'release/2.8.3.2306.01' into feature/短信邮件
# Conflicts:
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
|
2023-06-01 11:49:16 +08:00 |
|
sy
|
007328476a
|
薪酬系统-薪资核算，薪资核算列表工号查询逻辑优化
|
2023-06-01 11:17:06 +08:00 |
|
钱涛
|
3ce388a935
|
Merge remote-tracking branch 'origin/release/2.8.3.2306.01' into release/2.8.3.2306.01
|
2023-06-01 11:05:26 +08:00 |
|
钱涛
|
0472c7b757
|
显示字段管理默认使用列
报表空数据处理
|
2023-06-01 11:05:15 +08:00 |
|
Harryxzy
|
4e04b6e268
|
薪资核算导入，选择表单字段获取未分类
|
2023-06-01 10:30:33 +08:00 |
|
sy
|
fb03cf98a7
|
薪酬系统，福利台账、薪资档案、薪资核算增加工号查询
|
2023-05-31 11:49:40 +08:00 |
|
Harryxzy
|
601b90d188
|
薪资档案薪资项目排序
|
2023-05-31 09:55:24 +08:00 |
|
Harryxzy
|
0ec6e740d3
|
Merge branch 'fix/backCalcSumRow' into release/2.8.3.2306.01
|
2023-05-29 16:48:18 +08:00 |
|
Harryxzy
|
a2f4653411
|
当薪资档案列表为0时，由于查询了全量数据，导致速度慢
|
2023-05-29 16:17:13 +08:00 |
|
钱涛
|
65849f99b1
|
人员明细自定义列
|
2023-05-26 16:45:05 +08:00 |
|
钱涛
|
0734b5ce01
|
公式des
|
2023-05-26 15:40:08 +08:00 |
|
Harryxzy
|
7e841f6fd3
|
修复回算工资单合计列
|
2023-05-26 15:13:56 +08:00 |
|
钱涛
|
39ee8d9d35
|
人员明细列表展示账套和核算记录信息、自定义列功能
|
2023-05-26 14:45:04 +08:00 |
|
钱涛
|
fef828ef1d
|
人员明细列表展示账套和核算记录信息、自定义列功能
|
2023-05-26 11:17:25 +08:00 |
|
钱涛
|
ecdfc0c957
|
Merge remote-tracking branch 'origin/release/2.8.3.2306.01' into release/2.8.3.2306.01
|
2023-05-26 11:15:49 +08:00 |
|
钱涛
|
220848e92d
|
档案项目正序排列
|
2023-05-26 11:15:40 +08:00 |
|
Harryxzy
|
af07cfd930
|
Merge remote-tracking branch 'origin/release/2.8.3.2306.01' into release/2.8.3.2306.01
|
2023-05-25 17:12:15 +08:00 |
|
Harryxzy
|
b26e6069ad
|
Merge branch 'fix/salaryAcctResultEdit' into release/2.8.3.2306.01
|
2023-05-25 17:11:58 +08:00 |
|
Harryxzy
|
25ffd06dd4
|
修复编辑薪资核算没有未分类
|
2023-05-25 17:06:03 +08:00 |
|
钱涛
|
399a615be6
|
人员明细
|
2023-05-25 13:51:27 +08:00 |
|
钱涛
|
ec90e31695
|
Merge branch 'release/2.8.3.2306.01' into feature/短信邮件
|
2023-05-24 16:20:39 +08:00 |
|
Harryxzy
|
32e7959745
|
维度统计管理判断能否删除和编辑-2
|
2023-05-24 14:49:39 +08:00 |
|
Harryxzy
|
33a8ecb4f7
|
维度统计管理判断能否删除和编辑
|
2023-05-24 14:17:31 +08:00 |
|
sy
|
91a06a93a3
|
Merge remote-tracking branch 'remotes/origin/feature/v4-siTermDateRename-0525' into release/2.8.3.2306.01
|
2023-05-24 10:04:47 +08:00 |
|
sy
|
a44f6bf3af
|
薪酬系统-福利档案，列表表头中的离职日期改为合同到期日期
|
2023-05-24 10:02:49 +08:00 |
|
钱涛
|
74c4305b9d
|
优化核算异常提示
|
2023-05-23 15:15:55 +08:00 |
|
Harryxzy
|
5768da7099
|
Merge remote-tracking branch 'origin/release/2.8.2.2305.02' into release/2.8.2.2305.02
|
2023-05-22 14:03:51 +08:00 |
|
Harryxzy
|
1525cf89c7
|
Merge branch 'feature/initSalaryArchiveAction' into release/2.8.2.2305.02
|
2023-05-22 14:03:32 +08:00 |
|
Harryxzy
|
a916e061d8
|
Merge branch 'fix/deleteBackCalcRecordBUG' into release/2.8.2.2305.02
|
2023-05-22 14:03:22 +08:00 |
|
Harryxzy
|
c7bdbe7b85
|
Merge branch 'feature/V3-salaryAcctResultLog' into release/2.8.2.2305.02
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
|
2023-05-22 14:03:07 +08:00 |
|
Harryxzy
|
20262169c9
|
Merge branch 'fix/salaryAcctResutAutoLock' into release/2.8.2.2305.02
|
2023-05-22 14:02:28 +08:00 |
|
钱涛
|
64be49c61c
|
工资单适配微信
|
2023-05-22 10:12:23 +08:00 |
|
Harryxzy
|
ebf966517b
|
修复保存日志获取不到id
|
2023-05-18 14:28:31 +08:00 |
|
钱涛
|
ff8dcf1769
|
核算异常信息
|
2023-05-17 17:38:12 +08:00 |
|
钱涛
|
404db31695
|
薪资项目系统项目排序靠后
|
2023-05-17 16:57:37 +08:00 |
|
钱涛
|
1534b0257d
|
Merge branch 'feature/公式v2' into release/2.8.2.2305.02
|
2023-05-17 15:08:16 +08:00 |
|
钱涛
|
7ccf8cf607
|
字段管理不显示默认使用列
|
2023-05-17 14:59:12 +08:00 |
|
Harryxzy
|
72f2ca4439
|
修复核算编辑保存
|
2023-05-17 14:49:53 +08:00 |
|
钱涛
|
df07a8c9d1
|
Merge remote-tracking branch 'origin/release/2.8.2.2305.02' into release/2.8.2.2305.02
|
2023-05-17 14:10:25 +08:00 |
|
钱涛
|
8ad88b1e97
|
我的工资接口修改
|
2023-05-17 14:10:12 +08:00 |
|
钱涛
|
a7cc99fdd3
|
公式异常信息
|
2023-05-16 18:01:38 +08:00 |
|
Harryxzy
|
083916eb0c
|
薪资核算编辑 带上公式
|
2023-05-16 15:41:11 +08:00 |
|
Harryxzy
|
a3ee91db15
|
回算后不允许删除薪资核算记录
|
2023-05-16 15:05:02 +08:00 |
|
Harryxzy
|
a6fc40a084
|
薪资核算 编辑列改造
|
2023-05-16 14:12:49 +08:00 |
|
Harryxzy
|
7c74149184
|
薪资核算导入 选择字段根据分类分组
|
2023-05-15 18:02:22 +08:00 |
|
Harryxzy
|
6fcfc2db9b
|
定薪action
|
2023-05-15 16:47:00 +08:00 |
|
sy
|
e28ca6a2d0
|
薪酬系统-福利档案，生成福利档案列表表头过程中，过滤源数据中人员id为空的数据v2
|
2023-05-15 14:45:06 +08:00 |
|
sy
|
cf6b35f6a0
|
薪酬系统-福利档案，生成福利档案列表表头过程中，过滤源数据中人员id为空的数据
|
2023-05-15 13:58:06 +08:00 |
|
Harryxzy
|
4ff15ca651
|
薪资核算结果编辑导入 记录
|
2023-05-15 10:28:17 +08:00 |
|
钱涛
|
fb271f435a
|
公式方法改造
|
2023-05-15 10:00:59 +08:00 |
|
钱涛
|
d0e5a3a643
|
Merge branch 'feature/报表v2' into release/2.8.2.2305.02
|
2023-05-15 09:29:00 +08:00 |
|
钱涛
|
d51c89bb82
|
公式方法改造
|
2023-05-15 09:28:22 +08:00 |
|
钱涛
|
f848b74f28
|
薪酬流程日志
|
2023-05-12 11:51:42 +08:00 |
|
钱涛
|
eaaf6359af
|
Merge branch 'feature/公式' into release/2.8.2.2305.02
|
2023-05-12 09:16:54 +08:00 |
|
Harryxzy
|
b0084cad9c
|
薪资核算编辑 手动编辑后自动锁定
|
2023-05-11 14:40:10 +08:00 |
|
Harryxzy
|
54ca46c653
|
薪资核算导入项自动锁定
|
2023-05-11 10:51:43 +08:00 |
|
钱涛
|
53f2c1ebb6
|
修复提示行号
|
2023-05-11 10:21:21 +08:00 |
|
Harryxzy
|
d08a329000
|
Merge branch 'feature/维护工具' into release/2.8.2.2305.02
|
2023-05-11 10:09:10 +08:00 |
|
钱涛
|
6ec0b53fe5
|
默认档案起始发薪是入职时间
|
2023-05-11 10:00:21 +08:00 |
|
钱涛
|
3840f26464
|
公式异常处理
|
2023-05-10 18:55:23 +08:00 |
|
钱涛
|
c87db92ee8
|
公式扩展核算基本信息和核算日期
|
2023-05-10 14:26:39 +08:00 |
|
钱涛
|
2941b5f304
|
删除报表同时删除项目
|
2023-05-09 17:37:05 +08:00 |
|
钱涛
|
ecd037424b
|
去除异常分页
|
2023-05-09 14:28:46 +08:00 |
|
钱涛
|
797d5095eb
|
适配if
|
2023-05-09 10:43:51 +08:00 |
|
sy
|
bbba7f314d
|
薪酬系统-福利，福利档案、核算明细列表获取员工状态逻辑调整
|
2023-05-08 17:58:17 +08:00 |
|
钱涛
|
197506b72b
|
适配if
|
2023-05-08 14:12:33 +08:00 |
|
钱涛
|
6b19445a1a
|
Merge branch 'release/2.8.2.2305.02' into feature/公式
# Conflicts:
# src/com/engine/salary/service/impl/TaxDeclarationDetailServiceImpl.java
|
2023-05-08 11:22:23 +08:00 |
|
钱涛
|
ccec800a75
|
公式升级
|
2023-05-08 11:21:09 +08:00 |
|
钱涛
|
8228fbf21c
|
短信邮件
|
2023-05-08 09:27:20 +08:00 |
|
Harryxzy
|
b905390623
|
修复社保福利台账，根据核算创建人过滤
|
2023-05-06 09:50:48 +08:00 |
|
钱涛
|
7e940b4db4
|
减少单次核算的人员
|
2023-05-05 17:15:25 +08:00 |
|
钱涛
|
41e95ceadf
|
字段管理不显示id
|
2023-05-05 15:32:55 +08:00 |
|
钱涛
|
aa8f46e84f
|
删除sql，修改签名
|
2023-05-05 14:08:37 +08:00 |
|
钱涛
|
159b5811f6
|
Merge branch 'feature/报表' into release/2.7.4.2304.02
|
2023-05-05 09:26:29 +08:00 |
|
钱涛
|
0f38b6cbaa
|
去除mock校验
|
2023-05-04 19:43:35 +08:00 |
|
钱涛
|
3e8ac01049
|
公式描述
|
2023-05-04 18:07:35 +08:00 |
|
sy
|
02e0d5a089
|
Merge remote-tracking branch 'remotes/origin/feature/v4-siAcctImprove-0420' into release/2.7.4.2304.02
|
2023-05-04 16:42:26 +08:00 |
|
sy
|
59b64b48ae
|
薪酬系统-福利档案，编辑保存日期格式校验逻辑优化
|
2023-05-04 16:14:00 +08:00 |
|
钱涛
|
9dc41706b2
|
Merge branch 'release/2.7.4.2304.02' into feature/公式
|
2023-05-04 14:40:50 +08:00 |
|
钱涛
|
85bf7e0036
|
数据库删除null
|
2023-05-04 14:36:49 +08:00 |
|
钱涛
|
2d609ef49d
|
删除报表
|
2023-05-04 13:57:55 +08:00 |
|
钱涛
|
ae719ad65b
|
修复人员过多时bug
|
2023-05-04 11:56:34 +08:00 |
|
Harryxzy
|
0d6355ca4a
|
修复回算工资单的合计列
|
2023-04-28 16:04:52 +08:00 |
|
钱涛
|
790d24b7db
|
Merge branch 'feature/维护工具' into release/2.7.4.2304.02
|
2023-04-28 14:38:11 +08:00 |
|
钱涛
|
0aabcd0471
|
将除重新核算的项目外的所有的值都锁定
|
2023-04-28 14:37:59 +08:00 |
|
钱涛
|
0bd16c3f25
|
Merge branch 'feature/维护工具' into release/2.7.4.2304.02
|
2023-04-28 14:07:32 +08:00 |
|
钱涛
|
20e4856c23
|
人员全部显示
|
2023-04-28 11:18:01 +08:00 |
|
钱涛
|
2d8b4b07d0
|
Merge branch 'release/2.7.4.2304.02' into feature/报表
# Conflicts:
# src/com/engine/salary/biz/SIArchivesBiz.java
|
2023-04-28 10:49:33 +08:00 |
|
钱涛
|
1641b70764
|
权限控制
|
2023-04-27 17:31:43 +08:00 |
|
钱涛
|
c7286fbae4
|
定量-组距式分组、定量-单项式分组
|
2023-04-27 17:18:20 +08:00 |
|
钱涛
|
d36cfe31b3
|
报表暂存
|
2023-04-27 16:05:03 +08:00 |
|
钱涛
|
1529a30768
|
薪资项目取消过滤档案，使得导入功能一页面为准
|
2023-04-27 09:22:20 +08:00 |
|
钱涛
|
433ce6cf91
|
暂存
|
2023-04-26 16:04:33 +08:00 |
|
钱涛
|
14fca43e18
|
暂存
|
2023-04-26 15:17:08 +08:00 |
|
钱涛
|
f47ad2a7a3
|
注释接口
|
2023-04-25 18:04:05 +08:00 |
|
sy
|
6ad8c84a04
|
Merge remote-tracking branch 'remotes/origin/feature/v4-siAcctImprove-0420' into release/2.7.4.2304.02
|
2023-04-25 17:40:05 +08:00 |
|
钱涛
|
40cd70e2a3
|
Merge branch 'release/2.7.4.2304.02' into feature/公式
|
2023-04-25 17:39:33 +08:00 |
|
sy
|
cb36dc2904
|
薪酬系统-福利档案，档案编辑功能增加对年月的格式校验
|
2023-04-25 17:38:54 +08:00 |
|
钱涛
|
59c32b24e6
|
补算
|
2023-04-25 17:08:42 +08:00 |
|
钱涛
|
77ce806b37
|
sysadmin不显示申报记录
|
2023-04-25 10:43:40 +08:00 |
|
钱涛
|
a611301651
|
Merge remote-tracking branch 'origin/release/2.7.4.2304.02' into release/2.7.4.2304.02
|
2023-04-25 10:12:01 +08:00 |
|
钱涛
|
c0060ba358
|
Merge branch 'feature/维护工具' into release/2.7.4.2304.02
|
2023-04-25 10:11:40 +08:00 |
|
sy
|
cea8d14c18
|
Merge remote-tracking branch 'remotes/origin/feature/v4-siAcctImprove-0420' into release/2.7.4.2304.02
|
2023-04-25 09:22:03 +08:00 |
|
钱涛
|
17785b3c2b
|
导出报表
|
2023-04-24 18:08:06 +08:00 |
|
钱涛
|
7b4ebd788c
|
导出报表
|
2023-04-24 16:34:23 +08:00 |
|
钱涛
|
8d00e6ad45
|
报表年月
|
2023-04-24 14:57:54 +08:00 |
|
钱涛
|
cef3d26693
|
维护工具
|
2023-04-24 14:55:32 +08:00 |
|
sy
|
1f7c271519
|
薪酬系统-福利档案，待减员tab页删除待办，添加个税扣缴义务人范围过滤
|
2023-04-24 14:47:28 +08:00 |
|
钱涛
|
24dfa57850
|
报表
|
2023-04-24 14:09:27 +08:00 |
|
sy
|
61326928df
|
Merge remote-tracking branch 'remotes/origin/feature/v4-siAcctImprove-0420' into release/2.7.4.2304.02
|
2023-04-24 14:07:28 +08:00 |
|
Harryxzy
|
e2570dc520
|
Merge branch 'feature/salaryItemFieldsCanCopy_0420' into release/2.7.4.2304.02
|
2023-04-24 11:03:17 +08:00 |
|
sy
|
27969cff80
|
薪酬系统-福利台账，补差导入处理合计值为null的情况
|
2023-04-24 10:11:02 +08:00 |
|
钱涛
|
4034c5cdb0
|
Merge branch 'feature/维护工具' into release/2.7.4.2304.02
|
2023-04-24 09:26:46 +08:00 |
|
钱涛
|
c94d5169f0
|
维护工具
|
2023-04-24 09:19:18 +08:00 |
|
sy
|
c686f52153
|
薪酬系统-福利台账，补差导入部分福利项缴费信息相关合计逻辑优化
|
2023-04-23 18:05:32 +08:00 |
|
钱涛
|
598ff0cf9a
|
Merge remote-tracking branch 'origin/feature/维护工具' into feature/维护工具
|
2023-04-23 18:00:41 +08:00 |
|
钱涛
|
5c936a0334
|
补算
|
2023-04-23 18:00:30 +08:00 |
|
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 |
|
钱涛
|
4c41b35b2b
|
外部人员档案优化
|
2023-04-17 15:31:56 +08:00 |
|
sy
|
f68981baac
|
薪酬系统-福利台账，福利核算、核算明细列表逻辑优化（取消对档案状态的过滤）
|
2023-04-17 10:27:31 +08:00 |
|
钱涛
|
f619878f2c
|
暂存
|
2023-04-17 10:10:39 +08:00 |
|
钱涛
|
6933d63cb1
|
自定义报表项目
|
2023-04-17 09:46:01 +08:00 |
|
钱涛
|
bc590b9ee8
|
自定义报表
|
2023-04-14 15:18:18 +08:00 |
|
钱涛
|
bc0b84ee4b
|
档案验证
|
2023-04-14 10:51:05 +08:00 |
|
钱涛
|
8a2ec10b65
|
Merge branch 'release/2.7.3.2304.01' into feature/外部人员
|
2023-04-14 10:31:41 +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 |
|
钱涛
|
5cb6752c4c
|
Merge branch 'release/2.7.3.2304.01' into feature/外部人员
|
2023-04-13 17:32:17 +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 |
|
钱涛
|
9549e75e00
|
Merge branch 'release/2.7.3.2304.01' into feature/外部人员
|
2023-04-13 14:48:43 +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 |
|
钱涛
|
e8ae952f18
|
Merge branch 'release/2.7.3.2304.01' into feature/外部人员
# Conflicts:
# src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveExcelBO.java
|
2023-04-11 11:41:30 +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
|
2e85f72362
|
工资单发放系统异常
|
2023-03-31 09:40:55 +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 |
|
钱涛
|
052eebe83a
|
解决工资单人名缺失
|
2023-03-16 19:17:33 +08:00 |
|
Harryxzy
|
1ab7fcc7b8
|
Merge branch 'feature/salaryBillAddSum-0323' into release/2.7.1.2303.02
|
2023-03-16 17:20:43 +08:00 |
|
钱涛
|
f79569fe4f
|
解决工资单人名缺失
|
2023-03-16 17:19:02 +08:00 |
|
Harryxzy
|
3304ffdbd5
|
薪资核算导入，添加表头字段缓存功能
|
2023-03-16 16:19:23 +08:00 |
|
钱涛
|
8430397d03
|
外部人员终极版
|
2023-03-16 16:10:29 +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 |
|
Harryxzy
|
16cfe18b90
|
往期累计情况导入BUG
|
2023-03-16 09:53:46 +08:00 |
|
钱涛
|
62d124efb1
|
外部人员终极版
|
2023-03-15 22:48:01 +08:00 |
|
钱涛
|
81650888c7
|
非系统人员
|
2023-03-15 18:21:04 +08:00 |
|
钱涛
|
ace15ca7a1
|
非系统人员
|
2023-03-15 18:03:46 +08:00 |
|
Harryxzy
|
ca03e0785e
|
工资单发放详情导出没有部门信息
|
2023-03-15 17:09:02 +08:00 |
|
钱涛
|
50c15989c6
|
Merge branch 'release/2.7.1.2303.02' into feature/外部人员
|
2023-03-15 16:15:48 +08:00 |
|
Harryxzy
|
712f30ddfa
|
工资单发放详情合计列
|
2023-03-15 16:00:37 +08:00 |
|
Harryxzy
|
1f9597195f
|
外部人员-个税扣缴义务人service获取人员信息改变写法
|
2023-03-15 15:49:20 +08:00 |
|
Harryxzy
|
a9fb24145d
|
修复往期累计情况，无法导入编辑
|
2023-03-15 14:14:53 +08:00 |
|
Harryxzy
|
6418e4ad6e
|
往期累计情况，获取当月税款所属期数据无法导入bug，
|
2023-03-15 13:38:13 +08:00 |
|
钱涛
|
db09f8047e
|
注释
|
2023-03-15 11:04:54 +08:00 |
|
钱涛
|
6bb6e350a8
|
冲突
|
2023-03-15 10:43:05 +08:00 |
|
sy
|
3059829619
|
Merge remote-tracking branch 'remotes/origin/release/2.7.1.2303.02' into feature/v4-salaryExcelFormat-0328
|
2023-03-15 10:22:37 +08:00 |
|
sy
|
acc382b835
|
薪酬系统-薪资核算，核算导出excel格式改造
|
2023-03-15 10:20:46 +08:00 |
|
钱涛
|
c9f6b62b5a
|
Merge branch 'release/2.7.1.2303.02' into feature/外部人员
# Conflicts:
# src/com/engine/salary/biz/SIAccountBiz.java
# src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java
|
2023-03-15 10:15:49 +08:00 |
|
钱涛
|
6f9769bae2
|
手机号
|
2023-03-15 10:07:40 +08:00 |
|
钱涛
|
5b88cda35c
|
账套外部人员接入
|
2023-03-15 09:13:29 +08:00 |
|
钱涛
|
5f465aa914
|
外部人员范围列表和删除接口
|
2023-03-14 15:22:50 +08:00 |
|
钱涛
|
5c75b3cf8e
|
去除无用代码
|
2023-03-14 14:22:45 +08:00 |
|
钱涛
|
b54d754c4b
|
删除个税扣缴义务人人员范围改异步
|
2023-03-14 11:04:25 +08:00 |
|
钱涛
|
767fbe36f5
|
外部人员
|
2023-03-14 10:52:48 +08:00 |
|
Harryxzy
|
0c409c627c
|
employeeService查询外部 fixBug
|
2023-03-13 16:16:05 +08:00 |
|
Harryxzy
|
362f5abdf6
|
Merge remote-tracking branch 'origin/feature/外部人员' into feature/外部人员
|
2023-03-13 16:12:51 +08:00 |
|
Harryxzy
|
d5a97c8192
|
employeeService查询外部 fixBug
|
2023-03-13 16:12:10 +08:00 |
|
钱涛
|
ad616f80d3
|
Merge remote-tracking branch 'origin/feature/外部人员' into feature/外部人员
|
2023-03-13 16:04:28 +08:00 |
|
钱涛
|
a61b7ac7bc
|
外部人员
|
2023-03-13 16:04:19 +08:00 |
|
Harryxzy
|
7b0e1cb1f3
|
employeeService查询外部 fixBug
|
2023-03-13 15:57:12 +08:00 |
|
Harryxzy
|
32b1a2db48
|
employeeService查询外部
|
2023-03-13 15:53:56 +08:00 |
|
钱涛
|
2d091dbd33
|
异步同步人员校验
|
2023-03-10 17:15:15 +08:00 |
|
Harryxzy
|
351d892281
|
Merge branch 'fix/CancelSetPayEndDate' into release/2.7.1.2303.02
|
2023-03-10 15:43:24 +08:00 |
|
Harryxzy
|
7de5c1e175
|
Merge branch 'fix/V3_listShowChange_0309' into release/2.7.1.2303.02
|
2023-03-10 15:42:42 +08:00 |
|
Harryxzy
|
8dabfb28b9
|
个税扣缴义务人删除人员范围时，不设置最后发薪日期
|
2023-03-10 13:50:52 +08:00 |
|
钱涛
|
d8c13b70d2
|
内外部人员匹配标识
|
2023-03-08 18:01:19 +08:00 |
|
钱涛
|
cb6b53c6af
|
Merge remote-tracking branch 'origin/release/2.7.1.2303.02' into release/2.7.1.2303.02
|
2023-03-08 17:53:20 +08:00 |
|
钱涛
|
ff4dfe4dad
|
fix日期转换，申报表所属月不显示
|
2023-03-08 17:53:13 +08:00 |
|
sy
|
dbf9e878e5
|
Merge remote-tracking branch 'remotes/origin/feature/v4-addSiAcctLog-0309' into release/2.7.1.2303.02
|
2023-03-08 17:52:09 +08:00 |
|
Harryxzy
|
401947fabc
|
Merge branch 'fix/mySalaryBillNoWorkCode' into release/2.7.1.2303.02
|
2023-03-08 17:50:01 +08:00 |
|
钱涛
|
160116e946
|
Merge remote-tracking branch 'origin/feature/外部人员' into feature/外部人员
|
2023-03-08 16:37:11 +08:00 |
|
钱涛
|
487dd9f972
|
非系统人员档案自动化
|
2023-03-08 16:36:47 +08:00 |
|
钱涛
|
2c13c138a6
|
校验每次只能申报一个扣缴义务人
|
2023-03-07 17:44:21 +08:00 |
|
Harryxzy
|
4ce79438e6
|
工资单没有工号BUG
|
2023-03-07 17:43:51 +08:00 |
|
Harryxzy
|
5067d50722
|
EmployeeBiz修改调用方式-2
|
2023-03-07 17:20:30 +08:00 |
|
Harryxzy
|
068f7e6535
|
EmployeeBiz修改调用方式
|
2023-03-07 17:14:25 +08:00 |
|
sy
|
3e03b5d920
|
薪酬系统-社保福利，福利核算进度条逻辑优化
|
2023-03-07 16:52:09 +08:00 |
|
sy
|
b6ee197fe6
|
薪酬系统,梳理Mapper类使用方式
|
2023-03-07 14:21:01 +08:00 |
|
Harryxzy
|
b702286995
|
考勤数据，详情数据 前端渲染方式改变
|
2023-03-07 11:36:45 +08:00 |
|
钱涛
|
890ff64215
|
mock接口
|
2023-03-06 19:45:48 +08:00 |
|
钱涛
|
a423790a35
|
获取人员信息
|
2023-03-06 17:57:20 +08:00 |
|
钱涛
|
88de36f260
|
Merge branch 'release/2.7.1.2303.02' into feature/外部人员
|
2023-03-06 13:59:36 +08:00 |
|
钱涛
|
a5596d503f
|
外部人员基础信息
|
2023-03-03 16:57:52 +08:00 |
|
Harryxzy
|
762c484d36
|
个税扣缴义务人名称扩充至40
|
2023-03-03 15:47:30 +08:00 |
|
钱涛
|
9b8e89bf9f
|
去除lang3
|
2023-03-03 14:55:26 +08:00 |
|
钱涛
|
79a29df0de
|
暂存
|
2023-03-03 14:40:17 +08:00 |
|
Harryxzy
|
1cbd1d2958
|
自定义福利调整
|
2023-03-03 09:24:44 +08:00 |
|
钱涛
|
ca20ed8ca2
|
Merge branch 'release/2.6.3.2303.01' into feature/外部人员
|
2023-03-02 19:48:40 +08:00 |
|
sy
|
7f0d87a017
|
Merge remote-tracking branch 'remotes/origin/feature/v4-siArchivesChangeByTaxRange-0302' into release/2.6.3.2303.01
|
2023-03-02 18:14:19 +08:00 |
|
钱涛
|
26b8996d42
|
公司名
|
2023-03-02 17:59:58 +08:00 |
|
Harryxzy
|
3f0160ebe5
|
Merge remote-tracking branch 'origin/release/2.6.3.2303.01' into release/2.6.3.2303.01
|
2023-03-02 17:19:44 +08:00 |
|
Harryxzy
|
6fe6dd6043
|
Merge remote-tracking branch 'origin/fix/V3_replenSalaryTemplateItemChange_0309' into release/2.6.3.2303.01
|
2023-03-02 17:19:04 +08:00 |
|
Harryxzy
|
83d5a882b9
|
Merge branch 'fix/V3_addUpSituationShowAsMonth_0309' into release/2.6.3.2303.01
|
2023-03-02 17:18:39 +08:00 |
|
Harryxzy
|
50e1f2c432
|
Merge branch 'fix/V3_exportAddWorkCode' into release/2.6.3.2303.01
|
2023-03-02 17:18:10 +08:00 |
|
钱涛
|
6de22b142d
|
1、工资单模板
2、一键累计
|
2023-03-02 17:11:42 +08:00 |
|
Harryxzy
|
f48e98cb11
|
补发工资单模块，薪资项目名称修改时，展示同步修改
|
2023-03-02 14:51:51 +08:00 |
|
Harryxzy
|
50d6cc4d9a
|
往期累计情况，按照税款所属期月份进行展示
|
2023-03-02 14:04:12 +08:00 |
|
钱涛
|
e73ed7142f
|
正常核算工资单模板同步项目名称
|
2023-03-02 13:37:28 +08:00 |
|
钱涛
|
fd9b592384
|
修复核算未分类项目不显示
|
2023-03-02 11:25:25 +08:00 |
|
Harryxzy
|
fdb5774ae4
|
考勤引用列表改造
|
2023-03-02 11:23:57 +08:00 |
|
Harryxzy
|
56399c127b
|
社保福利方案自定义福利列表改造
|
2023-03-02 10:46:53 +08:00 |
|
钱涛
|
a37e874614
|
修复工资单模板显示问题
|
2023-03-02 10:41:21 +08:00 |
|
钱涛
|
a8fc666e79
|
fix json转换问题
|
2023-03-02 10:12:00 +08:00 |
|
Harryxzy
|
5455bc739a
|
Merge branch 'fix/V3_exportAddWorkCode' into develop
|
2023-03-01 16:20:25 +08:00 |
|
Harryxzy
|
e7f2d7b496
|
薪资档案导出，添加工号
|
2023-03-01 16:19:09 +08:00 |
|
钱涛
|
14bee7f6d5
|
修复未分类无法保存
|
2023-03-01 09:58:55 +08:00 |
|
钱涛
|
1568b1e03d
|
外部人员基础类
|
2023-03-01 09:05:03 +08:00 |
|
钱涛
|
8c8d79aba3
|
档案字段删除
|
2023-02-27 18:27:11 +08:00 |
|
钱涛
|
0138351665
|
修复账套项目可删除
|
2023-02-27 17:51:26 +08:00 |
|
sy
|
3e2cf917ae
|
Merge branch 'feature/v4-siArchivesChangeByTaxRange-0302' into develop
|
2023-02-24 14:01:56 +08:00 |
|
sy
|
0e164b7989
|
薪酬系统-社保福利，福利档案增量数据处理直接在个税扣缴义务人人员范围变更时触发，不需打开福利档案列表触发
|
2023-02-24 13:53:57 +08:00 |
|
钱涛
|
26a6327d44
|
调薪bug
|
2023-02-23 18:09:05 +08:00 |
|
钱涛
|
a8cb586358
|
公式删除校验
|
2023-02-23 15:48:18 +08:00 |
|
钱涛
|
affa437506
|
加密显示配置
|
2023-02-23 15:18:33 +08:00 |
|
钱涛
|
1c2028f551
|
公式删除优化
|
2023-02-23 14:52:24 +08:00 |
|
钱涛
|
245803cfe8
|
获取人员状态
|
2023-02-23 10:28:27 +08:00 |
|
钱涛
|
e3c1efcc47
|
sql操作的扩展
|
2023-02-23 09:19:34 +08:00 |
|
钱涛
|
ee5e5fa127
|
调薪说明
|
2023-02-22 19:12:53 +08:00 |
|
钱涛
|
41c56b1bd4
|
调薪说明
|
2023-02-22 19:07:13 +08:00 |
|
钱涛
|
5f9a7af0fa
|
修复数据采集按部门搜索
|
2023-02-22 17:58:19 +08:00 |
|
sy
|
1a5afd6c6d
|
Merge branch 'feature/v4-siFunctionImprove2-0228' into release/2.6.2.2302.02
|
2023-02-22 14:10:46 +08:00 |
|
钱涛
|
49cd56e359
|
档案列表重构
|
2023-02-21 18:05:58 +08:00 |
|
钱涛
|
cb484b8ff9
|
回算项公式使用不可删除
|
2023-02-21 17:19:32 +08:00 |
|
钱涛
|
eac70e7cde
|
薪资项目和社保福利方案分权
|
2023-02-21 17:02:39 +08:00 |
|
钱涛
|
187e60ec15
|
薪资项目分权
|
2023-02-21 16:39:17 +08:00 |
|
钱涛
|
8e31cec138
|
Merge branch 'feature/公式改造' into release/2.6.2.2302.02
|
2023-02-21 14:48:43 +08:00 |
|
钱涛
|
eee39ae972
|
jar引用变更
|
2023-02-21 14:33:15 +08:00 |
|
钱涛
|
84e63d4d40
|
加密日志
|
2023-02-21 13:58:30 +08:00 |
|
钱涛
|
4f22df09f0
|
支持6位小数
|
2023-02-20 14:40:18 +08:00 |
|
钱涛
|
73dcd3a53a
|
fix账套删除人员信息字段
|
2023-02-20 11:54:44 +08:00 |
|
钱涛
|
77cff0ba24
|
档案字段被公式引用不允许删除
|
2023-02-17 18:03:46 +08:00 |
|
钱涛
|
bccdd07ba0
|
修改名称对应修改公式
|
2023-02-17 17:52:29 +08:00 |
|
钱涛
|
c7d1bbfa35
|
更新名称
|
2023-02-17 17:19:17 +08:00 |
|
钱涛
|
dc24b03efd
|
薪资项目删除校验
|
2023-02-17 15:58:33 +08:00 |
|
钱涛
|
abeb4d891d
|
薪资项目删除校验
|
2023-02-17 14:37:59 +08:00 |
|
钱涛
|
da9b548480
|
公式
|
2023-02-17 10:54:18 +08:00 |
|
钱涛
|
1d0a02554e
|
公式
|
2023-02-16 14:53:03 +08:00 |
|
sy
|
39cb3b0df1
|
薪酬系统-福利档案，方案明细中添加福利项上下限数据
|
2023-02-16 13:14:17 +08:00 |
|
钱涛
|
b57bdcc7eb
|
接口报错时打印参数
|
2023-02-16 10:47:30 +08:00 |
|
钱涛
|
91bd28d21a
|
清除公式
|
2023-02-16 10:44:13 +08:00 |
|
钱涛
|
1bdc304ddf
|
清除公式
|
2023-02-16 09:16:00 +08:00 |
|
钱涛
|
53c767b239
|
还原脚本
|
2023-02-15 17:36:29 +08:00 |
|
钱涛
|
a2e9c482a4
|
修复账套根据名称查询bug
去除调整前后值的限制
|
2023-02-15 16:38:54 +08:00 |
|
sy
|
6b34c0e916
|
薪酬系统-福利档案，修改福利方案传参对象
|
2023-02-15 15:52:49 +08:00 |
|
sy
|
7da1bfff6b
|
薪酬系统-福利台账，核算明细导出时企业年金单位数值有误相关问题修复
|
2023-02-15 09:55:33 +08:00 |
|
钱涛
|
4f0dc060ee
|
Merge branch 'feature/档案调整为空时不生效' into release/2.6.2.2302.02
|
2023-02-14 16:00:05 +08:00 |
|
钱涛
|
1c93dab9f0
|
获取人员档案
|
2023-02-14 15:41:03 +08:00 |
|
钱涛
|
0337db02df
|
Merge branch 'feature/通过扣缴义务人和uid获取人员档案' into release/2.6.2.2302.02
|
2023-02-14 15:37:17 +08:00 |
|
钱涛
|
dee7c11eda
|
修复账套新增异常
|
2023-02-14 10:53:58 +08:00 |
|
钱涛
|
44819a0903
|
工资单后台校验
|
2023-02-13 17:25:13 +08:00 |
|
钱涛
|
2748f04d0a
|
档案为空不生效
|
2023-02-13 17:23:05 +08:00 |
|
钱涛
|
8b594c1882
|
自发起调薪流程
|
2023-02-13 14:53:35 +08:00 |
|
钱涛
|
78cb59f07f
|
暂存
|
2023-02-13 13:27:44 +08:00 |
|
钱涛
|
602051e1ed
|
Merge branch 'release/2.6.1.2301.02' into release/2.6.2.2302.02
|
2023-02-13 11:02:00 +08:00 |
|
钱涛
|
49894ad6a2
|
修复申报表总数
|
2023-02-13 10:59:09 +08:00 |
|
钱涛
|
6792b4c5aa
|
Merge branch 'feature/通过userid查询工资单详情'
|
2023-02-10 16:45:45 +08:00 |
|
钱涛
|
d1b4ae4a0b
|
过滤
|
2023-02-10 16:38:43 +08:00 |
|
Harryxzy
|
3b657db52a
|
线下对比Oracle导入报错
|
2023-02-10 09:59:18 +08:00 |
|
Harryxzy
|
510a2e7d29
|
处理工资单发放历史数据执行时间提前
|
2023-02-09 19:43:43 +08:00 |
|
Harryxzy
|
d30870e28d
|
调薪不支持字符
|
2023-02-09 19:24:25 +08:00 |
|
钱涛
|
4186526743
|
Merge remote-tracking branch 'origin/release/2.6.1.2301.02' into release/2.6.1.2301.02
|
2023-02-09 19:04:02 +08:00 |
|
钱涛
|
0f9222e1e4
|
fix年终奖申报备注为0
|
2023-02-09 19:03:53 +08:00 |
fcli
|
5b50903b55
|
Merge branch 'feature/SalaryItemAuth&FieldManage' into release/2.6.1.2301.02
|
2023-02-09 18:48:35 +08:00 |
|
fcli
|
e99abfddcd
|
feat: 保存更新判断薪资档案引用
|
2023-02-09 18:47:48 +08:00 |
|
Harryxzy
|
cbc1c13e4d
|
Merge branch 'feature/V3-TaxAgentImport_AddState-0209' into release/2.6.1.2301.02
|
2023-02-09 17:40:49 +08:00 |
|
钱涛
|
8d011d8d49
|
Merge branch 'feature/账套群组不变' into release/2.6.1.2301.02
|
2023-02-09 17:32:00 +08:00 |
|
钱涛
|
995689bb1d
|
Merge branch 'feature/考勤引用本身报表' into release/2.6.1.2301.02
|
2023-02-09 17:31:42 +08:00 |
|
钱涛
|
5feed81803
|
Merge branch 'feature/通过userid查询工资单详情' into release/2.6.1.2301.02
|
2023-02-09 17:31:34 +08:00 |
|
sy
|
ba267d9dce
|
Merge remote-tracking branch 'remotes/origin/feature/v4-siSchemeAddPaymentCycle-0202' into release/2.6.1.2301.02
|
2023-02-09 17:24:29 +08:00 |
|
fcli
|
308a44a9a6
|
Merge remote-tracking branch 'origin/feature/SalaryItemAuth&FieldManage' into release/2.6.1.2301.02
|
2023-02-09 17:23:07 +08:00 |
|
fcli
|
5ee8097b3e
|
Merge branch 'feat/salaryBillSaveItem042' into release/2.6.1.2301.02
|
2023-02-09 17:22:53 +08:00 |
|
钱涛
|
b6429eb41c
|
通过id查询工资单详情
|
2023-02-09 17:05:07 +08:00 |
|
钱涛
|
2c37086e70
|
账套群组保持不变
|
2023-02-09 15:33:35 +08:00 |
|
fcli
|
fdf343dbbd
|
fix: 字段管理可以切换薪资引用
|
2023-02-09 11:08:03 +08:00 |
|
Harryxzy
|
69dd9cc61c
|
个税扣缴义务人、薪资账套 导入添加员工状态导入功能
|
2023-02-08 17:48:14 +08:00 |
|
sy
|
390d2d7851
|
薪酬系统-福利台账，补缴起始缴纳月之前的福利默认为空
|
2023-02-08 14:50:45 +08:00 |
|
sy
|
5657d5cc64
|
薪酬系统-福利台账，福利补缴方式一和二不允许补缴起始缴纳月之前的月份
|
2023-02-08 13:04:23 +08:00 |
|
Harryxzy
|
22027cde6b
|
Merge branch 'fix/MySalaryPageBug' into release/2.6.1.2301.02
|
2023-02-08 12:14:39 +08:00 |
|
Harryxzy
|
091221d0d4
|
我的薪资福利分页BUG
|
2023-02-08 12:12:45 +08:00 |
|
sy
|
de5b5d4c19
|
薪酬系统-福利台账，福利缴纳周期核算时考虑起始缴纳月相关逻辑，福利补缴不允许补缴起始缴纳月之前的月份
|
2023-02-08 11:33:17 +08:00 |
|
fcli
|
0a1198f17d
|
fix: 个税扣缴义务人范围非空判断
|
2023-02-06 17:16:11 +08:00 |
|
钱涛
|
2ff5ff0dce
|
考勤列表和导出
|
2023-02-06 16:28:56 +08:00 |
|
钱涛
|
0fb9fb51a0
|
修复调薪记录显示问题
|
2023-02-06 11:08:59 +08:00 |
|
钱涛
|
a3775babd3
|
考勤引用
|
2023-02-06 10:33:12 +08:00 |
|
sy
|
45d9fa4c12
|
薪酬系统-福利台账，补缴核算时按照补缴月份考虑缴纳周期
|
2023-02-03 17:04:30 +08:00 |
|
sy
|
9a4b58b2ee
|
薪酬系统-福利台账，只勾选医疗保险和养老保险时的补缴核算过程加入福利方案缴纳周期逻辑
|
2023-02-03 13:38:12 +08:00 |
|
钱涛
|
cdfced412f
|
Merge branch 'feature/年终奖' into release/2.6.1.2301.02
|
2023-02-02 16:13:05 +08:00 |
|
钱涛
|
abdd85effd
|
Merge branch 'feature/考勤引用本身报表' into release/2.6.1.2301.02
|
2023-02-02 16:12:41 +08:00 |
|
fcli
|
003dfe0d35
|
feat: 请求方式修改
|
2023-02-02 15:47:17 +08:00 |
|
sy
|
2e7ea046f2
|
薪酬系统-福利台账，补缴核算过程加入福利方案缴纳周期逻辑
|
2023-02-02 14:47:39 +08:00 |
|
钱涛
|
810cfe7f5e
|
考勤引用本身报表
|
2023-02-01 14:03:13 +08:00 |
|
fcli
|
3f145e133b
|
feat: 添加是否补发参数
|
2023-02-01 13:39:14 +08:00 |
|
fcli
|
5851ea20be
|
feat: 发放模板获取可用分组或项目
|
2023-02-01 13:10:05 +08:00 |
|
fcli
|
78f8630465
|
feat: 薪资账套项目列表分权
|
2023-02-01 11:23:43 +08:00 |
|
fcli
|
dec7c89856
|
feat: 发放模板获取可用分组或项目
|
2023-02-01 11:22:38 +08:00 |
|
钱涛
|
f76ac415ba
|
修复年终奖备注字符不对应
|
2023-02-01 10:05:02 +08:00 |
|
sy
|
6abc2068ea
|
薪酬系统-福利方案，福利方案新增、编辑、查看方法改进，福利核算加入福利方案中的缴纳周期因素
|
2023-01-31 17:40:34 +08:00 |
|
fcli
|
e92ea00b02
|
fix: 薪资项目公式按分权处理。
薪资项目管理列表取出薪资档案引用列
|
2023-01-31 14:31:46 +08:00 |
|
钱涛
|
9bedcf6d38
|
年终奖
|
2023-01-31 14:15:27 +08:00 |
|
fcli
|
da47210b22
|
fix: 薪资档案根据薪资项目分权展示
|
2023-01-31 14:05:40 +08:00 |
|
钱涛
|
857c39bd2d
|
年终奖
|
2023-01-30 17:32:58 +08:00 |
|
sy
|
ae6822dc91
|
薪酬系统-福利方案，福利方案对象的相关数据载体（po,dto）增加缴纳周期相关新字段，并对sql中的查询字段进行添加
|
2023-01-30 17:29:07 +08:00 |
|
sy
|
63ae86978f
|
薪酬系统-福利档案，导出excel文件名添加日期信息
|
2023-01-30 09:31:31 +08:00 |
|
钱涛
|
d881b63327
|
年终奖
|
2023-01-29 14:58:51 +08:00 |
|
fcli
|
80019a029c
|
feat: 获取部分字段
|
2023-01-28 13:56:02 +08:00 |
|
Harryxzy
|
5bdb3ca0fe
|
Merge branch 'fix/setSendStatusBUG' into release/2.6.1.2301.02
|
2023-01-18 10:20:19 +08:00 |
|
钱涛
|
570065330b
|
修复考勤导入异常
|
2023-01-18 10:02:23 +08:00 |
|
fcli
|
bd2597541d
|
feat: 字段管理
|
2023-01-18 09:38:43 +08:00 |
|
Harryxzy
|
dc3bd34e0f
|
薪资回算sendStatus值update漏写
|
2023-01-14 13:59:13 +08:00 |
|
sy
|
57753bfb4a
|
Merge branch 'feature/v3-siFunctionImprove-0112' into release/2.5.3.2301.01
|
2023-01-12 18:32:11 +08:00 |
|
sy
|
3ed6c43a93
|
薪酬系统-福利台账，补缴原方式新增时，未设置基数情况下的逻辑优化
|
2023-01-12 18:31:36 +08:00 |
|
sy
|
3abffc2ee9
|
Merge branch 'feature/v3-siFunctionImprove-0112' into release/2.5.3.2301.01
|
2023-01-12 17:24:55 +08:00 |
|
sy
|
28d515b41a
|
薪酬系统-福利台账，补缴导入空值时处理逻辑优化
|
2023-01-12 17:23:26 +08:00 |
|
钱涛
|
2a52671451
|
支持钉钉打开工资单
|
2023-01-12 15:47:20 +08:00 |
|
fcli
|
24e0e180be
|
feat: 薪资项目分权，修改查询
|
2023-01-12 14:20:09 +08:00 |
|
fcli
|
5aff04c834
|
feat: 薪资项目分权oracle异常问题
|
2023-01-12 14:19:54 +08:00 |
|
fcli
|
3ec5c34589
|
feat: 薪资项目分权oracle异常问题
|
2023-01-12 14:19:50 +08:00 |
|
fcli
|
f1bdd0ada9
|
feat: 薪资项目分权，修改落库
|
2023-01-12 14:19:46 +08:00 |
|
fcli
|
4bcd355254
|
feat: 薪资项目分权，修改查询
|
2023-01-12 14:19:43 +08:00 |
|
fcli
|
90b2edb96c
|
feat: 薪资项目分权代码合并
|
2023-01-12 14:19:39 +08:00 |
|
钱涛
|
77dadfab4d
|
账套项目去重
|
2023-01-12 14:09:04 +08:00 |
|
sy
|
0feacffa11
|
Merge remote-tracking branch 'remotes/origin/feature/v3-siFunctionImprove-0112' into release/2.5.3.2301.01
|
2023-01-12 13:44:30 +08:00 |
|
Harryxzy
|
2b3752a554
|
Merge branch 'feature/V3-taxAgentsAddImport-0112' into release/2.5.3.2301.01
|
2023-01-12 09:25:06 +08:00 |
|
Harryxzy
|
6460edc013
|
去重
|
2023-01-11 09:47:57 +08:00 |
|
sy
|
197dbd8c8a
|
薪酬系统-福利档案，导入模板下载功能入参调整
|
2023-01-10 15:42:24 +08:00 |
|
sy
|
884da3dfb3
|
薪酬系统-福利档案，导入模板下载接口优化
|
2023-01-09 17:51:54 +08:00 |
|
sy
|
97230052b3
|
薪酬系统-福利档案，导入和导出的excel表头添加导入或导出，并且后缀添加tab页标签
|
2023-01-09 17:30:49 +08:00 |
|
Harryxzy
|
fd5048bd2d
|
fixBug
|
2023-01-09 15:20:26 +08:00 |
|
Harryxzy
|
fd470c56aa
|
薪资账套人员范围导入
|
2023-01-09 15:12:44 +08:00 |
|
sy
|
b33771d9e4
|
薪酬系统-福利档案，列表数据展示添加入职日期、离职日期字段
|
2023-01-09 14:49:58 +08:00 |
|
钱涛
|
830304fabb
|
系统配置
|
2023-01-09 14:41:10 +08:00 |
|
Harryxzy
|
c47d3f4ade
|
下载模板改为get请求
|
2023-01-09 10:30:26 +08:00 |
|
Harryxzy
|
09ba495bf3
|
个税扣缴义务人批量导入功能
|
2023-01-09 10:01:47 +08:00 |
|
钱涛
|
9dac777d5f
|
Merge branch 'feature/sql检查方法' into release/2.5.3.2301.01
# Conflicts:
# src/com/engine/salary/wrapper/SalaryFormulaWrapper.java
|
2023-01-06 14:41:42 +08:00 |
|
sy
|
25ee041638
|
Merge branch 'feature/v3-siRepairCreate-1229' into release/2.5.3.2301.01
|
2023-01-06 14:07:53 +08:00 |
|
sy
|
f722535ba1
|
薪酬系统-福利台账，补缴新增仅缴纳部分福利项时的台账统计逻辑优化
|
2023-01-06 11:20:44 +08:00 |
|
fcli
|
d1f62e8b49
|
Merge remote-tracking branch 'origin/release/2.5.3.2301.01' into release/2.5.3.2301.01
|
2023-01-06 09:06:41 +08:00 |
|
fcli
|
d700d7a300
|
Merge branch 'fix/addSpecialDeduction' into release/2.5.3.2301.01
|
2023-01-06 09:06:20 +08:00 |
|
sy
|
b0436236eb
|
Merge branch 'feature/v3-siRepairCreate-1229' into release/2.5.3.2301.01
|
2023-01-05 17:24:33 +08:00 |
|
sy
|
6c730669c7
|
薪酬系统-福利台账，补缴新增方式二，按照指定核算月获取缴纳基数功能问题修复
|
2023-01-05 17:21:31 +08:00 |
|
钱涛
|
6d3c2ca856
|
Merge remote-tracking branch 'origin/release/2.5.3.2301.01' into release/2.5.3.2301.01
|
2023-01-05 16:24:51 +08:00 |
|
钱涛
|
dfd8f90df1
|
考勤同步日志控制
|
2023-01-05 16:24:40 +08:00 |
|
sy
|
d807b72ee7
|
Merge branch 'feature/v3-siRepairCreate-1229' into release/2.5.3.2301.01
|
2023-01-05 16:16:17 +08:00 |
|
sy
|
f1a123dfa4
|
Merge remote-tracking branch 'remotes/origin/master' into feature/v3-siRepairCreate-1229
|
2023-01-05 16:12:47 +08:00 |
|
Harryxzy
|
708f1c396a
|
Merge branch 'fix/V3-can'tReCalcBug-0105' into release/2.5.3.2301.01
|
2023-01-05 15:44:21 +08:00 |
|
fcli
|
143de10689
|
Merge remote-tracking branch 'origin/fix/addUpSituationValidation' into release/2.5.3.2301.01
|
2023-01-05 15:42:39 +08:00 |
|
Harryxzy
|
dc08340c73
|
fix个税申报后无法重新核算bug
|
2023-01-05 11:50:01 +08:00 |
|
sy
|
ac99625e29
|
薪酬系统-福利台账，补缴新增社保缴纳明细保存问题修复
|
2023-01-05 09:53:26 +08:00 |
|
fcli
|
2d9ce61d5d
|
feat: 往期累计一键清空校验bug修复,分页解密时机修改
|
2023-01-05 09:49:25 +08:00 |
|
fcli
|
eb3c75197b
|
feat: 往期累计一键清空校验bug修复
|
2023-01-05 09:40:43 +08:00 |
|
fcli
|
8e0bf2b693
|
feat: 往期累计一键清空校验bug修复
|
2023-01-05 09:25:07 +08:00 |
|
sy
|
d25fc4a579
|
薪酬系统-福利台账，调差默认配置数据获取逻辑优化
|
2023-01-04 17:41:09 +08:00 |
|
sy
|
b786de5e4d
|
薪酬系统-福利档案，列表查询逻辑优化
|
2023-01-04 16:30:37 +08:00 |
|
sy
|
5f59ff399d
|
薪酬系统-福利台账，补缴功能优化只选社保或养老保险时的单位缴纳逻辑
|
2023-01-04 16:05:19 +08:00 |
|
fcli
|
3863a10c27
|
fix: 一月份不累计上年数据
|
2023-01-04 14:15:59 +08:00 |
|
sy
|
f53d788583
|
薪酬系统-福利档案，高级搜索功能支持根据个税扣缴义务人检索
|
2023-01-03 17:58:14 +08:00 |
|
钱涛
|
4a0a18bb07
|
修复考勤引用超出人员范围异常
|
2023-01-03 10:22:42 +08:00 |
|
sy
|
17e6e9d934
|
薪酬系统-福利台账，补缴获取指定月的缴纳基数，增加技术字符串判空，增加所属社保类字段
|
2023-01-03 10:09:14 +08:00 |
|
sy
|
19cca7a156
|
薪酬系统-福利台账，补缴获取指定月的缴纳基数，优化空数据处理
|
2022-12-30 18:20:10 +08:00 |
|
sy
|
e6e1637119
|
薪酬系统-福利台账，调差新增增加时判断是否已有调差数据的
|
2022-12-29 17:35:58 +08:00 |
|
Harryxzy
|
4726b9560c
|
Merge branch 'fix/V3-backItemImportBug-1229' into release/2.5.2.22.12.04
|
2022-12-29 15:05:40 +08:00 |
|
Harryxzy
|
dd03efaf9e
|
Merge branch 'feature/V3-salaryArchiveAddWorkCode-1229' into release/2.5.2.22.12.04
|
2022-12-29 15:04:18 +08:00 |
|
sy
|
ee72dcd3f0
|
薪酬系统-福利台账，调差列表展示默认数据时，处理核算人员外的默认人员数据逻辑优化
|
2022-12-29 14:43:54 +08:00 |
|
sy
|
ea763bd20c
|
Merge remote-tracking branch 'remotes/origin/feature/v3-siAccountProcessDeal-1229' into release/2.5.2.22.12.04
|
2022-12-29 10:19:49 +08:00 |
|
sy
|
a9168afe58
|
薪酬系统-福利台账，初次核算前为台账项设置基础数值（socialPay,fundPay,otherPay）
|
2022-12-29 10:17:54 +08:00 |
|
sy
|
e4df660cd9
|
Merge branch 'feature/v3-siAccountProcessDeal-1229' into release/2.5.2.22.12.04
|
2022-12-29 10:07:22 +08:00 |
|
sy
|
42d57163a9
|
薪酬系统-福利台账，福利核算无核算人员时，直接进度完成
|
2022-12-29 10:05:52 +08:00 |
|
sy
|
7fba73d3f4
|
薪酬系统-福利台账，福利核算无核算人员时，直接进度完成
|
2022-12-29 09:24:07 +08:00 |
|
sy
|
84aeb5059f
|
薪酬系统-福利台账，调差方式3时的福利项
|
2022-12-28 17:01:15 +08:00 |
|
fcli
|
8ccc1a0ec3
|
Merge branch 'feature/加密方法&分页merge' into release/2.5.2.22.12.04
|
2022-12-28 15:43:33 +08:00 |
|
sy
|
2f4d580793
|
薪酬系统-福利台账，调差列表优化，默认配置带出单位缴费数据
|
2022-12-28 11:58:38 +08:00 |
|
sy
|
494462092d
|
薪酬系统-福利台账，补缴方式选择指定月的缴纳基数获取功能
|
2022-12-27 17:34:46 +08:00 |
|
sy
|
af15ffcc23
|
薪酬系统-福利台账，补缴新增功能改造v1
|
2022-12-27 14:01:08 +08:00 |
|
fcli
|
45292dfc4f
|
feat: null处理
|
2022-12-27 11:39:52 +08:00 |
|
Harryxzy
|
6262f62292
|
薪资回算Excel导入BUG
|
2022-12-26 23:17:32 +08:00 |
|
Harryxzy
|
d7127e29e4
|
薪资档案中默认显示工号
|
2022-12-26 14:58:41 +08:00 |
|
sy
|
c49017f63b
|
Merge branch 'feature/v3-siAccountBalance-1208' into release/2.4.2.2212.03
|
2022-12-23 18:45:48 +08:00 |
|
sy
|
011d66e298
|
薪酬系统-福利台账，补差数据导入，过滤未启用福利项
|
2022-12-23 18:45:10 +08:00 |
|
sy
|
fe5847aed6
|
Merge branch 'feature/v3-siAccountBalance-1208' into release/2.4.2.2212.03
|
2022-12-23 17:51:30 +08:00 |
|
sy
|
df2ac4754d
|
薪酬系统-福利台账，补差数据导入，缴纳费用非有效数值型数据，直接跳过
|
2022-12-23 17:50:12 +08:00 |
|
sy
|
cea78e6594
|
Merge remote-tracking branch 'remotes/origin/feature/v3-siAccountBalance-1208' into release/2.4.2.2212.03
|
2022-12-23 16:35:33 +08:00 |
|
sy
|
5f4ddeabd4
|
薪酬系统-福利台账，补差数据待编辑数据过滤空值字段
|
2022-12-23 16:34:12 +08:00 |
|
sy
|
d2be8e86ea
|
Merge branch 'feature/v3-siAccountBalance-1208' into release/2.4.2.2212.03
|
2022-12-22 09:09:00 +08:00 |
|
Harryxzy
|
43511f7922
|
Merge branch 'feature/V3-backItem-1215' into release/2.4.2.2212.03
|
2022-12-21 16:39:55 +08:00 |
|
sy
|
28d1d16844
|
薪酬系统-福利台账，补差数据参与薪资核算
|
2022-12-21 11:12:14 +08:00 |
|
钱涛
|
85739933a5
|
单次核算5000
|
2022-12-20 16:45:09 +08:00 |
|
sy
|
e75d0c5872
|
薪酬系统-福利台账，补差数据导入逻辑问题修复,福利类合计为0时，不允许补差其包含的福利项
|
2022-12-20 15:20:42 +08:00 |
|
sy
|
cd671b5ae2
|
薪酬系统-福利台账，补差数据导入逻辑问题修复
|
2022-12-20 09:25:55 +08:00 |
|
Harryxzy
|
07292531db
|
重新回算提示
|
2022-12-19 18:03:17 +08:00 |
|
sy
|
547e7cd662
|
薪酬系统-福利台账，补差数据导入时，拒绝对于未设置社保、公积金、其他福利的正常缴纳项进行补差
|
2022-12-19 17:26:44 +08:00 |
|
sy
|
2f10986e2b
|
薪酬系统-福利台账，重新核算时，保留已有补差数据，但是bill_batch统计信息只统计补差相关缴费数额，不统计补差相关人数信息
|
2022-12-19 14:47:49 +08:00 |
|
sy
|
53d48d63b0
|
薪酬系统-福利台账，补差新增数据时，过滤重复数据
|
2022-12-19 11:43:20 +08:00 |
|
Harryxzy
|
ddea8c9066
|
回算工资单发放调整
|
2022-12-19 11:12:26 +08:00 |
|
sy
|
8157cafc98
|
薪酬系统-福利档案，取消停缴功能，添加人员是否在对应的个税扣缴义务人下的判断
|
2022-12-19 10:01:32 +08:00 |
|
钱涛
|
6ce7ef0b7e
|
Merge branch 'hotfix/处理流程操作者' into release/2.4.2.2212.03
|
2022-12-16 17:58:03 +08:00 |
|
fcli
|
4b2549f420
|
Merge branch 'feature/加密方法&分页merge' into release/2.4.2.2212.03
|
2022-12-16 17:57:17 +08:00 |
|
Harryxzy
|
eaa9b7515f
|
工资单发放详情模板名称调整
|
2022-12-16 15:53:34 +08:00 |
|
Harryxzy
|
0ace75ab06
|
工资单发放模板展示
|
2022-12-16 14:55:11 +08:00 |
|
Harryxzy
|
82577f97e0
|
舍入规则保存错误
|
2022-12-16 11:22:43 +08:00 |
|
sy
|
69e0d7e441
|
薪酬系统-福利台账，补差tab添加
|
2022-12-16 11:13:28 +08:00 |
|
钱涛
|
2fbd66ac19
|
操作者
|
2022-12-16 10:32:45 +08:00 |
|
fcli
|
c70964a8e2
|
feat: 继承类问题修改
|
2022-12-16 10:18:26 +08:00 |
|
fcli
|
bf870cc9aa
|
feat: 继承类问题修改
|
2022-12-16 10:11:41 +08:00 |
|
fcli
|
8f39d5d12a
|
Merge branch 'feature/加密方法' into feature/加密方法&分页merge
|
2022-12-16 10:01:09 +08:00 |
|
fcli
|
78447c002b
|
feat: 继承类问题修改
|
2022-12-16 10:01:00 +08:00 |
|
fcli
|
5295821dc1
|
Merge branch 'feature/加密方法' into feature/加密方法&分页merge
|
2022-12-16 09:46:55 +08:00 |
|
fcli
|
68f9c8b9db
|
feat: 继承类问题修改
|
2022-12-16 09:46:39 +08:00 |
|
sy
|
237f42f2ae
|
薪酬系统-福利台账，核算进度条逻辑优化
|
2022-12-15 18:03:28 +08:00 |
|
sy
|
cf08bbd842
|
薪酬系统-福利台账，补差相关加解密替换为新方法
|
2022-12-15 17:11:38 +08:00 |