diff --git a/dl-module-inspection/src/main/resources/mapper/InspectionWorkNodeMapper.xml b/dl-module-inspection/src/main/resources/mapper/InspectionWorkNodeMapper.xml index 4c53fbfd..8e69b02f 100644 --- a/dl-module-inspection/src/main/resources/mapper/InspectionWorkNodeMapper.xml +++ b/dl-module-inspection/src/main/resources/mapper/InspectionWorkNodeMapper.xml @@ -118,67 +118,125 @@ ORDER BY node.create_time DESC; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/dl-module-inspection/src/main/resources/mapper/inspection/AppInspectionPartnerMapper.xml b/dl-module-inspection/src/main/resources/mapper/inspection/AppInspectionPartnerMapper.xml index 27c0aba3..c39f8e61 100644 --- a/dl-module-inspection/src/main/resources/mapper/inspection/AppInspectionPartnerMapper.xml +++ b/dl-module-inspection/src/main/resources/mapper/inspection/AppInspectionPartnerMapper.xml @@ -580,7 +580,7 @@ FROM ELSE '已支付' END AS pay, CASE - WHEN oi.pay_type IS NOT NULL THEN '已完成' + WHEN oi.pay_type IS NOT NULL THEN '已支付' WHEN has_status_0_or_null THEN '检测中' WHEN (ii.status = 0 OR ii.status = 2) AND has_status_1 THEN '检测中' WHEN (COALESCE(max_iwn_status, 0) = 2 OR ii.status = 1) THEN '已完成' diff --git a/dl-module-inspection/src/main/resources/mapper/inspection/InspectionInfoMapper.xml b/dl-module-inspection/src/main/resources/mapper/inspection/InspectionInfoMapper.xml index ae2b473a..6ead62e2 100644 --- a/dl-module-inspection/src/main/resources/mapper/inspection/InspectionInfoMapper.xml +++ b/dl-module-inspection/src/main/resources/mapper/inspection/InspectionInfoMapper.xml @@ -390,7 +390,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ii.create_time, 0 AS source_type FROM inspection_info ii - WHERE ii.deleted = 0 AND ii.meet_man_id = #{inspectionInfo.dealUserId} AND ii.is_meet_car = '0' + WHERE ii.deleted = 0 AND ii.meet_man_id = #{inspectionInfo.dealUserId} AND ii.is_meet_car = '0' AND ii.status != '1' AND ii.car_num LIKE CONCAT('%', #{inspectionInfo.carNum}, '%') @@ -554,6 +554,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE ii.deleted = 0 AND ii.meet_man_id = #{inspectionInfo.dealUserId} AND ii.is_meet_car = '0' + AND ii.status != '1' AND ii.car_num LIKE CONCAT('%', #{inspectionInfo.carNum}, '%')