sy
|
a8f9134418
|
Merge remote-tracking branch 'remotes/origin/release/2.9.2.2307.02' into feature/230702-非系统人员导入功能
|
2023-07-31 16:46:10 +08:00 |
|
sy
|
007d6df3cd
|
薪酬系统-非系统人员管理，非系统人员导入
|
2023-07-28 10:12:59 +08:00 |
Harryxzy
|
ed99e186e1
|
fix代码合并bug
|
2023-07-26 17:56:25 +08:00 |
|
Harryxzy
|
36f6a457cf
|
fix代码合并bug
|
2023-07-26 17:53:40 +08:00 |
|
Harryxzy
|
d5d84967c4
|
Merge branch 'feature/230701-工资单反馈' into release/2.9.2.2307.02
|
2023-07-26 17:47:53 +08:00 |
|
Harryxzy
|
f5b70764d3
|
fix
|
2023-07-26 17:44:41 +08:00 |
 钱涛
|
0119161173
|
修复冲突
|
2023-07-21 10:46:55 +08:00 |
|
Harryxzy
|
ce32c6571c
|
系统薪资项目重名
|
2023-07-20 11:14:58 +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
|
0a4c19fb36
|
Merge branch 'feature/230702-薪资项目-核算时隐藏' into release/2.9.2.2307.02
|
2023-07-19 11:11:46 +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 |