增加APP维修关键字搜索

resources/mybatis/rm/ReturnMaterialTaskMapper.xml

@@ -84,6 +84,14 @@
 		<if test="startTime != null and startTime != ''">
 			AND LEFT(wtr.OPERATION_TIME,10) BETWEEN #{startTime} and #{endTime}
 	   	</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>
  	

resources/mybatis/rm/ReturnMaterialTaskRecordMapper.xml

@@ -718,7 +718,7 @@
 				<!-- 派车计划 -->
 				<when test="item.leaseName == '派车计划'">
 					UPDATE car_plan_out
-					SET
+					<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
@@ -727,21 +727,23 @@
 								status = 2
 							</when>
 						</choose>
+					</set>
 					WHERE id = #{item.id}
 				</when>
 
 				<!-- 用车计划 -->
 				<when test="item.leaseName == '用车计划'">
 					UPDATE car_plan_apply
-					SET
+					<set>
 						<choose>
 							<when test="item.operator == '14'">
 								status_type = '1'
 							</when>
-						<when test="item.operator == '74' or item.operator == '75'">
+							<when test="item.operator == '84' or item.operator == '85'">
 								status_type = '4'
 							</when>
 						</choose>
+					</set>
 					WHERE id = #{item.id}
 				</when>
 			</choose>

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);