生物防控人员

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

@@ -19,17 +19,18 @@
     <select id="pageByLocationId" resultType="com.huimv.receive.entity.vo.BaseProcessByLocationVo">
 
    select *from (
-     SELECT 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 FROM `bill_clean`
+     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 FROM `bill_clean`
    UNION
-   SELECT process_id ,id,farm_id,admission_user_id ,test_location,check_date,test_location_id   ,bill_status  ,NULL as isolate_end_date ,2 as `type` ,NULL AS isolate_day_num FROM  `bill_pcr`
+   SELECT qualified_date,pass_user_name,pcr_type, process_id ,id,farm_id,admission_user_id ,test_location,check_date,test_location_id   ,bill_status  ,NULL AS isolate_end_date ,2 AS `type` ,NULL AS isolate_day_num FROM  `bill_pcr`
    UNION
-   SELECT process_id , id,farm_id,admission_user_id ,test_location,check_date,test_location_id   ,bill_status  ,NULL as isolate_end_date ,3  as `type` ,null AS isolate_day_num FROM  `bill_dry`
+   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 ,3  AS `type` ,NULL AS isolate_day_num FROM  `bill_dry`
     UNION
-   SELECT process_id , id,farm_id,admission_user_id , isolate_location as test_location,
-   isolate_start_date as check_date ,
+
+   SELECT  NULL AS qualified_date,NULL AS pass_user_name,  NULL AS pcr_type, process_id ,id,farm_id,admission_user_id , isolate_location AS test_location,
+   isolate_start_date AS check_date ,
    isolate_end_date ,
-   isolate_end_date as test_location_id  ,bill_status, isolate_day_num,
-  4 as `type`
+   isolate_end_date AS test_location_id  ,bill_status, isolate_day_num,
+  4 AS `type`
     FROM  `bill_isolate`) a  where  a.process_id  = #{processId} and test_location_id  = #{locationId} order by a.check_date desc
 
     </select>