From 675af262e4e511c9a240d9c1fa3332d1dc8d0c42 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 13 一月 2026 13:15:37 +0800
Subject: [PATCH] 1.工时管理：辅助工时编辑后录入人姓名变成编辑人问题修复 2.外购下单：标签打印功能调整 3.人员：培训计划导入导出添加【培训大类】字段 4.业务管理：报检新增【物料属性】字段选择，其余页面添加【物料属性】查询条件以及数据回显
---
performance-server/src/main/java/com/ruoyi/performance/service/impl/AuxiliaryOutputWorkingHoursTemporaryServiceImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/performance-server/src/main/java/com/ruoyi/performance/service/impl/AuxiliaryOutputWorkingHoursTemporaryServiceImpl.java b/performance-server/src/main/java/com/ruoyi/performance/service/impl/AuxiliaryOutputWorkingHoursTemporaryServiceImpl.java
index 8ae2353..776e934 100644
--- a/performance-server/src/main/java/com/ruoyi/performance/service/impl/AuxiliaryOutputWorkingHoursTemporaryServiceImpl.java
+++ b/performance-server/src/main/java/com/ruoyi/performance/service/impl/AuxiliaryOutputWorkingHoursTemporaryServiceImpl.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.QueryWrappers;
+import com.ruoyi.performance.dto.AuxiliaryOutputWorkingHoursTemporaryDto;
import com.ruoyi.performance.mapper.AuxiliaryOutputWorkingHoursTemporaryMapper;
import com.ruoyi.performance.pojo.AuxiliaryOutputWorkingHoursTemporary;
import com.ruoyi.performance.service.AuxiliaryOutputWorkingHoursTemporaryService;
@@ -25,7 +26,7 @@
* @return
*/
@Override
- public IPage<AuxiliaryOutputWorkingHoursTemporary> getWorkingHoursByOrderId(Page page, AuxiliaryOutputWorkingHoursTemporary workingHoursTemporary) {
+ public IPage<AuxiliaryOutputWorkingHoursTemporaryDto> getWorkingHoursByOrderId(Page page, AuxiliaryOutputWorkingHoursTemporaryDto workingHoursTemporary) {
return baseMapper.getWorkingHoursByOrderId(page, QueryWrappers.queryWrappers(workingHoursTemporary));
}
}
--
Gitblit v1.9.3