测试

huimv-receive/pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>com.huimv</groupId>
     <artifactId>huimv-receive</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>0.0.2-SNAPSHOT</version>
     <name>receive</name>
     <description>Demo project for Spring Boot</description>
     <properties>

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

@@ -19,7 +19,7 @@
     <select id="pageByLocationId" resultType="com.huimv.receive.entity.vo.BaseProcessByLocationVo">
 
  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
+     SELECT   NULL AS qualified_date,pass_user_name 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`
 
    UNION
@@ -27,7 +27,7 @@
    ,NULL AS isolate_end_date ,2 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_pcr`
 
    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
+   SELECT NULL AS qualified_date,pass_user_name 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 ,NULL AS isolate_real_day_num,  NULL AS  isolate_real_end_date, img_url, img_status ,NULL AS clean_time  ,dry_time,dry_tem FROM  `bill_dry`
     UNION
 
@@ -40,14 +40,14 @@
     FROM  `bill_isolate`
 
       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
+   SELECT NULL AS qualified_date,pass_user_name 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 ,
     5  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_sampling`
 
        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
+   SELECT   NULL AS qualified_date,pass_user_name 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,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
+    ) a  WHERE  a.process_id  = #{processId} and test_location_id  = #{locationId} AND bill_status &gt; 0 order by a.check_date desc
 
 
     </select>