 钱涛
|
a51f20b798
|
Merge branch 'release/2.16.1.2410.01' into feature/权限
|
2024-10-28 13:48:52 +08:00 |
|
钱涛
|
bfbd9e4b40
|
修复人员报表排序
|
2024-10-28 11:35:57 +08:00 |
|
钱涛
|
5271d2516a
|
Merge branch 'release/2.16.1.2410.01' into feature/权限
# Conflicts:
# src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
# src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
|
2024-10-22 09:27:11 +08:00 |
|
钱涛
|
be2d6b693a
|
单元格锁定
|
2024-10-17 18:27:37 +08:00 |
|
钱涛
|
0d100d9f53
|
修复报表分部条件过滤不生效
|
2024-10-17 10:20:58 +08:00 |
|
钱涛
|
f487e060a2
|
Merge branch 'feature/快照条件搜索报表' into feature/权限
# Conflicts:
# src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
|
2024-10-08 16:20:32 +08:00 |
|
钱涛
|
b4050e4ee8
|
报表快照搜索
|
2024-09-29 16:58:41 +08:00 |
|
钱涛
|
800f03427d
|
社保档案业务线
|
2024-09-29 14:34:44 +08:00 |
|
钱涛
|
7f233145d4
|
fix刷新核算人员功能冲突
|
2024-09-29 11:07:48 +08:00 |
|
钱涛
|
d54dd4e237
|
fix刷新核算人员功能冲突
|
2024-09-29 10:52:04 +08:00 |
|
钱涛
|
541546f5c8
|
Merge branch 'release/2.15.2.2409.01' into feature/权限
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
|
2024-09-29 10:46:04 +08:00 |
|
钱涛
|
93d2980ad8
|
刷新核算人员功能
|
2024-09-29 10:37:38 +08:00 |
|
钱涛
|
cc6deee04c
|
报表模块分权
|
2024-09-23 14:35:51 +08:00 |
|
钱涛
|
ee535fc2bf
|
1、业务线-新建累计专项附加扣除
2、业务线-报表
|
2024-09-19 16:46:36 +08:00 |
|
钱涛
|
9edf23fa37
|
Merge branch 'release/2.15.2.2409.01' into feature/权限
|
2024-09-18 16:13:24 +08:00 |
Harryxzy
|
c212a2782f
|
薪酬统计报表增加岗位筛选
|
2024-09-13 14:54:52 +08:00 |
|
钱涛
|
920b0e31c4
|
账套扣缴义务人聚合查询
|
2024-09-05 10:26:52 +08:00 |
|
钱涛
|
ecfa6a4604
|
跨扣缴义务人核算
|
2024-09-02 17:36:41 +08:00 |
|
钱涛
|
7250ed3520
|
修复组织信息快照，主动添加或者sql添加人员丢失
|
2024-08-15 17:03:17 +08:00 |
|
Harryxzy
|
a05fb6fcf0
|
报表义务人、账套分权
|
2024-08-13 13:45:24 +08:00 |
|
Harryxzy
|
bdd27bcfc6
|
核算时编辑人员组织信息
|
2024-07-25 14:04:14 +08:00 |
|
钱涛
|
ea07fe1a59
|
处理sqlserver 2100 个参数
|
2024-06-27 10:38:30 +08:00 |
|
钱涛
|
81c768b7b9
|
人员信息快照
|
2024-06-18 15:28:31 +08:00 |
|
Harryxzy
|
91b8809c03
|
修复薪资核算搜索，合并计税bug
|
2024-06-05 13:43:49 +08:00 |
|
钱涛
|
2c79afa65e
|
锁定人员
|
2024-05-28 17:29:18 +08:00 |
|
Harryxzy
|
faabf1dad3
|
薪酬报表-人事状态
|
2024-03-25 17:29:40 +08:00 |
|
钱涛
|
836947725f
|
切换了elog位置
|
2024-03-12 14:34:44 +08:00 |
|
钱涛
|
1c62be09d1
|
Merge branch 'feature/操作日志组件' into release/2.11.1.2402.01
|
2024-03-05 13:58:50 +08:00 |
|
钱涛
|
a1ab3c79f4
|
添加账套筛选条件
|
2024-02-28 14:43:27 +08:00 |
sy
|
6efbd9deb0
|
薪酬系统，将部分新增代码中labelId入参统一置为0，方便后期多语言逻辑适配时定位
|
2024-02-04 15:10:35 +08:00 |
|
sy
|
f4ecb19ef2
|
Merge branch 'release/2.10.1.2401.01' into feature/操作日志组件
|
2024-02-01 10:21:47 +08:00 |
|
钱涛
|
65f972846f
|
处理id超过2100
|
2024-01-30 10:26:44 +08:00 |
|
钱涛
|
a8bfe83030
|
操作日志
|
2024-01-30 09:58:13 +08:00 |
|
钱涛
|
5bf00a98aa
|
记录核算日志
|
2024-01-24 09:50:58 +08:00 |
|
钱涛
|
b7435554e8
|
操作日志前端接口
|
2023-12-26 16:12:44 +08:00 |
|
钱涛
|
3ab8840ccd
|
增加搜索条件颗粒度
|
2023-11-24 16:49:54 +08:00 |
|
钱涛
|
2c12b10171
|
1、减少人员bug
2、档案项目输入bug
|
2023-11-13 17:12:25 +08:00 |
|
钱涛
|
b08d3bdd2c
|
修复报表多部门查询
|
2023-10-25 11:19:47 +08:00 |
|
钱涛
|
a19f86c624
|
一键累计bug修复
|
2023-10-20 10:29:46 +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 |
|
钱涛
|
ec67c89e7d
|
报表排除掉未归档的数据
|
2023-06-16 13:49:40 +08:00 |
|
钱涛
|
433ce6cf91
|
暂存
|
2023-04-26 16:04:33 +08:00 |
|
钱涛
|
14fca43e18
|
暂存
|
2023-04-26 15:17:08 +08:00 |
|
钱涛
|
ce0b8ce186
|
暂存
|
2023-04-10 12:43:48 +08:00 |
|
钱涛
|
739904d48f
|
暂存
|
2023-04-10 09:47:33 +08:00 |
|
钱涛
|
ace15ca7a1
|
非系统人员
|
2023-03-15 18:03:46 +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
|
b58e71989d
|
feat: 统一修改到内存分页
|
2022-12-12 10:25:55 +08:00 |
|
Harryxzy
|
3ff3fd8e44
|
薪资回算-薪资核算部分（剩余核算归档）
|
2022-12-02 17:35:14 +08:00 |
|
钱涛
|
f1f8ae53af
|
档案项目默认生效时间取起始缴纳日期
|
2022-11-03 19:32:51 +08:00 |