Commit Graph

32 Commits

Author SHA1 Message Date
钱涛 37ff12bf6a 报表 2025-11-18 09:34:24 +08:00
钱涛 7de1062387 Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2503.01 2025-03-19 10:09:28 +08:00
钱涛 c8f281613b 薪资明细增加人员浏览按钮多选搜索 2025-03-18 17:45:00 +08:00
钱涛 d672dd8d61 Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2503.01 2025-03-17 11:05:52 +08:00
钱涛 a29f8b3da9 薪资明细模板导出根据项目类型设置单元格格式 2025-03-17 11:03:42 +08:00
钱涛 35aff0431e Merge branch 'release/2.18.2.2412.02' into feature/数据推送
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
#	src/com/engine/salary/service/impl/SalarySendServiceImpl.java
2024-12-27 09:24:22 +08:00
Harryxzy d52e13f09e 薪资明细报表增加证件号码 2024-12-09 14:34:57 +08:00
钱涛 583f3fa85a Merge branch 'release/2.17.1.2411.01' into feature/权限
# Conflicts:
#	src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
#	src/com/engine/salary/service/impl/SalarySobServiceImpl.java
#	src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
2024-12-03 12:14:25 +08:00
钱涛 b652dbbc8b 处理报表空指针 2024-11-26 18:14:41 +08:00
钱涛 de5a00f588 修改默认列设置功能 2024-11-25 16:04:19 +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
钱涛 553764da86 模板sql 2024-11-11 10:51:59 +08:00
钱涛 e537ffaa5a 薪资明细显示模板 2024-11-07 17:45:17 +08:00
钱涛 4cd0fbfe30 报表模板 2024-11-04 19:49:46 +08:00
钱涛 0111822a47 Merge branch 'release/2.15.2.2409.01' into feature/权限
# Conflicts:
#	src/com/engine/salary/constant/SalaryDefaultTenantConstant.java
#	src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
2024-10-12 15:16:38 +08:00
钱涛 779d519a6f Merge branch 'release/2.15.2.2409.01' into feature/自定义列全局设置 2024-10-12 11:11:44 +08:00
钱涛 265ca2a54e 默认展示所有薪资明细列 2024-10-11 18:02:52 +08:00
钱涛 b6c7a7f2bd 自定义列全局设置 2024-10-11 17:04:13 +08:00
钱涛 64ac30c05f 自定义列全局设置 2024-10-11 15:34:17 +08:00
钱涛 2ba4bb72db 薪资明细增加入职日期 2024-10-09 18:10:38 +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
钱涛 61dee5d3a1 薪资明细排序 2024-10-08 15:48:33 +08:00
钱涛 ff5419f2bb 薪资明细排序 2024-10-08 15:45:12 +08:00
钱涛 ff44ddd8b1 员工明细排序 2024-10-08 14:19:02 +08:00
钱涛 ee535fc2bf 1、业务线-新建累计专项附加扣除
2、业务线-报表
2024-09-19 16:46:36 +08:00
Harryxzy 671350654a fix薪资明细报表显示列定制 2024-07-22 15:29:34 +08:00
Harryxzy 3c8d1dc6ee 薪资明细表 2024-03-27 09:35:47 +08:00
Harryxzy e3c528c649 薪资明细表 2024-03-25 16:08:34 +08:00
钱涛 89ecf0984d fix外部人员 2023-07-12 09:45:00 +08:00
钱涛 fef828ef1d 人员明细列表展示账套和核算记录信息、自定义列功能 2023-05-26 11:17:25 +08:00
钱涛 399a615be6 人员明细 2023-05-25 13:51:27 +08:00
钱涛 797d5095eb 适配if 2023-05-09 10:43:51 +08:00