From c721f649b527e31aac9257a14502c105e6a89cfe Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 11 八月 2025 15:52:29 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 2 +-
src/main/resources/mapper/WrkMastStaMapper.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index d235049..ee2cdbd 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -3540,7 +3540,7 @@
}
}
if (command.getTaskNo2() > 0){
- List<WrkMastSta> wrkMastSta1 = wrkMastStaService.selectBywrkNoHistoricalTasks2(command.getRgvNo(),command.getTaskNo2());
+ List<WrkMastSta> wrkMastSta1 = wrkMastStaService.selectBywrkNoHistoricalTasks(command.getRgvNo(),command.getTaskNo2());
if (!Cools.isEmpty(wrkMastSta1)){
for (WrkMastSta wrkMastSta :wrkMastSta1){
wrkMastStaService.deleteById(wrkMastSta);
diff --git a/src/main/resources/mapper/WrkMastStaMapper.xml b/src/main/resources/mapper/WrkMastStaMapper.xml
index 9a87a99..d9a46bb 100644
--- a/src/main/resources/mapper/WrkMastStaMapper.xml
+++ b/src/main/resources/mapper/WrkMastStaMapper.xml
@@ -40,7 +40,7 @@
</select>
<select id="selectBywrkNoHistoricalTasks" resultMap="BaseResultMap">
select * from asr_wrk_mast_sta
- where wrk_crn = #{rgvNo} and wrk_no = #{taskNo1}
+ where wrk_crn = #{rgvNo} and (wrk_no = #{taskNo1} or wrk_no2 = #{taskNo1})
</select>
<select id="selectBywrkNoHistoricalTasks2" resultMap="BaseResultMap">
select * from asr_wrk_mast_sta
--
Gitblit v1.9.1