From 5327d8da2fbeda44417a09beba29e897cc7d8951 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 02 八月 2024 14:08:10 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/service/impl/WorkAssignmentServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/service/impl/WorkAssignmentServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/service/impl/WorkAssignmentServiceImpl.java
index e80cce6..1bef12b 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/service/impl/WorkAssignmentServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/service/impl/WorkAssignmentServiceImpl.java
@@ -7,6 +7,8 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
+import java.util.List;
+
/**
* <p>
* 鏈嶅姟瀹炵幇绫�
@@ -25,11 +27,11 @@
* @return
*/
@Override
- public WorkAssignment selectWorkAssignment(int line, String workingProcedure){
+ public List<WorkAssignment> selectWorkAssignment(String line, String workingProcedure){
LambdaQueryWrapper<WorkAssignment> workAssignmentSelectWrapper=new LambdaQueryWrapper<>();
workAssignmentSelectWrapper
.eq(WorkAssignment::getLine,line)
.eq(WorkAssignment::getWorkProcesses,workingProcedure);
- return baseMapper.selectOne(workAssignmentSelectWrapper);
+ return baseMapper.selectList(workAssignmentSelectWrapper);
}
}
--
Gitblit v1.8.0