生物安全

huimv-receive/src/main/java/com/huimv/receive/controller/BillSamplingController.java

@@ -62,7 +62,7 @@ public class BillSamplingController {
         BillPcr billPcr = billPcrService.getOne(new QueryWrapper<BillPcr>().lambda().eq(BillPcr::getSamplingId, id));
         if (ObjectUtil.isNotEmpty(billPcr)){
             billSamplingVo.setPcrType(billPcr.getPcrType());
-            billSamplingVo.setBillStatus(billPcr.getBillStatus());
+            billSamplingVo.setStatus(billPcr.getBillStatus());
         }
         return new Result(ResultCode.SUCCESS, billSamplingVo);
     }

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

@@ -47,6 +47,10 @@ public class BaseProcessByLocationVo {
     private String goodsType;
     private String feedImgUrl;
 
+    private String  carryImgUrl;
+    private List<String> carryImgUrls;
+
+
 
 
 

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

@@ -23,5 +23,5 @@ import java.time.LocalDateTime;
 @Data
 public class BillSamplingVo extends BillSampling {
     private Integer pcrType;
-    private Integer billStatus;
+    private Integer status;
 }

huimv-receive/src/main/java/com/huimv/receive/mapper/BillGoodsInventoryMapper.java

@@ -3,6 +3,7 @@ package com.huimv.receive.mapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+
 import com.huimv.receive.entity.BillGoodsInventory;
 import com.huimv.receive.entity.BillPcr;
 import com.huimv.receive.entity.vo.BillGoodsInventoryVo;

huimv-receive/src/main/java/com/huimv/receive/service/IBillSamplingService.java

@@ -27,7 +27,7 @@ public interface IBillSamplingService extends IService<BillSampling> {
     Result listPersonalSample(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
     Result edit(HttpServletRequest httpServletRequest, String farmId, String id, String date,
-                MultipartFile img, MultipartFile picture1, MultipartFile picture2, MultipartFile picture3) throws ParseException, IOException;
+                MultipartFile video, MultipartFile picture1, MultipartFile picture2, MultipartFile picture3) throws ParseException, IOException;
 
     Result listAll(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 }

huimv-receive/src/main/java/com/huimv/receive/service/impl/BaseProcessServiceImpl.java

@@ -77,6 +77,11 @@ public class BaseProcessServiceImpl extends ServiceImpl<BaseProcessMapper, BaseP
                 List<String> list = Arrays.asList(imgUrl.split(","));
                 baseProcessByLocationVo.setImgUrls(list);
             }
+            String carryImgUrl = baseProcessByLocationVo.getCarryImgUrl();
+            if (StringUtils.isNotBlank(imgUrl)){
+                List<String> carryImgUrlList = Arrays.asList(carryImgUrl.split(","));
+                baseProcessByLocationVo.setCarryImgUrls(carryImgUrlList);
+            }
         }
         return new Result(ResultCode.SUCCESS,baseProcessByLocationVos);
     }

huimv-receive/src/main/java/com/huimv/receive/service/impl/BillSamplingServiceImpl.java

@@ -1,5 +1,6 @@
 package com.huimv.receive.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -11,6 +12,7 @@ import com.huimv.receive.common.utils.Result;
 import com.huimv.receive.common.utils.ResultCode;
 import com.huimv.receive.common.utils.UploadImage;
 import com.huimv.receive.entity.*;
+import com.huimv.receive.entity.vo.BillSamplingVo;
 import com.huimv.receive.mapper.*;
 import com.huimv.receive.service.IBillSamplingService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -95,8 +97,15 @@ public class BillSamplingServiceImpl extends ServiceImpl<BillSamplingMapper, Bil
     @Override
     public Result listById(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String id = paramsMap.get("id");
-        BillSampling billPcr = billSamplingMapper.selectById(id);
-        return new Result(ResultCode.SUCCESS, billPcr);
+        BillSampling billSampling = billSamplingMapper.selectById(id);
+        BillSamplingVo billSamplingVo = new BillSamplingVo();
+        BeanUtil.copyProperties(billSampling,billSamplingVo);
+        BillPcr billPcr = pcrMapper.selectOne(new QueryWrapper<BillPcr>().lambda().eq(BillPcr::getSamplingId, id));
+        if (ObjectUtil.isNotEmpty(billPcr)){
+            billSamplingVo.setPcrType(billPcr.getPcrType());
+            billSamplingVo.setStatus(billPcr.getBillStatus());
+        }
+        return new Result(ResultCode.SUCCESS, billSamplingVo);
     }
 
     @Override
