修改 解除隔离人员加字段

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/JcglryServiceImpl.java

 package com.ruoyi.system.service.impl;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -8,7 +9,12 @@ import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.*;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.Fcry;
+import com.ruoyi.system.domain.Gldry;
 import com.ruoyi.system.domain.Yxry;
+import com.ruoyi.system.mapper.FcryMapper;
+import com.ruoyi.system.mapper.GldryMapper;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.common.annotation.DataScope;
@@ -30,6 +36,12 @@ public class JcglryServiceImpl implements IJcglryService
     @Autowired
     private JcglryMapper jcglryMapper;
 
+    @Autowired
+    private FcryMapper fcryMapper;
+
+    @Autowired
+    private GldryMapper gldryMapper;
+
     /**
      * 查询解除隔离人员
      * 
@@ -39,7 +51,43 @@ public class JcglryServiceImpl implements IJcglryService
     @Override
     public Jcglry selectJcglryById(Long id)
     {
-        return jcglryMapper.selectJcglryById(id);
+        Jcglry jcglry = jcglryMapper.selectJcglryById(id);
+        // 根据身份证号查询方舱人员信息
+        List<Fcry> fcries = fcryMapper.selectFcryByCard(jcglry.getCardNo());
+        // 根据身份证号查询隔离人员
+        List<Gldry> gldries = gldryMapper.selectGldryByCard(jcglry.getCardNo(),null);
+        Fcry fcry = null;
+        Gldry gldry = null;
+        if (!fcries.isEmpty())
+            fcry = fcries.stream().max(Comparator.comparing(Fcry::getZrTime)).get();
+        if (!gldries.isEmpty())
+            gldry = gldries.stream().max(Comparator.comparing(Gldry::getZrTime)).get();
+        //0=是,1=否
+        if (fcry!=null && gldry!=null) {
+            //相等则返回0，date1大返回1，否则返回-1。
+            if (fcry.getZrTime().compareTo(gldry.getZrTime()) > 0){
+                if (null!=fcry.getZcTime())
+                    jcglry.setZyStatus("0");
+                else
+                    jcglry.setZyStatus("1");
+            } else {
+                if (null!=gldry.getZcTime())
+                    jcglry.setZyStatus("0");
+                else
+                    jcglry.setZyStatus("1");
+            }
+        } else if (fcry!=null) {
+            if (null!=fcry.getZcTime())
+                jcglry.setZyStatus("0");
+            else
+                jcglry.setZyStatus("1");
+        } else if (gldry!=null) {
+            if (null!=gldry.getZcTime())
+                jcglry.setZyStatus("0");
+            else
+                jcglry.setZyStatus("1");
+        }
+        return jcglry;
     }
 
     /**
@@ -52,7 +100,45 @@ public class JcglryServiceImpl implements IJcglryService
     @DataScope(deptAlias = "d", userAlias = "u")
     public List<Jcglry> selectJcglryList(Jcglry jcglry)
     {
-        return jcglryMapper.selectJcglryList(jcglry);
+        List<Jcglry> list = jcglryMapper.selectJcglryList(jcglry);
+        for (Jcglry yx : list) {
+            // 根据身份证号查询方舱人员信息
+            List<Fcry> fcries = fcryMapper.selectFcryByCard(yx.getCardNo());
+            // 根据身份证号查询隔离人员
+            List<Gldry> gldries = gldryMapper.selectGldryByCard(yx.getCardNo(),null);
+            Fcry fcry = null;
+            Gldry gldry = null;
+            if (!fcries.isEmpty())
+                fcry = fcries.stream().max(Comparator.comparing(Fcry::getZrTime)).get();
+            if (!gldries.isEmpty())
+                gldry = gldries.stream().max(Comparator.comparing(Gldry::getZrTime)).get();
+            //0=是,1=否
+            if (fcry!=null && gldry!=null) {
+                //相等则返回0，date1大返回1，否则返回-1。
+                if (fcry.getZrTime().compareTo(gldry.getZrTime()) > 0){
+                    if (null!=fcry.getZcTime())
+                        yx.setZyStatus("0");
+                    else
+                        yx.setZyStatus("1");
+                } else {
+                    if (null!=gldry.getZcTime())
+                        yx.setZyStatus("0");
+                    else
+                        yx.setZyStatus("1");
+                }
+            } else if (fcry!=null) {
+                if (null!=fcry.getZcTime())
+                    yx.setZyStatus("0");
+                else
+                    yx.setZyStatus("1");
+            } else if (gldry!=null) {
+                if (null!=gldry.getZcTime())
+                    yx.setZyStatus("0");
+                else
+                    yx.setZyStatus("1");
+            }
+        }
+        return list;
     }
 
     /**

ruoyi-system/src/main/resources/mapper/system/FcryMapper.xml

@@ -117,6 +117,7 @@
                a.unit,
                a.doorplate,
                a.zr_time,
+               a.zc_time,
                a.gl_place,
                a.status,
                a.del_flag,