sy
|
37310f02f6
|
薪酬系统-福利台账，补差导入相关合计项计算逻辑优化
|
2023-04-23 16:35:52 +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 |
Harryxzy
|
3a555c1866
|
修复已发
|
2023-04-20 13:08:58 +08:00 |
 钱涛
|
ef171db128
|
公式函数
|
2023-04-19 19:28:05 +08:00 |
|
钱涛
|
a19b19e23d
|
公式
|
2023-04-19 10:15:01 +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 |
|
钱涛
|
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 |
|
Harryxzy
|
b5d3acf418
|
Merge branch 'feature/salaryItemFieldsCanCopy_0420' into release/2.7.3.2304.01
|
2023-04-14 09:04:23 +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 |
|
钱涛
|
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 |
|
Harryxzy
|
82ee707f16
|
employebiz改成employeeservice
|
2023-04-12 15:27:35 +08:00 |
|
钱涛
|
a4a829d201
|
年终奖数据
|
2023-04-11 17:24:31 +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 |
|
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 |
|
Harryxzy
|
8c58cf01b3
|
字段拷贝调整
|
2023-04-11 10:48:41 +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
|
c3dfc5692e
|
薪资项目拷贝
|
2023-04-11 09:56:20 +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 |
|
钱涛
|
bb76df3718
|
个人养老金
|
2023-04-04 17:29:56 +08:00 |
|
Harryxzy
|
accb0d3d2b
|
社保福利台账 - 合计列
|
2023-04-04 17:21:29 +08:00 |
|
钱涛
|
44fe9203ab
|
个人养老金
|
2023-04-04 14:21:25 +08:00 |
|
钱涛
|
cb46fccb16
|
工资单推送
|
2023-04-03 18:49:28 +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
|
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
|
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
|
2fc4560488
|
薪资档案按照工号导入无效
|
2023-03-29 16:46:10 +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 |
|
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 |
|
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 |
|
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 |
|
钱涛
|
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 |
|
钱涛
|
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
|
7de5c1e175
|
Merge branch 'fix/V3_listShowChange_0309' into release/2.7.1.2303.02
|
2023-03-10 15:42:42 +08:00 |
|
钱涛
|
d8c13b70d2
|
内外部人员匹配标识
|
2023-03-08 18:01:19 +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
|
b6ee197fe6
|
薪酬系统,梳理Mapper类使用方式
|
2023-03-07 14:21:01 +08:00 |
|
钱涛
|
890ff64215
|
mock接口
|
2023-03-06 19:45:48 +08:00 |
|
钱涛
|
a423790a35
|
获取人员信息
|
2023-03-06 17:57:20 +08:00 |
|
钱涛
|
a5596d503f
|
外部人员基础信息
|
2023-03-03 16:57:52 +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
|
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 |
|
钱涛
|
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 |
|
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 |
|
钱涛
|
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 |
|
钱涛
|
a8cb586358
|
公式删除校验
|
2023-02-23 15:48:18 +08:00 |
|
钱涛
|
1c2028f551
|
公式删除优化
|
2023-02-23 14:52:24 +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 |
|
钱涛
|
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 |
|
钱涛
|
1bdc304ddf
|
清除公式
|
2023-02-16 09:16:00 +08:00 |
|
钱涛
|
a2e9c482a4
|
修复账套根据名称查询bug
去除调整前后值的限制
|
2023-02-15 16:38:54 +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 |
|
钱涛
|
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 |
|
Harryxzy
|
3b657db52a
|
线下对比Oracle导入报错
|
2023-02-10 09:59:18 +08:00 |
|
Harryxzy
|
d30870e28d
|
调薪不支持字符
|
2023-02-09 19:24:25 +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 |
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 |
|
钱涛
|
2c37086e70
|
账套群组保持不变
|
2023-02-09 15:33:35 +08:00 |
|
Harryxzy
|
69dd9cc61c
|
个税扣缴义务人、薪资账套 导入添加员工状态导入功能
|
2023-02-08 17:48:14 +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 |
|
fcli
|
0a1198f17d
|
fix: 个税扣缴义务人范围非空判断
|
2023-02-06 17:16:11 +08:00 |
|
钱涛
|
2ff5ff0dce
|
考勤列表和导出
|
2023-02-06 16:28:56 +08:00 |
|
钱涛
|
cdfced412f
|
Merge branch 'feature/年终奖' into release/2.6.1.2301.02
|
2023-02-02 16:13:05 +08:00 |
|
fcli
|
e92ea00b02
|
fix: 薪资项目公式按分权处理。
薪资项目管理列表取出薪资档案引用列
|
2023-01-31 14:31:46 +08:00 |
|
钱涛
|
9bedcf6d38
|
年终奖
|
2023-01-31 14:15:27 +08:00 |
|
钱涛
|
857c39bd2d
|
年终奖
|
2023-01-30 17:32:58 +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 |
|
Harryxzy
|
dc3bd34e0f
|
薪资回算sendStatus值update漏写
|
2023-01-14 13:59:13 +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 |
|
fcli
|
f1bdd0ada9
|
feat: 薪资项目分权，修改落库
|
2023-01-12 14:19:46 +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
|
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 |
|
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 |
|
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 |
|
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 |
|
fcli
|
3863a10c27
|
fix: 一月份不累计上年数据
|
2023-01-04 14:15:59 +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 |
|
sy
|
ee72dcd3f0
|
薪酬系统-福利台账，调差列表展示默认数据时，处理核算人员外的默认人员数据逻辑优化
|
2022-12-29 14:43:54 +08:00 |
|
sy
|
84aeb5059f
|
薪酬系统-福利台账，调差方式3时的福利项
|
2022-12-28 17:01:15 +08:00 |
|
sy
|
2f4d580793
|
薪酬系统-福利台账，调差列表优化，默认配置带出单位缴费数据
|
2022-12-28 11:58:38 +08:00 |
|
sy
|
494462092d
|
薪酬系统-福利台账，补缴方式选择指定月的缴纳基数获取功能
|
2022-12-27 17:34:46 +08:00 |
|
Harryxzy
|
6262f62292
|
薪资回算Excel导入BUG
|
2022-12-26 23:17:32 +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
|
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 |
|
Harryxzy
|
eaa9b7515f
|
工资单发放详情模板名称调整
|
2022-12-16 15:53:34 +08:00 |
|
Harryxzy
|
82577f97e0
|
舍入规则保存错误
|
2022-12-16 11:22:43 +08:00 |
|
sy
|
69e0d7e441
|
薪酬系统-福利台账，补差tab添加
|
2022-12-16 11:13:28 +08:00 |
|
sy
|
237f42f2ae
|
薪酬系统-福利台账，核算进度条逻辑优化
|
2022-12-15 18:03:28 +08:00 |
|
sy
|
cf08bbd842
|
薪酬系统-福利台账，补差相关加解密替换为新方法
|
2022-12-15 17:11:38 +08:00 |
|
sy
|
0787fb4d05
|
Merge remote-tracking branch 'remotes/origin/release/2.4.1.2212.02' into feature/v3-siAccountBalance-1208
# Conflicts:
# src/com/engine/salary/service/impl/SIAccountServiceImpl.java
|
2022-12-15 17:08:21 +08:00 |
|
钱涛
|
b59ba320df
|
人员去重
|
2022-12-15 16:59:00 +08:00 |
|
Harryxzy
|
b9b0a6f1c5
|
回算批量更新
|
2022-12-15 11:32:32 +08:00 |
|
Harryxzy
|
41a3583d61
|
修复回算按钮
|
2022-12-15 11:12:36 +08:00 |
|
Harryxzy
|
4ed3f47b36
|
薪资账套修改回算公式后不生效问题
|
2022-12-14 22:34:12 +08:00 |
|
Harryxzy
|
75220416bc
|
merge new解密
|
2022-12-14 12:32:42 +08:00 |
|
Harryxzy
|
0130b83f00
|
Merge branch 'feature/加密方法&分页merge' into feature/V3-backItem-1215
# Conflicts:
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
|
2022-12-14 12:21:42 +08:00 |
|
fcli
|
dea2353ef2
|
Merge branch 'feature/变更分页' into feature/加密方法&分页merge
# Conflicts:
# src/com/engine/salary/biz/SIAccountBiz.java
# src/com/engine/salary/biz/SalaryArchiveItemBiz.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/SpecialAddDeductionServiceImpl.java
|
2022-12-14 10:57:41 +08:00 |
|
fcli
|
d3de862d11
|
feat: 加密统一,薪资项目&社保档案详情...
|
2022-12-13 17:14:27 +08:00 |
|
sy
|
1e31dad7ad
|
薪酬系统-福利档案，待减员页面删除待办功能优化
|
2022-12-13 16:58:35 +08:00 |
|
Harryxzy
|
3b6418263f
|
薪资账套复制-薪资回算
薪资核算-回算部分四舍五入
|
2022-12-13 16:39:39 +08:00 |
|
钱涛
|
4d677b4d58
|
mock公式运行
|
2022-12-13 16:13:45 +08:00 |
|
fcli
|
1c6acb497c
|
feat: 加密统一，累计附加扣除详细
|
2022-12-13 10:49:51 +08:00 |
|
fcli
|
eabc983100
|
feat: 加密统一，社保福利档案&薪资核算结果
|
2022-12-13 10:15:31 +08:00 |
|
sy
|
32cffdccf5
|
薪酬系统-福利档案，批量减员逻辑变更，自动减员逻辑变更，无福利方案时，不关注最终缴纳月
|
2022-12-12 17:53:05 +08:00 |
|
sy
|
1fb706b7da
|
薪酬系统-福利档案，删除待办功能添加批量处理逻辑
|
2022-12-12 16:55:22 +08:00 |
|
fcli
|
1431308cc5
|
feat: 加密统一，薪资核算结果
|
2022-12-12 16:42:44 +08:00 |
|
sy
|
1b376464c4
|
薪酬系统-福利档案，删除待办功能（待减员页面）
|
2022-12-12 15:43:12 +08:00 |
|
fcli
|
93db32b758
|
feat: 加密统一，累计附加扣除&社保福利模块
|
2022-12-12 15:40:01 +08:00 |
|
sy
|
ae72d25431
|
Merge remote-tracking branch 'remotes/origin/master' into feature/v3-siAccountBalance-1208
|
2022-12-12 13:43:16 +08:00 |
|
fcli
|
b58e71989d
|
feat: 统一修改到内存分页
|
2022-12-12 10:25:55 +08:00 |
|
钱涛
|
8dc2ddc3c8
|
加密方法
|
2022-12-12 09:37:15 +08:00 |
|
钱涛
|
309cb2047d
|
配置文件
|
2022-12-09 15:28:29 +08:00 |
|
sy
|
43157d25e3
|
薪酬系统-福利台账，补差列表v1
|
2022-12-09 14:50:29 +08:00 |
|
钱涛
|
77d3046966
|
所有个税扣缴义务人的树形
|
2022-12-08 17:48:46 +08:00 |
|
钱涛
|
30e8fd3733
|
流程中个税扣缴义务人已处理
|
2022-12-08 16:48:37 +08:00 |
|
fcli
|
8e2e85a986
|
Merge remote-tracking branch 'origin/release/2.3.2.2212.01' into release/2.3.2.2212.01
|
2022-12-08 16:43:06 +08:00 |
|
fcli
|
cc105ca051
|
Merge branch 'feat/SalarySendRange' into release/2.3.2.2212.01
|
2022-12-08 16:41:04 +08:00 |
|
fcli
|
269bfeee18
|
feat: 查询列表加快
|
2022-12-08 16:39:57 +08:00 |
|
fcli
|
89574f278b
|
feat: 查询列表加快
|
2022-12-08 16:31:16 +08:00 |
|
sy
|
0399731b9b
|
Merge remote-tracking branch 'remotes/origin/feature/v3-siAccountCompensation-1201' into release/2.3.2.2212.01
|
2022-12-08 16:25:28 +08:00 |
|
sy
|
0210f6542f
|
薪酬系统-福利台账，补差数据删除v1
|
2022-12-08 16:23:18 +08:00 |
|
fcli
|
fcca6950ac
|
feat: 修复bug
|
2022-12-08 15:45:15 +08:00 |
|
Harryxzy
|
8e573f8bd7
|
补发工资单详情查看
|
2022-12-08 15:25:16 +08:00 |
|
钱涛
|
2c1421999b
|
Merge branch 'feature/扩展sql字符' into release/2.3.2.2212.01
|
2022-12-08 11:32:03 +08:00 |
|
钱涛
|
399563088d
|
流程生成人员范围
|
2022-12-08 10:49:51 +08:00 |
|
sy
|
979bb82661
|
薪酬系统-福利台账，调差数据保存时，增加新数据id信息的返回
|
2022-12-08 10:18:27 +08:00 |
|
钱涛
|
fb39dbe0c4
|
流程生成人员范围
|
2022-12-07 20:16:14 +08:00 |
|
钱涛
|
0d417f1e49
|
流程生成人员范围
|
2022-12-07 20:15:52 +08:00 |
|
Harryxzy
|
aed596523f
|
公司单发放详情报错
|
2022-12-07 18:00:31 +08:00 |
|
sy
|
f31e176cab
|
薪酬系统-福利台账，billBatch统计数据刷新方法优化（不需要统计补差数据中的人数信息）
|
2022-12-07 17:50:25 +08:00 |
|
sy
|
ccfffc200e
|
薪酬系统-福利台账，补差数据导入功能
|
2022-12-07 17:09:53 +08:00 |
|
钱涛
|
5079753c34
|
sql测试
|
2022-12-07 16:19:22 +08:00 |
|
Harryxzy
|
ecda5027de
|
fix 回算归档
|
2022-12-07 15:27:20 +08:00 |
|
Harryxzy
|
c4b17974ae
|
fix 归档，薪资核算不存在BUG
|
2022-12-07 15:21:29 +08:00 |
|
Harryxzy
|
f89c5d2970
|
工资单模板编辑补发模板
|
2022-12-07 15:03:39 +08:00 |
|
钱涛
|
b39587e19d
|
单独调薪action
|
2022-12-06 18:08:50 +08:00 |
|
sy
|
70a5854dc7
|
薪酬系统-福利台账，调差数据保存时，增加公司费用数值字段的校验
|
2022-12-06 15:40:40 +08:00 |
|
Harryxzy
|
c0d916c286
|
薪资回算功能，工资单部分
|
2022-12-06 15:29:08 +08:00 |
|
sy
|
3fa017b13a
|
薪酬系统-福利台账，补差福利项列表功能和补差模板导出功能
|
2022-12-06 11:44:04 +08:00 |
|
sy
|
bea06f1d88
|
薪酬系统-福利台账，可调差人员列表功能返回格式增加target字段
|
2022-12-05 16:56:05 +08:00 |
|
fcli
|
acab57aa36
|
feat: 撤回范围修复
|
2022-12-05 16:05:38 +08:00 |
|
钱涛
|
23dd15a568
|
批量调薪action
|
2022-12-05 16:01:08 +08:00 |
|
sy
|
a04f4a915f
|
薪酬系统-福利台账，可调差人员列表功能取消分页逻辑
|
2022-12-05 15:42:49 +08:00 |
|
fcli
|
ff7b1047bc
|
feat: 发放异常拦截
|
2022-12-05 14:06:22 +08:00 |
|
Harryxzy
|
fa6e41d62e
|
Merge branch 'fix/intSalaryArchiveFLOWOpenPermissions' into release/2.3.2.2212.01
|
2022-12-05 10:43:09 +08:00 |
|
Harryxzy
|
1b570fe1aa
|
放开管理员限制
|
2022-12-05 10:34:25 +08:00 |
|
Harryxzy
|
012d8dfb07
|
社保福利流程，放开个税扣缴义务人限制
|
2022-12-05 10:13:16 +08:00 |
|
Harryxzy
|
6fe28ec41c
|
定薪流程，放开个税扣缴义务人限制
|
2022-12-05 09:57:27 +08:00 |
|
sy
|
33aa8ea507
|
薪酬系统-福利档案，档案数据通过导入excel入库前，根据人员id和个税扣缴义务人进行去重
|
2022-12-02 17:57:09 +08:00 |
|
Harryxzy
|
3ff3fd8e44
|
薪资回算-薪资核算部分（剩余核算归档）
|
2022-12-02 17:35:14 +08:00 |
|
钱涛
|
991338a10e
|
合计行异步处理
|
2022-12-02 16:58:19 +08:00 |
|
钱涛
|
013f67469e
|
显示定制列的入职日期和离职日期
|
2022-12-01 14:33:21 +08:00 |
|
sy
|
e462992206
|
薪酬系统-福利台账，社保调差撤回功能优化
|
2022-12-01 11:50:37 +08:00 |
|
sy
|
5436742c74
|
薪酬系统-福利台账，社保调差列表查询功能优化
|
2022-11-30 17:57:25 +08:00 |
|
sy
|
4d01c324e0
|
薪酬系统-福利台账，社保调差保存功能优化
|
2022-11-30 15:05:24 +08:00 |
|
sy
|
ee7309ffd1
|
薪酬系统-福利台账，社保调差项公司支出费用统计功能优化，对于已存在调差项，给出提示，并且不进行计算
|
2022-11-30 14:07:28 +08:00 |
|
sy
|
a0bda933a1
|
薪酬系统-福利台账，社保调差项公司支出费用统计功能
|
2022-11-29 17:36:18 +08:00 |
|
sy
|
2ceeeb165f
|
薪酬系统-福利台账，社保调差列表v1
|
2022-11-29 15:33:57 +08:00 |
|
fcli
|
4f9e2d8f80
|
feat: 路径修改接近e10
|
2022-11-29 14:36:37 +08:00 |
|
sy
|
5486d3f849
|
薪酬系统-福利台账，社保调差字段类型调整
|
2022-11-28 16:25:52 +08:00 |
|
sy
|
8bc16ae470
|
Merge branch 'master' into feature/v3-siAccountCompensation-1201
|
2022-11-28 14:58:23 +08:00 |
|
sy
|
1747a613dd
|
薪酬系统-福利台账，社保调差撤回v1
|
2022-11-28 14:57:29 +08:00 |
|
sy
|
49466f9f3b
|
薪酬系统-福利台账，社保调差默认配置保存v1
|
2022-11-28 13:42:53 +08:00 |
|
sy
|
8d211c7db0
|
薪酬系统-福利台账，社保调差保存v1
|
2022-11-28 11:35:05 +08:00 |
|
钱涛
|
8f75380f67
|
扩展sql字符
|
2022-11-28 10:39:46 +08:00 |
|
Harryxzy
|
85fef5c5f8
|
Merge branch 'master' into feature/V3-backItem-1215
|
2022-11-28 09:26:59 +08:00 |
|
钱涛
|
4b75ba67e9
|
人员分片
|
2022-11-25 14:48:49 +08:00 |
|
sy
|
dc69a479ec
|
Merge remote-tracking branch 'remotes/origin/feature/v3-siAccountRecession-1117' into release/2.3.1.2211.04
|
2022-11-25 14:44:45 +08:00 |
|
sy
|
366c1a8367
|
薪酬系统-福利台账，退差数据保存优化，分批查询
|
2022-11-25 14:43:45 +08:00 |
|
sy
|
75a7497a07
|
Merge remote-tracking branch 'remotes/origin/feature/v3-siAccountRecession-1117' into release/2.3.1.2211.04
# Conflicts:
# src/com/engine/salary/mapper/datacollection/EmployMapper.java
|
2022-11-25 13:55:29 +08:00 |
|
fcli
|
fc81955b15
|
feat: 全部范围部分发放撤回功能
|
2022-11-25 10:53:23 +08:00 |
|
sy
|
eeea00a408
|
薪酬系统-福利台账，退差保存数据功能优化
|
2022-11-25 10:17:35 +08:00 |
|
sy
|
bc20d37797
|
薪酬系统-福利台账，退差保存数据来源增加个税扣缴义务人筛选
|
2022-11-24 20:35:51 +08:00 |
|
钱涛
|
832b40e40a
|
新增核算时间变量
|
2022-11-24 17:21:16 +08:00 |
|
sy
|
e412be8d5e
|
薪酬系统-福利台账，退差数据编辑、删除后，刷新bill_batch表中统计数据
|
2022-11-24 14:19:58 +08:00 |
|
sy
|
bbc58281f3
|
薪酬系统-福利台账，调差保存v2
|
2022-11-24 13:29:40 +08:00 |
|
sy
|
931b3d8a82
|
薪酬系统-福利台账，修改退差数据单条查看返回格式v2
|
2022-11-24 11:04:12 +08:00 |
|
sy
|
dfcd7d88b0
|
薪酬系统-福利台账，修改退差数据单条查看返回格式
|
2022-11-24 10:43:20 +08:00 |
|
sy
|
a631ecc3d9
|
Merge branch 'feature/v3-siAccountRecession-1117' into feature/v3-siAccountCompensation-1201
|
2022-11-24 09:48:30 +08:00 |
|
sy
|
d976ede775
|
薪酬系统-福利台账，退差数据新增后，刷新bill_batch表中统计数据
|
2022-11-24 09:46:06 +08:00 |
|
sy
|
e736cee6fd
|
Merge branch 'feature/v2-addWelfareArchives-1117' into feature/v3-siAccountRecession-1117
# Conflicts:
# src/com/engine/salary/service/SIAccountService.java
# src/com/engine/salary/service/impl/SIAccountServiceImpl.java
|
2022-11-24 09:39:13 +08:00 |
|
sy
|
0f50520aa9
|
薪酬系统-福利台账，抽取bill_batch表中统计数据刷新方法
|
2022-11-24 09:31:44 +08:00 |
|
sy
|
27dd8b4450
|
薪酬系统-福利台账，调差保存v1
|
2022-11-24 09:17:08 +08:00 |
|
钱涛
|
c5aa1aded7
|
缓存类
|
2022-11-23 18:36:33 +08:00 |
|
钱涛
|
2ab7049fa0
|
单个核算
|
2022-11-23 18:30:53 +08:00 |
|
钱涛
|
5221c22b5c
|
优化公式选择档案项目和薪资项目
|
2022-11-23 17:02:17 +08:00 |
|
sy
|
f1bd574c81
|
薪酬系统-福利台账，调差v2
|
2022-11-23 15:39:42 +08:00 |
|
sy
|
edf9e22d22
|
薪酬系统-福利台账，福利核算接口添加返回当前核算人id
|
2022-11-23 15:01:28 +08:00 |
|
sy
|
d81883e3d2
|
薪酬系统-福利台账，调差v1
|
2022-11-23 14:49:44 +08:00 |
|
钱涛
|
1307f485eb
|
同步人员范围
|
2022-11-22 15:53:05 +08:00 |
|
钱涛
|
264edf1bf2
|
同步人员范围
|
2022-11-22 15:37:07 +08:00 |
|
Harryxzy
|
a53fa14a3d
|
Merge branch 'master' into feature/V3-backItem-MMdd
|
2022-11-22 14:37:15 +08:00 |
|
Harryxzy
|
036d2d540b
|
薪资回算-薪资账套部分
|
2022-11-22 14:36:59 +08:00 |
|
sy
|
2b29813f6b
|
薪酬系统-福利台账，退差数据导出
|
2022-11-22 13:35:09 +08:00 |
|
sy
|
d7a4b30185
|
薪酬系统-福利台账，退差数据不参与薪资核算
|
2022-11-22 10:26:34 +08:00 |
|
sy
|
7c299e6199
|
薪酬系统-福利台账，退差数据新增v4
|
2022-11-22 09:46:37 +08:00 |
|
sy
|
15477cc8d5
|
薪酬系统-福利台账，退差数据新增v3
|
2022-11-21 17:52:28 +08:00 |
|
sy
|
aa7a3ced01
|
薪酬系统-福利台账，导入数据刷新统计数据优化
|
2022-11-21 16:53:00 +08:00 |
|
sy
|
955f8c255e
|
薪酬系统-福利台账，退差数据新增v2
|
2022-11-21 16:25:26 +08:00 |
|
sy
|
96a440a9a7
|
薪酬系统-福利台账，退差数据新增时的可选择人员列表v1
|
2022-11-21 15:27:15 +08:00 |
|
sy
|
9c897c87dd
|
Merge remote-tracking branch 'remotes/origin/master' into feature/v3-siAccountRecession-1117
|
2022-11-21 09:54:44 +08:00 |
|
sy
|
e2a4a7157b
|
Merge remote-tracking branch 'remotes/origin/master' into feature/v2-addWelfareArchives-1117
|
2022-11-21 09:48:46 +08:00 |
|
sy
|
df76d24a39
|
薪酬系统-福利台账，退差数据编辑v1
|
2022-11-18 17:56:21 +08:00 |
|
sy
|
746ab58ed3
|
薪酬系统-福利台账，退差数据单条查看v2
|
2022-11-18 16:07:20 +08:00 |
|
Harryxzy
|
a5ae8c8ea6
|
回算薪资项（薪资账套部分），剩余处理历史数据
|
2022-11-18 14:20:18 +08:00 |
|
钱涛
|
9a9a9cdaf3
|
Merge branch 'feature/加锁221117' into release/2.2.2.2211.03
|
2022-11-17 19:05:55 +08:00 |
|
钱涛
|
cc711bc411
|
修复加锁顺序
|
2022-11-17 19:04:42 +08:00 |
|
钱涛
|
d07ded883f
|
修复加锁顺序
|
2022-11-17 18:53:22 +08:00 |
|
Harryxzy
|
11c4b1e4f7
|
Merge branch 'feature/V3-editSalaryAdjustment-11-17' into release/2.2.2.2211.03
|
2022-11-17 18:35:12 +08:00 |
|
sy
|
47406b67c2
|
薪酬系统-福利档案，导入数据时，对于时间字符串，允许excel默认格式设置
|
2022-11-17 17:07:04 +08:00 |
|
钱涛
|
4779cc861e
|
相同itemid
|
2022-11-17 17:04:14 +08:00 |
|
Harryxzy
|
f762fd7030
|
调薪编辑、删除 放开校验限制
|
2022-11-17 16:51:07 +08:00 |
|
fcli
|
e6eaf96bcd
|
feat: 沿用上月增加校验
|
2022-11-17 15:39:39 +08:00 |
|
sy
|
e0175f3ae7
|
薪酬系统-福利档案，导入数据时，若设置了福利方案，则该福利类型的起始缴纳月必填
|
2022-11-17 15:32:43 +08:00 |
|
钱涛
|
10ffe88810
|
核算锁定
|
2022-11-17 15:17:49 +08:00 |
|
fcli
|
b03e5efbcf
|
feat: 沿用上月增加校验
|
2022-11-17 15:13:59 +08:00 |
|
fcli
|
0aa59757c5
|
feat: 沿用上月增加校验
|
2022-11-17 15:13:55 +08:00 |
|
sy
|
fee892e17b
|
薪酬系统-福利档案，导入数据在设置福利档案时，对其下未设置福利项数值的字段默认为0，并参与基数上下限校验
|
2022-11-17 15:08:30 +08:00 |
|
fcli
|
0f51d44cd4
|
Merge remote-tracking branch 'origin/release/2.2.2.2211.03' into release/2.2.2.2211.03
|
2022-11-17 14:43:59 +08:00 |
|
fcli
|
b3cd118c21
|
feat: 自动累计功能
|
2022-11-17 14:28:15 +08:00 |
|
fcli
|
5743fa2162
|
feat: 其他附加扣除沿用上月功能完成
|
2022-11-17 14:28:10 +08:00 |
|
Harryxzy
|
2bc1453ad8
|
Merge branch 'feature/V3-editSalaryAdjustment-11-17' into release/2.2.2.2211.03
|
2022-11-17 14:28:07 +08:00 |
|
fcli
|
0aabfcd68a
|
feat: 薪资范围需求
|
2022-11-17 14:25:10 +08:00 |
|
sy
|
57300125cd
|
薪酬系统-福利台账，正常缴纳/补缴导入时候，刷新台账统计
|
2022-11-17 13:39:50 +08:00 |
|
fcli
|
e8347b88cc
|
feat: 薪资范围问题
|
2022-11-17 11:11:58 +08:00 |
|
sy
|
4073907a2c
|
薪酬系统-福利台账，福利台账导入后刷新统计数据v1
|
2022-11-17 10:09:01 +08:00 |
|
钱涛
|
271daf29be
|
批量锁定功能
|
2022-11-17 09:28:40 +08:00 |
|
Harryxzy
|
9f17c6e99a
|
fixBUG
|
2022-11-16 17:22:22 +08:00 |
|
sy
|
ad0b89b91a
|
薪酬系统-福利台账，退差数据单条查看v1
|
2022-11-16 17:02:54 +08:00 |
|
sy
|
7be9424f73
|
薪酬系统-福利台账，退差数据列表功能v2
|
2022-11-16 15:45:36 +08:00 |
|
Harryxzy
|
1e307e2f87
|
薪资回算，薪资账套中薪资回算项目展示
|
2022-11-16 15:18:43 +08:00 |
|
Harryxzy
|
1bcb02d2e0
|
fix薪资账套关闭状态下无法删除bug
|
2022-11-16 14:22:25 +08:00 |
|
Harryxzy
|
00357cd9d8
|
回算功能-新建薪资账套默认
|
2022-11-16 10:32:05 +08:00 |
|
sy
|
c339798dc8
|
薪酬系统-福利台账，退差数据导出功能v1
|
2022-11-16 09:48:17 +08:00 |
|
sy
|
b647089eaf
|
薪酬系统-福利台账，退差数据新增功能v1
|
2022-11-15 17:58:37 +08:00 |
|
sy
|
969bc6b413
|
薪酬系统-福利档案，福利档案新增接口v5
|
2022-11-15 11:13:16 +08:00 |
|
Harryxzy
|
9dc6c61ed2
|
编辑调薪
|
2022-11-14 21:03:24 +08:00 |
|
sy
|
2e71ee7a35
|
薪酬系统-福利档案，福利档案新增接口v4
|
2022-11-14 10:22:15 +08:00 |
|
sy
|
f3dc63244f
|
薪酬系统-福利档案，福利档案新增接口v3
|
2022-11-11 11:15:33 +08:00 |
|
sy
|
86dbb87f1b
|
薪酬系统-福利档案，福利档案新增接口v2
|
2022-11-11 09:11:53 +08:00 |
|
sy
|
451968f122
|
Merge remote-tracking branch 'remotes/origin/master' into feature/v2-addWelfareArchives-1117
|
2022-11-11 08:56:30 +08:00 |
|
sy
|
647dd80a20
|
薪酬系统-福利档案，福利档案新增接口v1
|
2022-11-11 08:56:05 +08:00 |
|
Harryxzy
|
15749ecc10
|
Merge branch 'feature/V2-taxDeclarationSwitch-11-10' into release/2.1.3.2211.03
# Conflicts:
# src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
|
2022-11-10 11:25:01 +08:00 |
|
Harryxzy
|
c786dc2d14
|
个税申报功能-重启时间和薪资核算创建时间比较
|
2022-11-10 11:11:41 +08:00 |
|
Harryxzy
|
3d4be3265e
|
个税申报功能-重启
|
2022-11-10 09:46:30 +08:00 |
|
fcli
|
459f7e5053
|
Merge branch 'feature/SpecialAddUpMerge' into release/2.1.3.2211.03
|
2022-11-10 09:33:22 +08:00 |
|
钱涛
|
f5622df8fe
|
Merge branch 'feature/report1110' into release/2.1.3.2211.03
# Conflicts:
# src/com/engine/salary/sys/entity/param/AppSettingSaveParam.java
# src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
|
2022-11-09 19:03:14 +08:00 |
|
fcli
|
63ee9c9b8e
|
fix: 一键累计添加日期与校验
|
2022-11-09 18:57:28 +08:00 |
|
sy
|
23e7065403
|
Merge branch 'feature/v2-allAddLimit-1110' into release/2.1.3.2211.03
|
2022-11-09 17:42:15 +08:00 |
|
钱涛
|
b55c339bb0
|
获取上月数据
|
2022-11-09 17:26:51 +08:00 |
|
fcli
|
815e37e50b
|
fix: 一键累计添加日期与校验
|
2022-11-09 16:55:00 +08:00 |
|
Harryxzy
|
02a6ab11ce
|
Merge branch 'fix/CollectionDataLongCompare' into release/2.1.3.2211.03
# Conflicts:
# src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
|
2022-11-09 16:44:49 +08:00 |
|
Harryxzy
|
095a0665b8
|
Merge branch 'feature/V2-taxDeclarationSwitch-11-10' into release/2.1.3.2211.03
|
2022-11-09 16:12:35 +08:00 |
|
fcli
|
bf75c3831f
|
fix: 一键累计添加日期
|
2022-11-09 15:39:00 +08:00 |
|
Harryxzy
|
e2e383bd79
|
数据采集-Fix数据采集Long类型判断
|
2022-11-09 15:36:07 +08:00 |
|
sy
|
2c691d1838
|
薪酬系统-福利档案增员问题修复
|
2022-11-09 11:25:46 +08:00 |
|
fcli
|
dd5c2ba4ce
|
fix: 管理员可以编辑该扣缴义务人数据，其他人可以编辑本人数据&一键累计所有个税扣缴义务人下的人员
|
2022-11-09 10:41:00 +08:00 |
|
fcli
|
eb7311f0f3
|
fix: 管理员可以编辑该扣缴义务人数据，其他人可以编辑本人数据&一键累计所有个税扣缴义务人下的人员
|
2022-11-09 10:40:55 +08:00 |
|
fcli
|
07a07d2be8
|
feat: 专项附加扣除模块, 权限限制，导入导出优化，添加一键累计
|
2022-11-09 10:40:48 +08:00 |
|
fcli
|
9b77bf7139
|
feat: 专项附加扣除模块, 一键清空、分页bug等
|
2022-11-09 10:40:38 +08:00 |
|
fcli
|
92a6512dc8
|
feat: 专项附加扣除模块,去除月份，添加普通用户登录查看本人记录功能
|
2022-11-09 10:40:28 +08:00 |
|
fcli
|
171f726bd3
|
feat: 专项附加扣除模块
|
2022-11-09 10:40:01 +08:00 |
|
sy
|
b66fe2b593
|
薪酬系统-福利档案导入，增加对社保、公积金、其他福利方案设置是否为正确的福利类型
|
2022-11-09 09:53:13 +08:00 |
|
Harryxzy
|
8a704a9f5b
|
个税申报开关-添加新建判断
|
2022-11-08 16:27:29 +08:00 |
|
Harryxzy
|
1fb96be58b
|
个税申报开关
|
2022-11-08 11:22:56 +08:00 |
|
钱涛
|
21ccf6cbcb
|
sql解密
|
2022-11-08 11:10:56 +08:00 |
|
钱涛
|
729389dcef
|
Merge branch 'release/2.1.3.2211.03' into feature/report1110
|
2022-11-08 09:33:00 +08:00 |
|
sy
|
defa7dacc3
|
薪酬系统-福利档案全量增员、全量减员添加个税扣缴义务人筛选逻辑
|
2022-11-07 17:15:42 +08:00 |
|
钱涛
|
457fe51239
|
处理薪资档案重复数据
|
2022-11-07 17:05:50 +08:00 |
|
钱涛
|
2da0455c46
|
修复薪资档案个税扣缴义务人不显示的问题
处理历史数据改为异步
|
2022-11-07 15:11:24 +08:00 |
|
钱涛
|
f2fdbca8f7
|
脱敏表配置
|
2022-11-07 11:31:21 +08:00 |
|
sy
|
65aff3e5be
|
Merge remote-tracking branch 'remotes/origin/feature/v2-welHistoryDetail-1104' into release/2.1.2.2211.01
|
2022-11-04 11:08:54 +08:00 |
|
sy
|
f8aa2b423a
|
薪酬系统-福利模块bug修复v10，增量数据处理逻辑修复
|
2022-11-04 11:07:43 +08:00 |
|
钱涛
|
86e3214d8e
|
核算日志
|
2022-11-04 10:42:05 +08:00 |
|
sy
|
784399a936
|
Merge branch 'feature/v2-welHistoryDetail-1104' into release/2.1.2.2211.01
|
2022-11-04 09:18:37 +08:00 |
|
sy
|
49e1f7624f
|
薪酬系统-福利模块bug修复v8，历史数据处理触发全量增员逻辑调整，基数上下限逻辑调整
|
2022-11-04 09:17:49 +08:00 |
|
钱涛
|
f1f8ae53af
|
档案项目默认生效时间取起始缴纳日期
|
2022-11-03 19:32:51 +08:00 |
|
sy
|
25d87c3480
|
Merge branch 'feature/v2-welHistoryDetail-1104' into release/2.1.2.2211.01
|
2022-11-03 19:04:32 +08:00 |
|
sy
|
f6141a894e
|
薪酬系统-福利模块bug修复v6,历史数据生成为“待增员”，并触发一次全量增员
|
2022-11-03 19:03:41 +08:00 |
|
钱涛
|
0cd5f1d4d8
|
一键发薪bug
|
2022-11-03 17:16:37 +08:00 |
|
sy
|
35022f7d09
|
Merge branch 'feature/v2-welHistoryDetail-1104' into release/2.1.2.2211.01
|
2022-11-03 16:19:59 +08:00 |
|
sy
|
278a01de01
|
薪酬系统-福利模块bug修复v4
|
2022-11-03 16:17:03 +08:00 |
|
sy
|
65208fb265
|
Merge remote-tracking branch 'remotes/origin/feature/v2-welHistoryDetail-1104' into release/2.1.2.2211.01
|
2022-11-03 11:37:03 +08:00 |
|
sy
|
b0d55cd227
|
Merge branch 'release/2.1.2.2211.01' into feature/v2-welHistoryDetail-1104
|
2022-11-03 11:15:51 +08:00 |
|
sy
|
40462d9fec
|
薪酬系统-福利模块bug修复v1
|
2022-11-03 11:14:59 +08:00 |
|
钱涛
|
54e64f58cb
|
申报表导出bug
|
2022-11-03 10:36:50 +08:00 |
|
sy
|
0c8c3b0c04
|
Merge branch 'feature/v2-welHistoryDetail-1104' into release/2.1.2.2211.01
|
2022-11-02 20:22:29 +08:00 |
|
sy
|
0895c653b0
|
薪酬系统-福利模块历史数据分片
|
2022-11-02 20:22:03 +08:00 |
|
钱涛
|
c29ee34c1e
|
分片删除
|
2022-11-02 20:10:16 +08:00 |
|
钱涛
|
33e2e0e933
|
修复冲突
|
2022-11-02 17:36:34 +08:00 |
|
fcli
|
8873224123
|
Merge remote-tracking branch 'origin/release/2.1.2.2211.01' into release/2.1.2.2211.01
|
2022-11-02 17:33:26 +08:00 |
|
fcli
|
11f0a2c418
|
Merge branch 'fix/089' into release/2.1.2.2211.01
|
2022-11-02 17:32:49 +08:00 |
|
fcli
|
59f030adf8
|
Merge branch 'fix/104' into release/2.1.2.2211.01
# Conflicts:
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
|
2022-11-02 17:32:42 +08:00 |
|
sy
|
d3a9d71942
|
Merge remote-tracking branch 'remotes/origin/feature/v2-welfareBaseLimit-1104' into release/2.1.2.2211.01
|
2022-11-02 17:30:37 +08:00 |
|
sy
|
3cbf9b10e5
|
Merge branch 'feature/v2-oneToMoreBaseInfo-1104' into release/2.1.2.2211.01
|
2022-11-02 17:30:21 +08:00 |
|
钱涛
|
28be5f8e41
|
Merge branch 'hotfix/工资单发放合并计税bug' into release/2.1.2.2211.01
|
2022-11-02 17:22:19 +08:00 |
|
钱涛
|
73c24bcac5
|
工资单发放合并计税bug
|
2022-11-02 17:20:34 +08:00 |
|
Harryxzy
|
b7597ee826
|
Merge branch 'feature/V2-editDataCollection-11-03' into release/2.1.2.2211.01
|
2022-11-02 16:00:20 +08:00 |
|
sy
|
18bf4a8c51
|
薪酬系统-福利档案福利基数变更触发基数上下限约束相关逻辑优化
|
2022-11-02 11:48:15 +08:00 |
|
sy
|
eda168e617
|
薪酬系统-福利档案列表功能中历史数据处理逻辑顺序调整
|
2022-11-01 17:37:47 +08:00 |
|
sy
|
51412603e5
|
薪酬系统-福利档案基数上下限相关逻辑
|
2022-11-01 17:17:33 +08:00 |
|
Harryxzy
|
5d97954e48
|
往期累计情况一键清空和删除所选
|
2022-10-31 19:21:13 +08:00 |
|
钱涛
|
78392b50dd
|
修复权限问题
|
2022-10-31 18:29:39 +08:00 |
|
Harryxzy
|
e8ac395300
|
fix-专项附加扣除taxAgentId为空
|
2022-10-31 16:04:06 +08:00 |
|
Harryxzy
|
317fb5e8ac
|
数据采集-编辑前查看功能
|
2022-10-31 14:50:54 +08:00 |
|
sy
|
cfb682655e
|
薪酬系统-福利档案全部导出问题修复
|
2022-10-31 14:46:32 +08:00 |
|
sy
|
b28887bde9
|
薪酬系统-福利方案基数上下限v1
|
2022-10-31 14:18:53 +08:00 |
|
sy
|
9c54d1872f
|
Merge remote-tracking branch 'remotes/origin/feature/v2-baseInfoOneToMore' into feature/v2-oneToMoreBaseInfo-1104
|
2022-10-31 09:56:58 +08:00 |
|
Harryxzy
|
d525c59d6d
|
Merge branch 'feature/V2-editDataCollection-11-03-tempDev' into feature/V2-editDataCollection-11-03
|
2022-10-28 16:38:17 +08:00 |
|
Harryxzy
|
e046b7e3fe
|
fix 一键清空
|
2022-10-28 16:35:51 +08:00 |
|
Harryxzy
|
09d85bdab3
|
考勤引用=编辑
|
2022-10-28 16:15:51 +08:00 |
|
sy
|
d6ec6ca25d
|
薪酬系统-福利台账核算一对多改造，在正常缴纳和补缴核算功能中，获取带核算数据增加筛选项（个税扣缴义务人）
|
2022-10-28 15:25:58 +08:00 |
|
Harryxzy
|
1f29ac67eb
|
累计、其他免税、往期 新增、删除、一键清空、编辑功能
|
2022-10-28 14:08:27 +08:00 |
|
sy
|
541afcf303
|
薪酬系统-福利档案一对多改造，福利档案增量数据对于删除数据处理逻辑调整
|
2022-10-28 10:24:43 +08:00 |
|
fcli
|
31982fc1db
|
fix: 工资单发放页高级搜索功能不生效
|
2022-10-28 09:39:31 +08:00 |
|
sy
|
54a3f31cc2
|
薪酬系统-福利档案一对多改造，福利档案增量数据处理功能逻辑调整
|
2022-10-27 18:21:53 +08:00 |
|
Harryxzy
|
ddd0c49cdd
|
其他免税扣除-新增、删除所选、一键清空功能
|
2022-10-27 18:02:05 +08:00 |
|
sy
|
7b4bc74c0b
|
薪酬系统-福利档案一对多改造，福利档案增员功能逻辑调整
|
2022-10-27 18:00:05 +08:00 |
|
sy
|
825c72a892
|
薪酬系统-福利档案一对多改造，福利档案减员功能逻辑调整
|
2022-10-27 17:43:52 +08:00 |
|
sy
|
743bffb089
|
薪酬系统-福利档案一对多改造，福利档案编辑tab展示和保存相关逻辑调整
|
2022-10-27 16:23:54 +08:00 |
|
钱涛
|
104213fc04
|
1、提示优化
2、导入模板
3、定薪流程
|
2022-10-27 15:17:22 +08:00 |
|
Harryxzy
|
a406eed4b9
|
累计专项附加扣除-新增、删除所选、一键清空功能
|
2022-10-27 13:59:11 +08:00 |
|
sy
|
5daf7a1aff
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/v2-baseInfoOneToMore
|
2022-10-26 20:02:54 +08:00 |
|
Harryxzy
|
934c0b8914
|
fixbug
|
2022-10-26 18:59:32 +08:00 |
|
Harryxzy
|
c0bb94bf71
|
editDataCollection-2
|
2022-10-26 18:35:23 +08:00 |
|
钱涛
|
d72362f7b7
|
档案模板注释
|
2022-10-26 18:05:04 +08:00 |
|
fcli
|
6f09d25077
|
fix: 我的调薪记录问题修改
|
2022-10-26 17:48:59 +08:00 |
|
sy
|
5a408e8bfc
|
薪酬系统-福利档案一对多改造v1,档案删除逻辑修改，档案id获取逻辑修改
|
2022-10-26 15:08:17 +08:00 |
|
钱涛
|
7a817af154
|
档案导入
|
2022-10-26 13:46:36 +08:00 |
|
sy
|
f75e7ebf32
|
薪酬系统-福利档案改造，列表tab页导入逻辑调整，对已有其他个税扣缴义务人的员工福利档案，不进行导入处理
|
2022-10-24 14:13:26 +08:00 |
|
sy
|
6941999a09
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy
|
2022-10-21 15:23:43 +08:00 |
|
sy
|
755aff52ba
|
薪酬系统-福利台账，修复线下对比列表排序问题
|
2022-10-21 14:15:03 +08:00 |
|
sy
|
21a4159ffa
|
薪酬系统-福利档案改造，福利台账补缴页列表、导入模板带出数据和导出功能添加runStatus约束
|
2022-10-20 17:33:29 +08:00 |
|
sy
|
24e5c97197
|
薪酬系统-福利档案改造，福利台账正常缴纳页导入模板带出数据和导出功能添加runStatus约束
|
2022-10-20 16:29:49 +08:00 |
|
sy
|
2a7c6cac42
|
薪酬系统-福利档案改造，福利台账线下对比列表仅展示处于在缴人员的数据
|
2022-10-20 16:08:48 +08:00 |
|
sy
|
2a6d556929
|
薪酬系统-福利台账核算和正常缴纳人员列表功能添加基础信息表runStatus字段的筛选逻辑
|
2022-10-20 11:27:27 +08:00 |
|
钱涛
|
a2716c4330
|
处理档案重复生成的问题
|
2022-10-19 13:36:31 +08:00 |
|
钱涛
|
47e390eb28
|
Merge branch 'feature/archive' into develop
|
2022-10-18 16:47:54 +08:00 |
|
钱涛
|
1f48539e1c
|
删除待定薪代办
删除待停薪代办
|
2022-10-18 16:44:31 +08:00 |
|
sy
|
09100ea916
|
薪酬系统-福利档案结构改造，正在缴纳页导入功能优化
|
2022-10-18 15:37:03 +08:00 |
|
sy
|
b04a9d39de
|
薪酬系统-福利档案结构改造，正在缴纳页导入功能优化
|
2022-10-17 17:53:05 +08:00 |
|
sy
|
21fa422350
|
薪酬系统-福利档案结构改造，取消停缴功能优化和导入功能添加runStatus条件
|
2022-10-17 17:24:40 +08:00 |
|
sy
|
b16133f61a
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy
|
2022-10-17 10:13:59 +08:00 |
|
sy
|
8fa59c2cf9
|
薪酬系统-福利档案结构改造，增员、减员接口返回结果格式调整
|
2022-10-17 10:13:38 +08:00 |
|
钱涛
|
5102d51b09
|
Merge branch 'feature/archive' into develop
|
2022-10-17 10:03:58 +08:00 |
|
sy
|
8d9a00bfff
|
薪酬系统-福利档案结构改造，取消停缴、增员、减员接口入参格式调整
|
2022-10-14 18:00:22 +08:00 |
|
sy
|
3d714c2b8d
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy
|
2022-10-14 16:34:25 +08:00 |
|
sy
|
8a0e72f99c
|
薪酬系统-福利档案结构改造，档案列表接口返回结果优化
|
2022-10-14 16:34:10 +08:00 |
|
钱涛
|
77fc944491
|
获取保存档案配置表单
保存档案配置
|
2022-10-14 16:18:55 +08:00 |
|
Harryxzy
|
5233c85c81
|
Merge branch 'origin/feature/updateAndDeleteCustomCategory_xzy' into develop
|
2022-10-14 15:32:30 +08:00 |
|
Harryxzy
|
989dd13216
|
xzy-修改自定义福利名称
|
2022-10-14 15:17:56 +08:00 |
|
sy
|
4701c4de5c
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy
|
2022-10-14 14:31:35 +08:00 |
|
sy
|
e61d4f21c7
|
薪酬系统-福利档案结构改造，待减员页面的减员功能
|
2022-10-14 14:31:09 +08:00 |
|
sy
|
0e6520f838
|
薪酬系统-福利档案结构改造，批量更改福利档案状态功能和取消停缴功能
|
2022-10-13 17:36:15 +08:00 |
|
钱涛
|
0e05185599
|
操作接口
|
2022-10-13 16:24:59 +08:00 |
|
sy
|
b1cdeb0a4f
|
薪酬系统-福利档案结构改造，福利档案中增量数据自动处理功能v2
|
2022-10-13 16:04:54 +08:00 |
|
sy
|
1aaa8ce43e
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy
|
2022-10-13 14:58:42 +08:00 |
|
钱涛
|
68076fc724
|
fix sqlserver增量数据空
|
2022-10-13 14:57:52 +08:00 |
|
sy
|
fd63c16b93
|
薪酬系统-福利档案结构改造，福利档案中增量数据自动处理功能
|
2022-10-13 14:45:18 +08:00 |
|
sy
|
8d26f2ac46
|
薪酬系统-福利档案结构改造，福利档案中待减员数据自动处理功能
|
2022-10-12 17:17:06 +08:00 |
|
sy
|
187508c0f9
|
薪酬系统-福利档案结构改造，福利档案各tap页记录数统计功能
|
2022-10-12 10:38:41 +08:00 |
|
钱涛
|
a18b008581
|
Merge branch 'develop' into feature/archive
|
2022-10-11 14:43:21 +08:00 |
|
sy
|
b2284d6669
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy
|
2022-10-11 09:03:46 +08:00 |
|
钱涛
|
ab575db152
|
Merge branch 'develop' into feature/archive
|
2022-10-10 17:36:29 +08:00 |
|
sy
|
a7b47a8bfe
|
薪酬系统-福利档案结构改造，档案列表导出增加runstatus条件、并将导入和历史数据生成的福利档案基础信息的默认runStatus置为2
|
2022-10-10 17:11:44 +08:00 |
|
钱涛
|
212631c9e5
|
Merge branch 'hotfix-1010' into develop
|
2022-10-10 17:08:22 +08:00 |
|
钱涛
|
c5870f17a2
|
处理考勤值为空
|
2022-10-10 17:07:51 +08:00 |
|
钱涛
|
9781b67ddb
|
Merge branch 'develop' into feature/archive
|
2022-10-10 15:41:31 +08:00 |
|
钱涛
|
41203342d0
|
薪资列表
|
2022-10-10 14:58:29 +08:00 |
|
sy
|
ed00d3fe89
|
薪酬系统-福利档案结构改造，福利台账核算中的补缴人元添加时判断是否已存在福利档案的数据源调整为福利档案基础信息表
|
2022-10-10 14:20:02 +08:00 |
|
sy
|
d6c6f446a9
|
薪酬系统-福利档案结构改造，恢复社保、公积金、其他福利档案表在档案导入时的个税扣缴义务人设置逻辑
|
2022-10-10 11:49:18 +08:00 |
|
sy
|
49502a2f70
|
薪酬系统-福利档案结构改造，通过福利档案人员状态枚举类设置档案基础信息的runStatus字段值
|
2022-10-10 11:27:08 +08:00 |
|
钱涛
|
5431ed9506
|
历史数据处理
|
2022-10-10 09:47:09 +08:00 |
|
sy
|
9b1c6222ed
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy
|
2022-10-10 09:37:03 +08:00 |
|
sy
|
85d46938da
|
薪酬系统-福利档案导入改造，增加基础信息表数据插入逻辑
|
2022-10-10 09:36:34 +08:00 |
|
Harryxzy
|
7c358fe3a0
|
xzy-fix-薪资档案中默认人员范围
|
2022-10-09 17:51:30 +08:00 |
|
sy
|
7ac7d58a5f
|
薪酬系统-福利档案列表查询改造
|
2022-10-09 15:12:54 +08:00 |
|
Harryxzy
|
e3a2a52ab8
|
xzy-fix-薪资账套人员错误问题
|
2022-10-09 13:32:05 +08:00 |
|
钱涛
|
1f0bf061dd
|
历史数据处理
|
2022-10-09 10:55:35 +08:00 |
|
Harryxzy
|
b2b0abcaf5
|
xzy-fix-处理Employee_statuses历史数据
|
2022-10-08 17:21:38 +08:00 |
|
sy
|
7ffd295be0
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport
|
2022-10-08 09:14:54 +08:00 |
|
钱涛
|
521801849f
|
兼容5.7
|
2022-10-08 09:14:13 +08:00 |
|
sy
|
98a297ef27
|
薪酬系统-福利台账-正常缴纳导入模板数据未带出问题修复
|
2022-09-30 15:40:15 +08:00 |
|
sy
|
dad3197c3a
|
薪酬系统-福利档案，导入模板表头字段提示bug修复
|
2022-09-30 11:44:51 +08:00 |
|
sy
|
2725fc8444
|
薪酬系统-福利台账，线下对比导入取消表id自增，修改对比数据查询参数格式
|
2022-09-30 10:55:46 +08:00 |
|
sy
|
0cfd2fc081
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport
|
2022-09-29 17:32:22 +08:00 |
|
sy
|
1e476e06a5
|
薪酬系统-福利台账，线下对比结果列表导出v1
|
2022-09-29 17:32:04 +08:00 |
|
钱涛
|
5285e518d9
|
fix核算合计
|
2022-09-29 15:34:21 +08:00 |
|
sy
|
a44a48450b
|
薪酬系统-福利台账，线下对比结果列表开发优化v1
|
2022-09-29 15:11:13 +08:00 |
|
sy
|
44e4afbf72
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport
# Conflicts:
# src/com/engine/salary/mapper/InsuranceExportMapper.java
# src/com/engine/salary/mapper/InsuranceExportMapper.xml
# src/com/engine/salary/service/impl/SIAccountServiceImpl.java
|
2022-09-29 11:29:17 +08:00 |
|
sy
|
cec887a214
|
薪酬系统-福利台账，线下对比结果列表开发
|
2022-09-29 11:13:49 +08:00 |
|
钱涛
|
919d08a496
|
修复工资单查询
|
2022-09-29 10:28:46 +08:00 |
|
钱涛
|
92b2774ebf
|
三个数据采集模块删除无效的查询条件
|
2022-09-29 10:03:51 +08:00 |
|
钱涛
|
346445c70d
|
核算合计功能
|
2022-09-28 16:59:51 +08:00 |
|
钱涛
|
dfeb3fc5e4
|
修复薪资档案导出全部
|
2022-09-28 09:26:26 +08:00 |
|
sy
|
1a60f36778
|
薪酬系统-福利台账，线下对比excel数据在入库前进行部分字段加密处理
|
2022-09-27 17:54:24 +08:00 |
|
钱涛
|
23a1396c12
|
核算列表求和
|
2022-09-27 17:43:43 +08:00 |
|
sy
|
78ce712116
|
薪酬系统-福利台账，线下对比excel数据导入功能
|
2022-09-27 17:36:06 +08:00 |
|
钱涛
|
1d635f1423
|
核算列表求和
|
2022-09-27 15:47:13 +08:00 |
|
sy
|
bd3e44442d
|
薪酬系统-福利台账，正常缴纳导出添加工号信息
|
2022-09-27 11:39:57 +08:00 |
|
sy
|
314dc8803c
|
薪酬系统-福利台账，正常缴纳线下对比模板下载功能
|
2022-09-27 10:55:57 +08:00 |
|
钱涛
|
66a39a07a3
|
Merge branch 'feature/order' into develop
# Conflicts:
# src/com/engine/salary/biz/SIAccountBiz.java
|
2022-09-27 10:25:12 +08:00 |
|
钱涛
|
e2db30c816
|
排序
|
2022-09-27 10:19:09 +08:00 |
|
钱涛
|
6e726366ad
|
排序
|
2022-09-26 18:51:17 +08:00 |
|
sy
|
0a900905bd
|
薪酬系统-数据采集-累计专项附加扣除、往期累计情况、考勤引用三处导入模板均增加基本信息的带出
|
2022-09-26 13:46:43 +08:00 |
|
sy
|
e6c2dd502c
|
薪酬系统-数据采集-其他免税扣除导入模板带出数据重复bug修复
|
2022-09-23 16:08:41 +08:00 |
|
钱涛
|
6ee777ebb5
|
fix线下对比翻页问题
|
2022-09-22 15:31:28 +08:00 |
|
钱涛
|
68142b4bbb
|
补缴必填校验
|
2022-09-22 14:25:50 +08:00 |
|
sy
|
f10a320a62
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport
|
2022-09-22 11:15:12 +08:00 |
|
sy
|
49e3b77995
|
薪酬系统-薪资档案-初始化导入模板表头属性优化
|
2022-09-22 10:25:31 +08:00 |
|
Harryxzy
|
26c3f4580e
|
Merge branch 'origin/feature/salarySobCopyHide_xzy' into develop
|
2022-09-22 09:39:22 +08:00 |
|
Harryxzy
|
f2b83bf837
|
xzy-删除薪资账套时，删除对应的薪资项目隐藏信息
|
2022-09-22 09:35:52 +08:00 |
|
Harryxzy
|
d647f9fcc3
|
xzy-复制薪资账套时，复制薪资项目隐藏选项
|
2022-09-22 09:06:53 +08:00 |
|
钱涛
|
63c7577ef8
|
工资单不显示空项功能
|
2022-09-21 19:13:17 +08:00 |
|
钱涛
|
f779b1bb11
|
工资单不显示空项功能
|
2022-09-21 19:08:44 +08:00 |
|
sy
|
0003057021
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport
|
2022-09-21 17:27:22 +08:00 |
|
sy
|
de150e063e
|
薪酬系统导入方式配置-人员筛选方法类调用优化以及调整相关调用该方法的代码
|
2022-09-21 15:49:55 +08:00 |
|
钱涛
|
a1cecd4041
|
申报表日志
|
2022-09-21 14:58:59 +08:00 |
|
sy
|
ad3a2b4f69
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport
|
2022-09-21 14:48:49 +08:00 |
|
sy
|
ad79cb2b3e
|
薪酬系统导入方式配置-数据采集-考勤引用-导入,添加导入人员筛选配置化处理
|
2022-09-21 14:47:26 +08:00 |
|
sy
|
87b2bab9a9
|
薪酬系统导入方式配置-数据采集-往期累计情况-导入,添加导入人员筛选配置化处理
|
2022-09-21 13:57:58 +08:00 |
|
钱涛
|
57e4360030
|
通过员工id导入
|
2022-09-21 13:40:43 +08:00 |
|
sy
|
d49d187506
|
薪酬系统导入方式配置-数据采集-其他免税扣除-导入,添加导入人员筛选配置化处理
|
2022-09-21 13:38:06 +08:00 |
|
钱涛
|
19ea334d57
|
获取员工信息方法
|
2022-09-21 11:52:06 +08:00 |
|
钱涛
|
0045a0dd59
|
福利的重新核算功能异常
|
2022-09-21 11:12:05 +08:00 |
|
sy
|
b06eae55d8
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport
|
2022-09-21 10:47:49 +08:00 |
|
sy
|
78d1bf0554
|
薪酬系统-福利台账导入数据允许出现负数
|
2022-09-21 10:47:07 +08:00 |
|
钱涛
|
c08a660fa0
|
调薪异常
|
2022-09-20 19:07:56 +08:00 |
|
钱涛
|
22b03f8f7e
|
调薪
|
2022-09-20 17:38:21 +08:00 |
|
sy
|
a2b936ba23
|
Merge branch 'feature/checkImport' into develop
|
2022-09-20 16:56:59 +08:00 |
|
sy
|
d64b73290a
|
薪酬系统-薪资档案调薪导入，关闭部分调整数据前后一致校验
|
2022-09-20 16:54:42 +08:00 |
|
sy
|
b8a87d2fd8
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-09-20 16:37:21 +08:00 |
|
sy
|
546e976543
|
薪酬系统-福利台账-补缴导入,新旧数据整合bug修复
|
2022-09-20 16:36:01 +08:00 |
|
Harryxzy
|
1db57838eb
|
Merge branch 'origin/feature/addedemployeeExport' into develop
|
2022-09-20 16:19:22 +08:00 |
|
Harryxzy
|
183e63140a
|
xzy-月度绩效环比增加人员导出功能
|
2022-09-20 16:18:43 +08:00 |
|
sy
|
882b1306b0
|
薪酬系统-薪资档案导入bug修复
|
2022-09-20 15:26:47 +08:00 |
|
sy
|
5b74873a6e
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport
|
2022-09-20 10:34:43 +08:00 |
|
sy
|
7f557903a8
|
薪酬系统-福利台账-补缴导入
|
2022-09-20 10:13:05 +08:00 |
|
钱涛
|
f678aa46d6
|
薪资档案排序
|
2022-09-19 18:21:34 +08:00 |
|
sy
|
7120d80689
|
薪酬系统-福利台账-补缴导入模板开发
|
2022-09-19 17:59:12 +08:00 |
|
Harryxzy
|
44b3c76a8e
|
xzy-同比增加人员
|
2022-09-19 16:05:59 +08:00 |
|
sy
|
ff4884fbb9
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport
|
2022-09-19 15:13:42 +08:00 |
|
sy
|
b0cc2cc19d
|
薪酬系统导入方式配置-人员匹配全局配置的confValue默认设为0
|
2022-09-19 15:11:27 +08:00 |
|
钱涛
|
b464240ff7
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-09-19 13:45:14 +08:00 |
|
钱涛
|
a7bd4a43d6
|
排序规则
|
2022-09-19 13:41:09 +08:00 |
|
sy
|
86ba593d1f
|
薪酬系统导入方式配置-数据采集-累计附加专项扣除-导入,添加导入人员筛选配置化处理
|
2022-09-19 11:01:17 +08:00 |
|
sy
|
280c979536
|
薪酬系统-修改导入信息时对于姓名字段的依赖逻辑
|
2022-09-16 15:03:48 +08:00 |
|
sy
|
4d9b7af975
|
薪酬系统-福利台账导入项添加社保合计、公积金合计、其他福利合计、合计四个字段可以选择，并增加这四个字段的更新逻辑
|
2022-09-16 14:21:15 +08:00 |
|
sy
|
478b9a3d16
|
薪酬系统导入方式配置-薪资核算-导入,添加导入人员筛选配置化处理
|
2022-09-16 13:23:37 +08:00 |
|
sy
|
8492c2097b
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport
|
2022-09-16 09:47:15 +08:00 |
|
sy
|
a3ec7caf44
|
薪酬系统导入方式配置-薪资档案调薪/初始化-导入,添加导入人员筛选配置化处理
|
2022-09-15 17:54:59 +08:00 |
|
sy
|
c13ca103f3
|
薪酬系统导入方式配置-社保福利台账核算导入,添加导入人员筛选配置化处理
|
2022-09-15 16:14:34 +08:00 |
|
sy
|
3c007f8e0b
|
薪酬系统导入方式配置-社保福利档案导入,添加导入人员筛选配置化处理
|
2022-09-15 15:31:34 +08:00 |
|
钱涛
|
d238502b2c
|
1、修复线下对比
2、系统配置
|
2022-09-15 15:15:34 +08:00 |
|
sy
|
d491288296
|
薪酬系统导入方式配置-各导入模板添加工号字段
|
2022-09-15 10:43:34 +08:00 |
|
sy
|
a6028c51e7
|
福利核算干预数据导入功能优化v2-针对单个保险种类的数值未填值时，默认取数据库中原有数值
|
2022-09-14 14:36:05 +08:00 |
|
钱涛
|
198075209e
|
1、核算、合并计税使用税款所属期作为依据
2、核算列表分页
|
2022-09-13 16:03:55 +08:00 |
|
钱涛
|
32f5f25341
|
防止未归档时合并计税异常
|
2022-09-08 16:26:24 +08:00 |
|
sy
|
8c7a5d477a
|
福利核算干预数据导入功能优化v1
|
2022-09-08 09:43:46 +08:00 |
|
钱涛
|
572c4cb9f1
|
调薪前置校验
|
2022-09-07 16:12:43 +08:00 |
|
sy
|
1b34914e13
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport
|
2022-09-07 14:57:46 +08:00 |
|
sy
|
8f9a335dd0
|
福利核算干预数据导入预览
|
2022-09-07 14:57:07 +08:00 |
|
钱涛
|
06f6dcf8f2
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-09-07 09:46:02 +08:00 |
|
钱涛
|
8ff4e9e231
|
停薪操作
|
2022-09-07 09:45:37 +08:00 |
|
sy
|
d4886c0d46
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport
|
2022-09-06 17:14:31 +08:00 |
|
sy
|
5a6df5a257
|
福利核算结果干预功能，福利核算项列表接口、福利核算导入模板下载接口、福利核算干预数据导入接口
|
2022-09-06 17:13:33 +08:00 |
|
钱涛
|
c84836d490
|
修复调薪导致起始缴纳日期消失
|
2022-09-06 17:12:56 +08:00 |
|
sy
|
3445642489
|
优化薪资核算导入相关的唯一匹配逻辑v3
|
2022-09-02 15:40:05 +08:00 |
|
sy
|
85566329d9
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport
|
2022-09-02 12:47:36 +08:00 |
|
sy
|
43bf76b036
|
Merge remote-tracking branch 'remotes/origin/develop' into hotfix/checkImport0902
|
2022-09-02 12:43:53 +08:00 |
|
sy
|
a1f310775d
|
优化薪资核算导入相关的唯一匹配逻辑v3
|
2022-09-02 12:41:22 +08:00 |