Harryxzy
|
ad6a571310
|
自定义工资项目展示名fix
|
2023-07-21 11:08:54 +08:00 |
钱涛
|
0119161173
|
修复冲突
|
2023-07-21 10:46:55 +08:00 |
Harryxzy
|
84d9184959
|
自定义工资项目展示名
|
2023-07-20 15:37:20 +08:00 |
Harryxzy
|
ce32c6571c
|
系统薪资项目重名
|
2023-07-20 11:14:58 +08:00 |
Harryxzy
|
b95663ada8
|
自定义工资项目展示名
|
2023-07-20 10:42:16 +08:00 |
sy
|
c7fe4fee23
|
Merge branches 'feature/230701-社保福利-核算记录的校验' and 'feature/230701-薪资核算-导出功能可选择字段导出' into release/2.9.2.2307.02
|
2023-07-20 10:19:40 +08:00 |
钱涛
|
01b02531ce
|
Merge branch 'feature/外部人员' into release/2.9.2.2307.02
# Conflicts:
# src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
# src/com/engine/salary/sys/service/SalarySysConfService.java
# src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
# src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java
|
2023-07-20 10:08:05 +08:00 |
Harryxzy
|
8e6bd24d0d
|
自定义工资项目展示名
|
2023-07-19 16:14:25 +08:00 |
Harryxzy
|
0a4c19fb36
|
Merge branch 'feature/230702-薪资项目-核算时隐藏' into release/2.9.2.2307.02
|
2023-07-19 11:11:46 +08:00 |
Harryxzy
|
bbb8417008
|
自定义工资项目展示名temp
|
2023-07-18 16:28:29 +08:00 |
Harryxzy
|
1ea80b8fe9
|
工资单反馈
|
2023-07-17 15:01:14 +08:00 |
Harryxzy
|
88892f1aac
|
工资单反馈fixBug
|
2023-07-17 12:36:20 +08:00 |
Harryxzy
|
8221d4da69
|
工资单反馈
|
2023-07-17 11:27:40 +08:00 |
sy
|
b0e8da2ad4
|
薪酬系统-福利台账,列表排序规则账单月份逆序、更新时间逆序
|
2023-07-14 17:32:16 +08:00 |
Harryxzy
|
faf9636a0d
|
薪资项目-核算时隐藏 temp
|
2023-07-14 11:34:53 +08:00 |
Harryxzy
|
6279f0d8c9
|
工资单反馈
|
2023-07-14 09:55:36 +08:00 |
Harryxzy
|
30d61e352f
|
工资单确认反馈
|
2023-07-13 11:50: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 |
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 |
钱涛
|
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 |
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
|
b705161492
|
薪酬系统-薪资核算、薪资档案、福利档案,高级搜索功能问题修复
|
2023-07-10 14:33:43 +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
|
fa28db9c79
|
薪酬系统-薪资核算,高级搜索和导出带入筛选条件未生效问题修复
|
2023-07-07 10:15:23 +08:00 |
Harryxzy
|
508e324dac
|
工资单定时发送 添加 发放周期
|
2023-07-05 10:36:02 +08:00 |
Harryxzy
|
c78839d8c0
|
工资单定时发送 添加 发放周期
|
2023-07-04 18:03:57 +08:00 |
Harryxzy
|
8dc3883168
|
工资单定时发送
|
2023-07-03 17:46:11 +08:00 |
Harryxzy
|
9842784297
|
工资单定时发送 - 模板保存
|
2023-06-30 15:58:55 +08:00 |
Harryxzy
|
2735661b4a
|
删除薪资档案
|
2023-06-29 10:35:55 +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 |
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
|
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
|
a43123efc0
|
Merge branch 'fix/DBType修改' into release/2.8.4.2306.02
|
2023-06-26 13:26:27 +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
|
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 |
sy
|
3657abe41b
|
薪酬系统-pg数据库适配,福利档案状态变换异常问题修复
|
2023-06-25 17:56:18 +08:00 |
sy
|
1bb9b939f0
|
薪酬系统-pg数据库适配,薪资档案待定薪导入问题修复
|
2023-06-25 13:50:20 +08:00 |
Harryxzy
|
e7edb9040c
|
修复无分类
|
2023-06-20 17:27:18 +08:00 |
Harryxzy
|
0e601e3967
|
修改DBType的写法
|
2023-06-19 13:59:24 +08:00 |
Harryxzy
|
d9f57ac258
|
修复回算后无法发放第二次核算的工资单
|
2023-06-16 16:41:49 +08:00 |
钱涛
|
8612f0e5b2
|
Merge branch 'release/2.8.4.2306.02' into feature/短信验证码
|
2023-06-16 14:54:24 +08:00 |
Harryxzy
|
512510c623
|
考勤引用校验能够否删除
|
2023-06-16 11:49:23 +08:00 |
sy
|
c87a754888
|
薪酬系统,薪资账套、个税扣缴义务人、薪资项目列表按照创建时间降序排列
|
2023-06-15 10:23:03 +08:00 |
钱涛
|
57798a8e3e
|
短信验证码功能
|
2023-06-14 15:51:26 +08:00 |
Harryxzy
|
c37750b538
|
撤回个税申报
|
2023-06-12 10:40:01 +08:00 |
Harryxzy
|
76977331af
|
暂存
|
2023-06-09 17:57:17 +08:00 |
Harryxzy
|
d013d14e31
|
系统薪资项目列表显示改造- 数据库适配
|
2023-06-08 11:38:53 +08:00 |
Harryxzy
|
dbb2a97be4
|
系统薪资项目列表显示改造
|
2023-06-08 11:10:40 +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 |
钱涛
|
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 |
钱涛
|
4358dc20a5
|
Merge branch 'release/2.8.3.2306.01' into feature/短信邮件
|
2023-06-06 14:24:23 +08:00 |
Harryxzy
|
0d3a48e7ea
|
个税扣缴义务人排序
|
2023-06-05 15:14:25 +08:00 |
钱涛
|
91e3b335dd
|
工资单通道
|
2023-06-05 13:35:17 +08:00 |
Harryxzy
|
30e2c489ea
|
Merge branch 'feature/salalryItemAndFieldSort' into release/2.8.3.2306.01
|
2023-06-05 09:52:57 +08:00 |
Harryxzy
|
74c5b4f19f
|
薪资项目 和 字段管理的排序
|
2023-06-01 17:52:31 +08:00 |
sy
|
007328476a
|
薪酬系统-薪资核算,薪资核算列表工号查询逻辑优化
|
2023-06-01 11:17:06 +08:00 |
sy
|
fb03cf98a7
|
薪酬系统,福利台账、薪资档案、薪资核算增加工号查询
|
2023-05-31 11:49:40 +08:00 |
Harryxzy
|
601b90d188
|
薪资档案薪资项目排序
|
2023-05-31 09:55:24 +08:00 |
钱涛
|
ec90e31695
|
Merge branch 'release/2.8.3.2306.01' into feature/短信邮件
|
2023-05-24 16:20:39 +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
|
a3ee91db15
|
回算后不允许删除薪资核算记录
|
2023-05-16 15:05:02 +08:00 |
Harryxzy
|
4ff15ca651
|
薪资核算结果编辑导入 记录
|
2023-05-15 10:28:17 +08:00 |
钱涛
|
2941b5f304
|
删除报表同时删除项目
|
2023-05-09 17:37:05 +08:00 |
钱涛
|
8228fbf21c
|
短信邮件
|
2023-05-08 09:27:20 +08:00 |
Harryxzy
|
b905390623
|
修复社保福利台账,根据核算创建人过滤
|
2023-05-06 09:50:48 +08:00 |
钱涛
|
ae719ad65b
|
修复人员过多时bug
|
2023-05-04 11:56:34 +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 |
钱涛
|
d36cfe31b3
|
报表暂存
|
2023-04-27 16:05:03 +08:00 |
钱涛
|
14fca43e18
|
暂存
|
2023-04-26 15:17:08 +08:00 |
钱涛
|
24dfa57850
|
报表
|
2023-04-24 14:09:27 +08:00 |
钱涛
|
c94d5169f0
|
维护工具
|
2023-04-24 09:19:18 +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
|
31235096bb
|
恢复往期累计数据
|
2023-04-23 17:37:06 +08:00 |
钱涛
|
36863c3695
|
报表
|
2023-04-23 10:14:32 +08:00 |
钱涛
|
d2b304e690
|
全量数据
|
2023-04-20 18:04:18 +08:00 |
钱涛
|
135530d3b7
|
全量数据
|
2023-04-20 17:55:37 +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 |
钱涛
|
1cbb889748
|
报表删除
|
2023-04-11 18:43:33 +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 |
钱涛
|
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
|
0ef8a2ae12
|
Merge branch 'fix/salaryItemHideDuplicateItem_0407' into release/2.7.3.2304.01
|
2023-04-11 10:16:28 +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 |
钱涛
|
b30a58c1d9
|
报表功能
|
2023-04-07 14:38:38 +08:00 |
sy
|
add7051759
|
薪酬系统, 适配金仓-个税申报单逻辑优化、薪资部分发放逻辑优化、删除initserviceimpl文件
|
2023-04-04 16:28:15 +08:00 |
钱涛
|
44fe9203ab
|
个人养老金
|
2023-04-04 14:21:25 +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
|
30660ce04b
|
工资单模板,无法修改薪资项为0时不显示
|
2023-03-30 13:33:52 +08:00 |
Harryxzy
|
ef3260085f
|
修复重新核算,往期累计删多数据
|
2023-03-28 14:18:01 +08:00 |
Harryxzy
|
2dc40a7b91
|
取消待办
|
2023-03-28 10:10:54 +08:00 |
钱涛
|
f79569fe4f
|
解决工资单人名缺失
|
2023-03-16 17:19:02 +08:00 |
钱涛
|
8430397d03
|
外部人员终极版
|
2023-03-16 16:10:29 +08:00 |
钱涛
|
62d124efb1
|
外部人员终极版
|
2023-03-15 22:48:01 +08:00 |
钱涛
|
ace15ca7a1
|
非系统人员
|
2023-03-15 18:03: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 |
钱涛
|
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 |
钱涛
|
a61b7ac7bc
|
外部人员
|
2023-03-13 16:04:19 +08:00 |
Harryxzy
|
32b1a2db48
|
employeeService查询外部
|
2023-03-13 15:53:56 +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 |
钱涛
|
487dd9f972
|
非系统人员档案自动化
|
2023-03-08 16:36:47 +08:00 |
钱涛
|
2c13c138a6
|
校验每次只能申报一个扣缴义务人
|
2023-03-07 17:44:21 +08:00 |
钱涛
|
a423790a35
|
获取人员信息
|
2023-03-06 17:57:20 +08:00 |
钱涛
|
a5596d503f
|
外部人员基础信息
|
2023-03-03 16:57:52 +08:00 |
钱涛
|
ca20ed8ca2
|
Merge branch 'release/2.6.3.2303.01' into feature/外部人员
|
2023-03-02 19:48:40 +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
|
83d5a882b9
|
Merge branch 'fix/V3_addUpSituationShowAsMonth_0309' into release/2.6.3.2303.01
|
2023-03-02 17:18:39 +08:00 |
钱涛
|
6de22b142d
|
1、工资单模板
2、一键累计
|
2023-03-02 17:11:42 +08:00 |
Harryxzy
|
50d6cc4d9a
|
往期累计情况,按照税款所属期月份进行展示
|
2023-03-02 14:04:12 +08:00 |
Harryxzy
|
56399c127b
|
社保福利方案自定义福利列表改造
|
2023-03-02 10:46:53 +08:00 |
钱涛
|
14bee7f6d5
|
修复未分类无法保存
|
2023-03-01 09:58:55 +08:00 |
钱涛
|
1568b1e03d
|
外部人员基础类
|
2023-03-01 09:05:03 +08:00 |
钱涛
|
a8cb586358
|
公式删除校验
|
2023-02-23 15:48:18 +08:00 |
钱涛
|
1c2028f551
|
公式删除优化
|
2023-02-23 14:52:24 +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 |
钱涛
|
dc24b03efd
|
薪资项目删除校验
|
2023-02-17 15:58:33 +08:00 |
钱涛
|
1d0a02554e
|
公式
|
2023-02-16 14:53:03 +08:00 |
sy
|
39cb3b0df1
|
薪酬系统-福利档案,方案明细中添加福利项上下限数据
|
2023-02-16 13:14:17 +08:00 |
钱涛
|
1bdc304ddf
|
清除公式
|
2023-02-16 09:16:00 +08:00 |
钱涛
|
8b594c1882
|
自发起调薪流程
|
2023-02-13 14:53:35 +08:00 |
钱涛
|
6792b4c5aa
|
Merge branch 'feature/通过userid查询工资单详情'
|
2023-02-10 16:45:45 +08:00 |