From a4cfd6abc3e46cfff3170b9bd8d00a29e7c866c7 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 15 九月 2025 09:04:24 +0800
Subject: [PATCH] #

---
 src/main/resources/mapper/WrkMastStaMapper.xml |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/WrkMastStaMapper.xml b/src/main/resources/mapper/WrkMastStaMapper.xml
index 58fc03f..d9a46bb 100644
--- a/src/main/resources/mapper/WrkMastStaMapper.xml
+++ b/src/main/resources/mapper/WrkMastStaMapper.xml
@@ -26,6 +26,8 @@
         <result column="batch2" property="batch2"/>
         <result column="anfme" property="anfme"/>
         <result column="anfme2" property="anfme2"/>
+        <result column="memo" property="memo"/>
+        <result column="memo2" property="memo2"/>
 
     </resultMap>
     <select id="selectByRgvNoandWrkNo" resultMap="BaseResultMap">
@@ -38,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