dengyj 3 년 전
부모
커밋
7404d68591
1개의 변경된 파일6개의 추가작업 그리고 4개의 파일을 삭제
  1. 6 4
      src/main/java/com/steerinfo/meterwork/meterworkcarnoidentify/mapper/MeterWorkCarnoIdentifyMapper.xml

+ 6 - 4
src/main/java/com/steerinfo/meterwork/meterworkcarnoidentify/mapper/MeterWorkCarnoIdentifyMapper.xml

@@ -451,18 +451,20 @@
        B.car_no first_car_no,
        A.car_no,
        A.video_car_no1,
-       case when (select C.video_car_no2 from Meter_Work_Carno_Identify C where C.Actual_First_No = A.Actual_First_No and C.video_car_no2 = B.car_no and C.Video_Car_No1 = B.car_no ) is not null then '否'
-            when (select C.video_car_no1 from Meter_Work_Carno_Identify C where C.Actual_First_No = A.Actual_First_No and C.video_car_no1 = B.car_no) is  not null then '是'
+       case when (A.video_car_no2 is not null and A.video_car_no2 = A.car_no and A.video_car_no2 = A.car_no) then '否'
+            when (A.video_car_no1 is not null and A.video_car_no1 = A.car_no) then '是'
             else '否' end vedio_car_no1_flag,
        A.video_car_no2,
-       case when (select C.video_car_no2 from Meter_Work_Carno_Identify C where C.Actual_First_No = A.Actual_First_No and C.video_car_no2 = B.car_no) is not null then '是'
+       case when (A.video_car_no2 is not null and A.video_car_no2 = A.car_no) then '是'
             else '否' end vedio_car_no2_flag,
        A.Rfid_Car_No,
-       (select D.car_No from meter_base_rfid_info D where D.RFID_code in (select C.rfid_car_no from Meter_Work_Carno_Identify C where C.Actual_First_No = A.Actual_First_No and A.Car_No_type = '2')) rfid_carNo,
+       D.car_No rfid_carNo,
        A.scan_car_no
     from Meter_Work_Carno_Identify A
     left join meter_work_car_actual_first B
       on A.actual_first_no = B.actual_first_no
+    left join meter_base_rfid_info D
+      on A.rfid_car_no = D.Rfid_Code
     where 1 = 1
     <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
       and B.create_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and B.create_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')