From 1e3b66e9e6edaaf1b1770038d2c5bdb17052f4a6 Mon Sep 17 00:00:00 2001
From: syruan <321359594@qq.com>
Date: Fri, 18 Jul 2025 09:43:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0APP=E7=BB=B4=E4=BF=AE?=
 =?UTF-8?q?=E5=85=B3=E9=94=AE=E5=AD=97=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/rm/ReturnMaterialTaskMapper.xml   | 10 ++++-
 .../rm/ReturnMaterialTaskRecordMapper.xml     | 38 ++++++++++---------
 .../rm/dao/ReturnMaterialTaskRecordDao.java   |  2 +-
 3 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/resources/mybatis/rm/ReturnMaterialTaskMapper.xml b/resources/mybatis/rm/ReturnMaterialTaskMapper.xml
index 7f4a550..82c60b0 100644
--- a/resources/mybatis/rm/ReturnMaterialTaskMapper.xml
+++ b/resources/mybatis/rm/ReturnMaterialTaskMapper.xml
@@ -83,7 +83,15 @@
 		AND wtr.CHECKER_ID = #{checkerId}
 		<if test="startTime != null and startTime != ''">
 			AND LEFT(wtr.OPERATION_TIME,10) BETWEEN #{startTime} and #{endTime}
-	       </if>
+	   	</if>
+		<if test="keyWord != null and keyWord != ''" >
+			AND (
+			wtr.NUMBER like concat('%',#{keyWord},'%') OR
+			bu.`NAME` like concat('%',#{keyWord},'%') OR
+			bp.`NAME` like concat('%',#{keyWord},'%') OR
+			wtr.LEASE_PERSON like concat('%',#{keyWord},'%')
+			)
+		</if>
 		ORDER BY wtr.OPERATION_TIME DESC
  	</select>
  	
diff --git a/resources/mybatis/rm/ReturnMaterialTaskRecordMapper.xml b/resources/mybatis/rm/ReturnMaterialTaskRecordMapper.xml
index cb12439..a8719e9 100644
--- a/resources/mybatis/rm/ReturnMaterialTaskRecordMapper.xml
+++ b/resources/mybatis/rm/ReturnMaterialTaskRecordMapper.xml
@@ -718,30 +718,32 @@
 				<!-- 派车计划 -->
 				<when test="item.leaseName == '派车计划'">
 					UPDATE car_plan_out
-					SET
-					<choose>
-						<when test="item.operator == '57' or item.operator == '29' or item.operator == '55' or item.operator == '56' or item.operator == '67'">
-							status = 1
-						</when>
-						<when test="item.operator == '49' or item.operator == '50'">
-							status = 2
-						</when>
-					</choose>
+					<set>
+						<choose>
+							<when test="item.operator == '57' or item.operator == '29' or item.operator == '55' or item.operator == '56' or item.operator == '67'">
+								status = 1
+							</when>
+							<when test="item.operator == '49' or item.operator == '50'">
+								status = 2
+							</when>
+						</choose>
+					</set>
 					WHERE id = #{item.id}
 				</when>
 
 				<!-- 用车计划 -->
 				<when test="item.leaseName == '用车计划'">
 					UPDATE car_plan_apply
-					SET
-					<choose>
-						<when test="item.operator == '14'">
-							status_type = '1'
-						</when>
-						<when test="item.operator == '74' or item.operator == '75'">
-							status_type = '4'
-						</when>
-					</choose>
+					<set>
+						<choose>
+							<when test="item.operator == '14'">
+								status_type = '1'
+							</when>
+							<when test="item.operator == '84' or item.operator == '85'">
+								status_type = '4'
+							</when>
+						</choose>
+					</set>
 					WHERE id = #{item.id}
 				</when>
 			</choose>
diff --git a/src/com/bonus/rm/dao/ReturnMaterialTaskRecordDao.java b/src/com/bonus/rm/dao/ReturnMaterialTaskRecordDao.java
index 353b2ca..d81dd99 100644
--- a/src/com/bonus/rm/dao/ReturnMaterialTaskRecordDao.java
+++ b/src/com/bonus/rm/dao/ReturnMaterialTaskRecordDao.java
@@ -30,7 +30,7 @@ public interface ReturnMaterialTaskRecordDao extends BaseDao<ReturnMaterialTaskR
 
 	int addRecord(AuditRecordVo vo);
 
-	String getUpTimes(@Param("id") String id,@Param("auditType") int statusType);
+	String getUpTimes(@Param("id") String id, @Param("auditType") int statusType);
 
 	CarNeedPlanVo getPlanInfo(@Param("pureId") String pureId);