From f27c69fb84d423b1dcd04c40a106e913f200dad9 Mon Sep 17 00:00:00 2001
From: liuhanqing <liuhanqing1@bonc.com.cn>
Date: Mon, 16 Jun 2025 17:34:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/job/MydoJobFinishMapper.xml     | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobFinishMapper.xml
index 8979787..5e0dbf6 100644
--- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobFinishMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobFinishMapper.xml
@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.job.mydojobfinish.mapper.MydoJobFinishMapper">
-    
+
     <resultMap type="MydoJobFinish" id="MydoJobFinishResult">
         <result property="jobId"    column="job_id"    />
         <result property="status"    column="status"    />
@@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectMydoJobFinishList" parameterType="MydoJobFinish" resultMap="MydoJobFinishResult">
         <include refid="selectMydoJobFinishVo"/>
-        <where>  
+        <where>
             <if test="jobId != null  and jobId != ''"> and job_id = #{jobId}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
             <if test="onLineType != null  and onLineType != ''"> and on_line_type = #{onLineType}</if>
@@ -93,9 +93,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="classId != null  and classId != ''"> and class_id = #{classId}</if>
             <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
             <if test="faultFlag != null  and faultFlag != ''"> and fault_flag = #{faultFlag}</if>
+            <if test="inOut != null  and inOut != '' and inOut =='2'.toString "> and mj.in_or_out >=20</if>
+            <if test="inOut != null  and inOut != '' and inOut =='1'.toString "> and mj.in_or_out &lt; 20</if>
         </where>
     </select>
-    
+
     <select id="selectMydoJobFinishByJobId" parameterType="String" resultMap="MydoJobFinishResult">
         <include refid="selectMydoJobFinishVo"/>
         where job_id = #{jobId}
@@ -195,9 +197,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteMydoJobFinishByJobIds" parameterType="String">
-        delete from mydo_job_finish where job_id in 
+        delete from mydo_job_finish where job_id in
         <foreach item="jobId" collection="array" open="(" separator="," close=")">
             #{jobId}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>