生物防控人员

huimv-receive/src/main/java/com/huimv/receive/entity/vo/BaseProcessByLocationVo.java

@@ -32,5 +32,10 @@ public class BaseProcessByLocationVo {
 
     private String isolateDayNum;
 
+    private String isolateRealDayNum;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
+    private Date isolateRealEndDate;
+
 
 }

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

@@ -19,18 +19,22 @@
     <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  ,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   ,NULL AS isolate_real_day_num, NULL AS isolate_real_end_date   FROM `bill_clean`
    UNION
-   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`
+   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 ,NULL AS isolate_real_day_num, NULL AS isolate_real_end_date 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   ,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 ,NULL AS isolate_real_day_num,  NULL AS  isolate_real_end_date  FROM  `bill_dry`
     UNION
 
-    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,
+   SELECT  NULL AS qualified_date,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_location_id AS test_location_id  ,
    bill_status,
-    isolate_end_date ,   4 AS `type` ,isolate_day_num
+      isolate_end_date ,   4 AS `type` ,isolate_day_num  ,isolate_real_day_num, isolate_real_end_date
+
     FROM  `bill_isolate`) a  where  a.process_id  = #{processId} and test_location_id  = #{locationId} order by a.check_date desc
 
     </select>