 钱涛
|
c0dbce4786
|
业务线分权
|
2025-02-13 11:27:13 +08:00 |
|
钱涛
|
db99fc12e2
|
专项操作按钮
|
2024-11-15 15:50:32 +08:00 |
|
钱涛
|
5a520a367a
|
Merge branch 'release/2.17.1.2411.01' into feature/权限
# Conflicts:
# resource/wiki/常用查询.md
# src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java
# src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
# src/com/engine/salary/entity/salaryarchive/dto/SalaryArchiveListDTO.java
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
|
2024-11-13 11:10:27 +08:00 |
|
钱涛
|
fb8595ac00
|
次账号规则
|
2024-10-16 18:20:11 +08:00 |
|
钱涛
|
070a2a75ac
|
Merge branch 'release/2.15.2.2409.01' into feature/次账号
|
2024-10-16 17:19:43 +08:00 |
|
钱涛
|
53ce7c7b43
|
核算人员显示次账号
|
2024-10-16 15:25:48 +08:00 |
|
钱涛
|
8e90361e82
|
Merge branch 'release/2.15.2.2409.01' into feature/权限
# Conflicts:
# src/com/engine/salary/service/VariableArchiveService.java
|
2024-10-16 10:04:24 +08:00 |
|
钱涛
|
d3050117d1
|
支持次账号
|
2024-10-15 14:24:37 +08:00 |
Harryxzy
|
4c551dae87
|
Merge branch 'feature/240801-浮动薪资' into release/2.15.2.2409.01
|
2024-10-14 15:06:52 +08:00 |
|
Harryxzy
|
49cbb7a7cc
|
浮动薪酬
|
2024-10-14 10:38:30 +08:00 |
|
钱涛
|
e512a2868a
|
Merge branch 'release/2.15.2.2409.01' into feature/权限
|
2024-09-27 11:13:24 +08:00 |
|
钱涛
|
0852094cb1
|
修改浮动数据扣缴义务人id类型
|
2024-09-27 11:13:00 +08:00 |
|
钱涛
|
619af1a76a
|
其他免税扣除模块
|
2024-09-20 16:45:35 +08:00 |
|
钱涛
|
6e7ccb2339
|
浮动薪资档案分权
|
2024-09-18 18:19:58 +08:00 |
|
钱涛
|
9edf23fa37
|
Merge branch 'release/2.15.2.2409.01' into feature/权限
|
2024-09-18 16:13:24 +08:00 |
|
钱涛
|
09042321d1
|
1、支持获取班次信息
2、导出考勤功能优化，excel列和列表显示保持一致
|
2024-09-18 15:59:36 +08:00 |
|
钱涛
|
96ced6e934
|
Merge branch 'release/2.15.2.2409.01' into feature/权限
|
2024-09-13 17:32:58 +08:00 |
|
钱涛
|
de0728665b
|
导入往期累计
|
2024-09-13 17:32:15 +08:00 |
|
钱涛
|
c7659e0717
|
数据采集权限
|
2024-09-11 10:28:20 +08:00 |
|
钱涛
|
a0fb036bce
|
业务线配置
|
2024-09-09 19:10:40 +08:00 |
|
钱涛
|
e2b2b9071f
|
Merge remote-tracking branch 'origin/feature/240801-浮动薪资' into feature/240801-浮动薪资
|
2024-08-16 14:04:31 +08:00 |
|
钱涛
|
659560550a
|
Merge branch 'release/2.15.1.2407.01' into feature/240801-浮动薪资
|
2024-08-16 13:18:08 +08:00 |
|
Harryxzy
|
2ee605df44
|
浮动薪酬优化
|
2024-08-15 13:56:41 +08:00 |
|
Harryxzy
|
5055a4801a
|
浮动薪酬增加义务人
|
2024-08-12 16:36:27 +08:00 |
|
Harryxzy
|
75fb15928a
|
浮动薪酬
|
2024-08-09 10:21:40 +08:00 |
|
Harryxzy
|
dd18cf5191
|
考勤引用多个账套
|
2024-08-06 16:54:19 +08:00 |
|
钱涛
|
7952e93d01
|
考勤引用显示证件号码
|
2024-05-29 16:53:51 +08:00 |
|
钱涛
|
6d4265acf1
|
职称显示为中午
|
2024-05-08 15:31:36 +08:00 |
|
Harryxzy
|
4b474f864f
|
累计专项附加扣除一键累计，能根据义务人进行累计
|
2024-04-30 14:43:37 +08:00 |
|
钱涛
|
0a7334ddef
|
考勤导入，多语言
|
2024-03-14 18:16:20 +08:00 |
|
钱涛
|
29e81e03c2
|
优化公式不显示未启用的考勤字段
|
2024-03-14 16:08:16 +08:00 |
|
钱涛
|
417c9f703d
|
下载模板时带出数据
|
2024-03-14 15:28:14 +08:00 |
|
钱涛
|
836947725f
|
切换了elog位置
|
2024-03-12 14:34:44 +08:00 |
|
钱涛
|
4b823ccca7
|
国际化注解
|
2024-03-11 16:50:47 +08:00 |
|
Harryxzy
|
093cb34f77
|
操作日志fix some bugs
|
2024-02-23 15:11:56 +08:00 |
|
Harryxzy
|
dee20149bb
|
日志
|
2024-02-21 18:19:02 +08:00 |
|
钱涛
|
6a8c9aebe3
|
修复考勤引用数据失败bug
|
2024-01-29 10:05:30 +08:00 |
|
钱涛
|
e1a4e275ff
|
短信模板设置接口
|
2023-11-16 15:41:29 +08:00 |
|
钱涛
|
0634a139b9
|
显示字符统计规则
|
2023-11-02 18:41:58 +08:00 |
|
钱涛
|
3d8919da25
|
账套增加证件号码字段
|
2023-10-31 15:08:43 +08:00 |
|
钱涛
|
0dd9040408
|
一键累计bug修复
|
2023-10-19 17:35:33 +08:00 |
|
钱涛
|
8166e76081
|
账套增加状态字段
|
2023-10-08 13:38:37 +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
|
512510c623
|
考勤引用校验能够否删除
|
2023-06-16 11:49:23 +08:00 |
|
钱涛
|
399a615be6
|
人员明细
|
2023-05-25 13:51:27 +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 |
|
钱涛
|
41e95ceadf
|
字段管理不显示id
|
2023-05-05 15:32:55 +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 |
|
钱涛
|
40cd70e2a3
|
Merge branch 'release/2.7.4.2304.02' into feature/公式
|
2023-04-25 17:39:33 +08:00 |