@@ -120,9 +129,10 @@ public class BillSamplingServiceImpl extends ServiceImpl<BillSamplingMapper, Bil
 
 
     @Override
-    public Result edit(HttpServletRequest httpServletRequest, String farmId, String id, String date, MultipartFile img, MultipartFile picture1, MultipartFile picture2, MultipartFile picture3) throws ParseException, IOException {
+    public Result edit(HttpServletRequest httpServletRequest, String farmId, String id, String date, MultipartFile video, MultipartFile picture1, MultipartFile picture2, MultipartFile picture3) throws ParseException, IOException {
         String s = "";
-        s = uploadImage.getVideoCom(img);
+        System.out.println(video);
+        s = uploadImage.getVideoCom(video);
         if (s.equals("上传失败")) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return new Result(10001, "视频上传失败", false);

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

@@ -20,39 +20,39 @@
 
  SELECT *FROM (
       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  ,  null as goods_type , null as feed_img_url FROM `bill_clean`
+      ,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  ,  null as goods_type , null as feed_img_url, null as 'carryImgUrl' 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 ,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  ,  null as goods_type , null as feed_img_url FROM  `bill_pcr`
+   ,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  ,  null as goods_type , null as feed_img_url, pic_url as 'carryImgUrl' FROM  `bill_pcr`
 
    UNION
    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  ,  null as goods_type , null as feed_img_url FROM  `bill_dry`
+    ,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  ,  null as goods_type , null as feed_img_url, null as 'carryImgUrl' FROM  `bill_dry`
     UNION
 
    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_real_day_num, isolate_real_end_date , NULL AS img_url, NULL AS  img_status ,NULL AS clean_time ,NULL AS dry_time,NULL AS dry_tem ,  null as goods_type , null as feed_img_url
+      isolate_end_date ,   4 AS `type` ,isolate_day_num  ,isolate_real_day_num, isolate_real_end_date , NULL AS img_url, NULL AS  img_status ,NULL AS clean_time ,NULL AS dry_time,NULL AS dry_tem ,  null as goods_type , null as feed_img_url, null as 'carryImgUrl'
 
     FROM  `bill_isolate`
 
       UNION
    SELECT NULL AS qualified_date, 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 ,  null as goods_type , null as feed_img_url FROM  `bill_sampling`
+    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 ,  null as goods_type , null as feed_img_url,pic_url  as 'carryImgUrl' FROM  `bill_sampling`
 
        UNION
    SELECT   NULL AS qualified_date,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 , null as goods_type , null as feed_img_url FROM `bill_clean_before`
+      ,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 , null as goods_type , null as feed_img_url, null as 'carryImgUrl' FROM `bill_clean_before`
 
 
 
       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, null as  check_date,   test_location_id
-      ,bill_status  ,NULL AS isolate_end_date ,7 AS `type`   , NULL AS isolate_day_num   ,NULL AS isolate_real_day_num, NULL AS isolate_real_end_date ,img_url,null as  img_status,NULL AS clean_time ,NULL AS dry_time,NULL AS dry_tem , goods_type ,feed_img_url
+      ,bill_status  ,NULL AS isolate_end_date ,7 AS `type`   , NULL AS isolate_day_num   ,NULL AS isolate_real_day_num, NULL AS isolate_real_end_date ,img_url,null as  img_status,NULL AS clean_time ,NULL AS dry_time,NULL AS dry_tem , goods_type ,feed_img_url, null as 'carryImgUrl'
      FROM `bill_goods_inventory`
 
     ) a  WHERE  a.process_id  = #{processId} and test_location_id  = #{locationId} AND bill_status > 0 order by a.check_date desc