生物防控人员2

huimv-receive/src/main/resources/com/huimv/receive/mapper/BaseProcessMapper.xml

@@ -18,7 +18,7 @@
     </resultMap>
     <select id="pageByLocationId" resultType="com.huimv.receive.entity.vo.BaseProcessByLocationVo">
 
-   SELECT *FROM (
+ SELECT *FROM (
      SELECT   NULL AS qualified_date,NULL AS pass_user_name,NULL AS pcr_type,process_id ,id,farm_id ,admission_user_id ,test_location,check_date,test_location_id
       ,bill_status  ,NULL AS isolate_end_date ,1 AS `type`   , NULL AS isolate_day_num   ,NULL AS isolate_real_day_num, NULL AS isolate_real_end_date ,img_url,img_status,clean_time ,NULL AS dry_time,NULL AS dry_tem  FROM `bill_clean`
 
@@ -46,7 +46,7 @@
 
        UNION
    SELECT   NULL AS qualified_date,NULL AS pass_user_name,NULL AS pcr_type,process_id ,id,farm_id ,admission_user_id ,test_location,check_date,test_location_id
-      ,bill_status  ,NULL AS isolate_end_date ,6 AS `type`   , NULL AS isolate_day_num   ,NULL AS isolate_real_day_num, NULL AS isolate_real_end_date ,img_url,img_status,clean_time ,NULL AS dry_time,NULL AS dry_tem  FROM `bill_clean`
+      ,bill_status  ,NULL AS isolate_end_date ,6 AS `type`   , NULL AS isolate_day_num   ,NULL AS isolate_real_day_num, NULL AS isolate_real_end_date ,img_url,img_status,NULL AS clean_time ,NULL AS dry_time,NULL AS dry_tem  FROM `bill_clean_before`
     ) a  WHERE  a.process_id  = #{processId} and test_location_id  = #{locationId} order by a.check_date desc