Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/YxryController.java

@@ -143,29 +143,17 @@ public class YxryController extends BaseController
     public void importTemplate(HttpServletResponse response) throws Exception {
         ExcelUtil<Yxry> util = new ExcelUtil<Yxry>(Yxry.class);
         Class<? extends Yxry>  clazz = new Yxry().getClass();
-//        List<SysDictData> isYzs = DictUtils.getDictCache("yz_status");
         List<SysDictData> isYins = DictUtils.getDictCache("yin_status");
-//        List<SysDictData> areas = DictUtils.getDictCache("residential_area");
-//        List<SysDictData> streets = DictUtils.getDictCache("street_town");
-//        List<SysDictData> isControls = DictUtils.getDictCache("control_status");
         List<SysDictData> isHomes = DictUtils.getDictCache("home_status");
-//        List<SysDictData> glPlaces = DictUtils.getDictCache("isolation_status");
-//        String[] isYz=isYzs.stream().map(SysDictData::getDictLabel).toArray(String[]::new);
         String[] isYin=isYins.stream().map(SysDictData::getDictLabel).toArray(String[]::new);
-//        String[] area=areas.stream().map(SysDictData::getDictLabel).toArray(String[]::new);
-//        String[] street=streets.stream().map(SysDictData::getDictLabel).toArray(String[]::new);
-//        String[] isControl=isControls.stream().map(SysDictData::getDictLabel).toArray(String[]::new);
         String[] isHome=isHomes.stream().map(SysDictData::getDictLabel).toArray(String[]::new);
-//        String[] glPlace=glPlaces.stream().map(SysDictData::getDictLabel).toArray(String[]::new);
-//        ExcelUtil.setClassExcelAttribute( clazz,"isYz","combo",isYz);
+        String[] level={"1","2","3","4","5","6","7","8","9","10","11","12","13","14","15","16","17","18","19","20",
+                "21","22","23","24","25","26","27","28","29","30","31","32"};
         ExcelUtil.setClassExcelAttribute( clazz,"isYin","combo",isYin);
-//        ExcelUtil.setClassExcelAttribute( clazz,"area","combo",area);
-//        ExcelUtil.setClassExcelAttribute( clazz,"street","combo",street);
-//        ExcelUtil.setClassExcelAttribute( clazz,"isControl","combo",isControl);
         ExcelUtil.setClassExcelAttribute( clazz,"isHome","combo",isHome);
-//        ExcelUtil.setClassExcelAttribute( clazz,"glPlace","combo",glPlace);
+        ExcelUtil.setClassExcelAttribute( clazz,"level","combo",level);
         //设置文本格式表头在第几列
-        String columes = "12";
+        String columes = "13";
         util.importTemplateExcelSetHead(response, "阳性人员",columes);
     }
 

ruoyi-quartz/pom.xml

@@ -34,6 +34,10 @@
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-system</artifactId>
+        </dependency>
 
     </dependencies>
 

ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/JcglTask.java

+package com.ruoyi.quartz.task;
+
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.domain.Jcglry;
+import com.ruoyi.system.domain.Yxry;
+import com.ruoyi.system.mapper.JcglryMapper;
+import com.ruoyi.system.mapper.YxryMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 定时任务调度
+ * 
+ * @author ruoyi
+ */
+@Component("jcglTask")
+public class JcglTask
+{
+
+    @Autowired
+    private JcglryMapper jcglryMapper;
+    @Autowired
+    private YxryMapper yxryMapper;
+    public void updateAddress()
+    {
+        System.out.println("定时执行同步隔离人员");
+        List<Jcglry> list = jcglryMapper.selectAllJcglry();
+        List<Jcglry> jcglries = new ArrayList<>();
+        for (Jcglry jcglry : list) {
+            List<Yxry> yxries = yxryMapper.selectYxryByCard(jcglry.getCardNo());
+            if (!yxries.isEmpty()){
+                jcglry.setStreet(yxries.get(0).getStreet());
+                jcglry.setCommittee(yxries.get(0).getCommittee());
+                jcglry.setCommunity(yxries.get(0).getCommunity());
+                jcglry.setBuilding(yxries.get(0).getBuilding());
+                jcglry.setUnit(yxries.get(0).getUnit());
+                jcglry.setHouse(yxries.get(0).getHouse());
+                if ("1".equals(yxries.get(0).getArea())){
+                    jcglry.setIsArea("0");
+                }
+                jcglries.add(jcglry);
+            }
+        }
+        if (!jcglries.isEmpty()){
+            jcglryMapper.updateBatch(jcglries);
+        }
+
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/Fkqk.java

@@ -43,6 +43,10 @@ public class Fkqk extends BaseEntity
     @Excel(name = "单元号")
     private String unit;
 
+    /** 楼号单元号门牌号 */
+    @Excel(name = "楼层（填写1-32，如果有多个楼层，用英文,分割，例：1,2）")
+    private String level;
+
     /** 封控明细 */
     @Excel(name = "封控明细")
     private String fkDetailed;
@@ -265,4 +269,12 @@ public class Fkqk extends BaseEntity
     public void setCommittee(String committee) {
         this.committee = committee;
     }
+
+    public String getLevel() {
+        return level;
+    }
+
+    public void setLevel(String level) {
+        this.level = level;
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/Yxry.java

@@ -62,6 +62,10 @@ public class Yxry extends BaseEntity
     @Excel(name = "单元号")
     private String unit;
 
+    /** 楼层 */
+    @Excel(name = "楼层")
+    private String floor;
+
     /** 楼号单元号门牌号 */
     @Excel(name = "门牌号")
     private String house;
@@ -448,4 +452,12 @@ public class Yxry extends BaseEntity
     public void setRemark(String remark) {
         this.remark = remark;
     }
+
+    public String getFloor() {
+        return floor;
+    }
+
+    public void setFloor(String floor) {
+        this.floor = floor;
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/JcglryMapper.java

@@ -66,4 +66,7 @@ public interface JcglryMapper
 
     int updateBatchYxry(@Param("list")List<Jcglry> list);
 
+    public List<Jcglry> selectAllJcglry();
+
+    int updateBatch(@Param("list")List<Jcglry> list);
 }

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,
@@ -229,7 +230,7 @@
             <if test="community != null">community = #{community},</if>
             <if test="unit != null">unit = #{unit},</if>
             <if test="zrTime != null">zr_time = #{zrTime},</if>
-            <if test="zcTime != null">zc_time = #{zcTime},</if>
+            zc_time = #{zcTime},
             <if test="glPlace != null">gl_place = #{glPlace},</if>
             <if test="status != null">status = #{status},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
@@ -245,8 +246,8 @@
             <if test="isPositive != null">is_positive = #{isPositive},</if>
             <if test="checkCard != null">check_card = #{checkCard},</if>
             <if test="peopleType != null">people_type = #{peopleType},</if>
-            <if test="otherGldTime != null">other_gld_time = #{otherGldTime},</if>
-            <if test="otherFcTime != null">other_fc_time = #{otherFcTime},</if>
+            other_gld_time = #{otherGldTime},
+            other_fc_time = #{otherFcTime},
         </trim>
         where id = #{id}
     </update>

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

@@ -27,16 +27,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="remark"    column="remark"    />
+        <result property="level"    column="level"    />
     </resultMap>
 
     <sql id="selectFkqkVo">
         select id, area,street, community, unit, fk_time, jf_time, status, create_by, create_time, update_by, update_time, del_flag, remark,
-               committee,floor,fk_detailed,fk_hs,fk_rs,is_jf,real_time,hs_time from fkqk
+               committee,floor,fk_detailed,fk_hs,fk_rs,is_jf,real_time,hs_time,level from fkqk
     </sql>
 
     <select id="selectFkqkList" parameterType="Fkqk" resultMap="FkqkResult">
         select a.id,a.area, a.street, a.community, a.unit, a.fk_time, a.jf_time, a.status, a.create_by, a.create_time, a.update_by, a.update_time, a.del_flag, a.remark,
-        a.committee,a.floor,a.fk_detailed,a.fk_hs,a.fk_rs,a.is_jf,a.real_time,a.hs_time
+        a.committee,a.floor,a.fk_detailed,a.fk_hs,a.fk_rs,a.is_jf,a.real_time,a.hs_time,a.level
         from fkqk a
         left join sys_user u on u.user_id = a.create_by
         left join sys_dept d on u.dept_id = d.dept_id
@@ -95,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isJf != null">is_jf,</if>
             <if test="realTime != null">real_time,</if>
             <if test="hsTime != null">hs_time,</if>
+            <if test="level != null">level,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="street != null">#{street},</if>
@@ -118,13 +120,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isJf != null">#{isJf},</if>
             <if test="realTime != null">#{realTime},</if>
             <if test="hsTime != null">#{hsTime},</if>
+            <if test="level != null">#{level},</if>
          </trim>
     </insert>
     <insert id="insertBatchFkqk" parameterType="Fkqk">
-        insert into fkqk (area,committee,street,community,floor,unit,fk_time,jf_time,create_by,create_time,remark,fk_detailed,fk_hs,fk_rs,is_jf,real_time,hs_time) values
+        insert into fkqk (area,committee,street,community,floor,unit,fk_time,jf_time,create_by,create_time,remark,
+                          fk_detailed,fk_hs,fk_rs,is_jf,real_time,hs_time,level) values
         <foreach item="item" index="index" collection="list" separator=",">
             (#{item.area},#{item.committee},#{item.street},#{item.community},#{item.floor},#{item.unit},#{item.fkTime},#{item.jfTime},
-            #{item.createBy},#{item.createTime},#{item.remark},#{item.fkDetailed},#{item.fkHs},#{item.fkRs},#{item.isJf},#{item.realTime},#{item.hsTime})
+            #{item.createBy},#{item.createTime},#{item.remark},#{item.fkDetailed},#{item.fkHs},#{item.fkRs},#{item.isJf},
+             #{item.realTime},#{item.hsTime},#{item.level})
         </foreach>
     </insert>
 
@@ -134,8 +139,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="street != null">street = #{street},</if>
             <if test="community != null">community = #{community},</if>
             <if test="unit != null">unit = #{unit},</if>
-            <if test="fkTime != null">fk_time = #{fkTime},</if>
-            <if test="jfTime != null">jf_time = #{jfTime},</if>
+            fk_time = #{fkTime},
+            jf_time = #{jfTime},
             <if test="status != null">status = #{status},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
@@ -149,9 +154,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fkDetailed != null">fk_detailed = #{fkDetailed},</if>
             <if test="fkHs != null">fk_hs = #{fkHs},</if>
             <if test="isJf != null">is_jf = #{isJf},</if>
-            <if test="realTime != null">real_time = #{realTime},</if>
-            <if test="hsTime != null">hs_time = #{hsTime},</if>
+            real_time = #{realTime},
+            hs_time = #{hsTime},
             <if test="fkRs != null">fk_rs = #{fkRs},</if>
+            <if test="level != null">level = #{level},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -54,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="phone != null  and phone != ''"> and a.phone like concat('%', #{phone}, '%')</if>
             <if test="area != null  and area != ''"> and a.area = #{area}</if>
             <if test="street != null  and street != ''"> and a.street = #{street}</if>
-            <if test="community != null  and community != ''"> and a.community like concat('%', #{community}, '%')</if>
+            <if test="community != null  and community != ''"> and a.community = #{community}</if>
             <if test="unit != null  and unit != ''"> and a.unit like concat('%', #{unit}, '%')</if>
             <if test="zrTime != null "> and a.zr_time = #{zrTime}</if>
             <if test="zcTime != null "> and a.zc_time = #{zcTime}</if>
@@ -153,7 +153,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="unitNo != null">unit_no = #{unitNo},</if>
             <if test="houseNo != null">house_no = #{houseNo},</if>
             <if test="zrTime != null">zr_time = #{zrTime},</if>
-            <if test="zcTime != null">zc_time = #{zcTime},</if>
+            zc_time = #{zcTime},
             <if test="status != null">status = #{status},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
@@ -163,7 +163,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null">remark = #{remark},</if>
             <if test="checkCard != null">check_card = #{checkCard},</if>
             <if test="committee != null">committee = #{committee},</if>
-            <if test="otherZrTime != null">other_zr_time = #{otherZrTime},</if>
+            other_zr_time = #{otherZrTime},
         </trim>
         where id = #{id}
     </update>

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

@@ -228,7 +228,7 @@
             <if test="cjPhone != null">cj_phone = #{cjPhone},</if>
             <if test="bblx != null">b_type = #{bblx},</if>
             <if test="laboratory != null">laboratory = #{laboratory},</if>
-            <if test="jcTime != null">jc_time = #{jcTime},</if>
+            jc_time = #{jcTime},
             <if test="rygx != null">rygx = #{rygx},</if>
             <if test="boxhao != null">boxhao = #{boxhao},</if>
             <if test="status != null">status = #{status},</if>

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

@@ -76,6 +76,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
 
+    <select id="selectAllJcglry" resultMap="JcglryResult">
+        <include refid="selectJcglryVo"/>
+        where del_flag = '0'
+    </select>
+
     <select id="selectYxryByCard" resultType="com.ruoyi.system.domain.Jcglry" parameterType="java.lang.String">
         <include refid="selectJcglryVo"/>
         where del_flag = '0' and card_no = #{cardNo}
@@ -232,4 +237,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+
+    <update id="updateBatch" parameterType="com.ruoyi.system.domain.Jcglry">
+        <foreach item="item" index="index" collection="list" separator=";">
+            update jcglry
+            <trim prefix="SET" suffixOverrides=",">
+                <if test="item.isArea != null">is_area = #{item.isArea},</if>
+                street = #{item.street},
+                committee = #{item.committee},
+                community = #{item.community},
+                unit = #{item.unit},
+                building = #{item.building},
+                house = #{item.house},
+            </trim>
+            where id = #{item.id}
+        </foreach>
+    </update>
 </mapper>
\ No newline at end of file

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

@@ -43,6 +43,7 @@
         <result property="fcName" column="fc_name"/>
         <result property="glName" column="gl_name"/>
         <result property="isCf" column="is_cf"/>
+        <result property="floor" column="floor"/>
     </resultMap>
 
     <sql id="selectYxryVo">
@@ -82,7 +83,7 @@
                zy_time,
                check_card,
                gl_name,
-               fc_name,cy_time
+               fc_name,cy_time,floor
         from yxry
     </sql>
 
@@ -94,7 +95,7 @@
         a.is_control, a.community, a.unit, a.has_acid, a.status, a.del_flag, a.create_by, a.house, a.building,
         a.create_time, a.update_by, a.update_time, a.remark ,a.gl_place,
         a.address,a.is_yz,a.is_yin,
-        a.is_home,a.risk_source,a.user_type,a.zy_time,a.check_card,a.gl_name,a.fc_name
+        a.is_home,a.risk_source,a.user_type,a.zy_time,a.check_card,a.gl_name,a.fc_name,a.floor
         from yxry a
         left join sys_user u on u.user_id = a.create_by
         left join sys_dept d on u.dept_id = d.dept_id
@@ -149,6 +150,7 @@
             <if test="unit != null">unit,</if>
             <if test="building != null">building,</if>
             <if test="house != null">house,</if>
+            <if test="floor != null">floor,</if>
             <if test="hasAcid != null">has_acid,</if>
             <if test="glPlace != null">gl_place,</if>
             <if test="status != null">status,</if>
@@ -186,6 +188,7 @@
             <if test="unit != null">#{unit},</if>
             <if test="building != null">#{building},</if>
             <if test="house != null">#{house},</if>
+            <if test="floor != null">#{floor},</if>
             <if test="hasAcid != null">#{hasAcid},</if>
             <if test="glPlace != null">#{glPlace},</if>
             <if test="status != null">#{status},</if>
@@ -213,13 +216,13 @@
         insert into yxry
         (sb_date,ldry,user_name,card_no,phone,area,street,isolation_status,is_control,community,unit,building,
         house,has_acid,gl_place,create_by,create_time,remark,is_yz,is_yin,is_home,
-        risk_source,user_type,zy_time,check_card,gl_name,fc_name,address,committee) values
+        risk_source,user_type,zy_time,check_card,gl_name,fc_name,address,committee,floor) values
         <foreach item="item" index="index" collection="list" separator=",">
             (#{item.sbDate},#{item.ldry},#{item.userName},#{item.cardNo},#{item.phone},#{item.area},#{item.street},
             #{item.isolationStatus},#{item.isControl},#{item.community},#{item.unit},#{item.building},#{item.house},
             #{item.hasAcid},#{item.glPlace},#{item.createBy},#{item.createTime},#{item.remark},#{item.isYz},#{item.isYin},
             #{item.isHome},#{item.riskSource},#{item.userType},#{item.zyTime},#{item.checkCard},#{item.glName},#{item.fcName},
-            #{item.address},#{item.committee})
+            #{item.address},#{item.committee},#{item.floor})
         </foreach>
     </insert>
 
@@ -242,6 +245,7 @@
                     <if test="item.unit != null">unit = #{item.unit},</if>
                     <if test="item.building != null">building = #{item.building},</if>
                     <if test="item.house != null">house = #{item.house},</if>
+                    <if test="item.floor != null">floor = #{item.floor},</if>
                     <if test="item.hasAcid != null">has_acid = #{item.hasAcid},</if>
                     <if test="item.glPlace != null">gl_place = #{item.glPlace},</if>
                     <if test="item.createBy != null">create_by = #{item.createBy},</if>
@@ -266,8 +270,8 @@
     <update id="updateYxry" parameterType="Yxry">
         update yxry
         <trim prefix="SET" suffixOverrides=",">
-            <if test="sbDate != null">sb_date = #{sbDate},</if>
-            <if test="cyTime != null ">cy_time = #{cyTime},</if>
+            sb_date = #{sbDate},
+            cy_time = #{cyTime},
             <if test="ldry != null">ldry = #{ldry},</if>
             <if test="userName != null">user_name = #{userName},</if>
             <if test="cardNo != null">card_no = #{cardNo},</if>
@@ -281,6 +285,7 @@
             <if test="unit != null">unit = #{unit},</if>
             <if test="building != null">building = #{building},</if>
             <if test="house != null">house = #{house},</if>
+            <if test="floor != null">floor = #{floor},</if>
             <if test="hasAcid != null">has_acid = #{hasAcid},</if>
             <if test="glPlace != null">gl_place = #{glPlace},</if>
             <if test="status != null">status = #{status},</if>
@@ -295,7 +300,7 @@
             <if test="isHome != null">is_home = #{isHome},</if>
             <if test="riskSource != null">risk_source = #{riskSource},</if>
             <if test="userType != null">user_type = #{userType},</if>
-            <if test="zyTime != null">zy_time = #{zyTime},</if>
+            zy_time = #{zyTime},
             <if test="checkCard != null">check_card = #{checkCard},</if>
             <if test="glName != null">gl_name = #{glName},</if>
             <if test="fcName != null">fc_name = #{fcName},</if>

ruoyi-ui/src/views/system/gldry/index.vue

@@ -19,7 +19,7 @@
       </el-form-item>
       <el-form-item label="房间号" prop="room">
         <el-input
-          v-model="queryParams.room"
+          v-model.trim="queryParams.room"
           placeholder="请输入房间号"
           clearable
           @keyup.enter.native="handleQuery"
@@ -27,7 +27,7 @@
       </el-form-item>
       <el-form-item label="居住人姓名" prop="jzName">
         <el-input
-          v-model="queryParams.jzName"
+          v-model.trim="queryParams.jzName"
           placeholder="请输入居住人姓名"
           clearable
           @keyup.enter.native="handleQuery"
@@ -35,7 +35,7 @@
       </el-form-item>
       <el-form-item label="身份证号码" prop="cardNo">
         <el-input
-          v-model="queryParams.cardNo"
+          v-model.trim="queryParams.cardNo"
           placeholder="请输入身份证号码"
           clearable
           @keyup.enter.native="handleQuery"
@@ -43,7 +43,7 @@
       </el-form-item>
       <el-form-item label="联系方式" prop="phone">
         <el-input
-          v-model="queryParams.phone"
+          v-model.trim="queryParams.phone"
           placeholder="请输入联系方式"
           clearable
           @keyup.enter.native="handleQuery"
@@ -81,7 +81,7 @@
       </el-form-item>
       <el-form-item label="楼号" prop="buildingNo">
         <el-input
-          v-model="queryParams.buildingNo"
+          v-model.trim="queryParams.buildingNo"
           placeholder="请输入楼号"
           clearable
           @keyup.enter.native="handleQuery"
@@ -89,7 +89,7 @@
       </el-form-item>
       <el-form-item label="单元号" prop="unitNo">
         <el-input
-          v-model="queryParams.unitNo"
+          v-model.trim="queryParams.unitNo"
           placeholder="请输入单元号"
           clearable
           @keyup.enter.native="handleQuery"
@@ -97,7 +97,7 @@
       </el-form-item>
       <el-form-item label="门牌号" prop="houseNo">
         <el-input
-          v-model="queryParams.houseNo"
+          v-model.trim="queryParams.houseNo"
           placeholder="请输入门牌号"
           clearable
           @keyup.enter.native="handleQuery"
@@ -235,6 +235,11 @@
           <span>{{ parseTime(scope.row.zrTime) ? parseTime(scope.row.zrTime).substring(0,10) : '' }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="从其他隔离点转来时间" align="center" prop="otherZrTime" width="180" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.otherZrTime) ? parseTime(scope.row.otherZrTime).substring(0,10) : ''}}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="转出时间" align="center" prop="zcTime" width="180" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.zcTime) ? parseTime(scope.row.zcTime).substring(0,10) : ''}}</span>
@@ -281,7 +286,7 @@
     />
 
     <!-- 添加或修改隔离点人员对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form :disabled="title ==='查看隔离点人员'" v-loading="formLoading" ref="form" :model="form" :rules="rules" label-width="auto">
         <el-row>
           <el-col :span="12">
@@ -298,26 +303,26 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="房间号" prop="room">
-              <el-input v-model="form.room" placeholder="请输入房间号" show-word-limit maxlength="6"/>
+              <el-input v-model.trim="form.room" placeholder="请输入房间号" show-word-limit maxlength="6"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="居住人姓名" prop="jzName">
-              <el-input v-model="form.jzName" placeholder="请输入居住人姓名" />
+              <el-input v-model.trim="form.jzName" maxlength="48" show-word-limit placeholder="请输入居住人姓名" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="身份证号码" prop="cardNo">
-              <el-input v-model="form.cardNo" placeholder="请输入身份证号码" />
+              <el-input v-model.trim="form.cardNo" placeholder="请输入身份证号码" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="联系方式" prop="phone">
-              <el-input v-model="form.phone" placeholder="请输入联系方式" />
+              <el-input v-model.trim="form.phone" placeholder="请输入联系方式" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -402,19 +407,19 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="楼号" prop="buildingNo">
-              <el-input v-model="form.buildingNo" placeholder="请输入楼号单元号门牌号" />
+              <el-input v-model.trim="form.buildingNo" maxlength="30" show-word-limit placeholder="请输入楼号单元号门牌号" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="单元号" prop="unitNo">
-              <el-input v-model="form.unitNo" placeholder="请输入楼号单元号门牌号" />
+              <el-input v-model.trim="form.unitNo" maxlength="4" show-word-limit placeholder="请输入楼号单元号门牌号" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="门牌号" prop="houseNo">
-              <el-input v-model="form.houseNo" placeholder="请输入楼号单元号门牌号" />
+              <el-input v-model.trim="form.houseNo" maxlength="4" show-word-limit placeholder="请输入楼号单元号门牌号" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -459,7 +464,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" placeholder="请输入备注" />
+              <el-input v-model.trim="form.remark" maxlength="200" show-word-limit placeholder="请输入备注" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -538,22 +543,26 @@ export default {
     return {
       expireTimeOPtion: {
         disabledDate: time => {
-          if (this.form.zrTime) {
-            return time.getTime() > new Date(this.form.zrTime).getTime()
+          if(this.form.zcTime) {
+            return time.getTime() > new Date().getTime() || time.getTime() > new Date(this.form.zcTime).getTime()
+          } else {
+            return time.getTime() > new Date().getTime()
           }
         }
       },
       otherZrTimeOPtion: {
         disabledDate: time => {
           if (this.form.otherZrTime) {
-            return time.getTime() > new Date(this.form.otherZrTime).getTime()
+            return time.getTime() > new Date().getTime()
           }
         }
       },
       zcTimeOPtion: {
         disabledDate: time => {
-          if (this.form.zcTime) {
-            return time.getTime() > new Date(this.form.zcTime).getTime()
+          if (this.form.zrTime) {
+            return time.getTime() > new Date().getTime() || time.getTime() < new Date(this.form.zrTime).getTime()
+          } else {
+            return time.getTime() > new Date().getTime()
           }
         }
       },
@@ -1176,7 +1185,7 @@ export default {
     handleExport() {
       this.download('system/gldry/export', {
         ...this.queryParams
-      }, `gldry_${new Date().getTime()}.xlsx`)
+      }, `隔离点人员数据.xlsx`)
     }
   }
 };

ruoyi-ui/src/views/system/hscj/index.vue

@@ -268,7 +268,14 @@
       @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="编号" align="center" prop="id" width="100" :show-overflow-tooltip="true" />
+      <el-table-column label="省" align="center" prop="province" width="100" :show-overflow-tooltip="true" />
       <el-table-column label="市" align="center" prop="city" width="100" :show-overflow-tooltip="true" />
+      <el-table-column label="采集地点" align="center" prop="cjPlace" width="100" :show-overflow-tooltip="true" />
+      <el-table-column label="箱号" align="center" prop="boxhao" width="100" :show-overflow-tooltip="true" />
+      <el-table-column label="采集管号" align="center" prop="cjgh" width="140" :show-overflow-tooltip="true" />
+      <el-table-column label="姓名" align="center" prop="userName" width="100" :show-overflow-tooltip="true" />
+      <el-table-column label="身份证号码" align="center" prop="cardNo" width="180" :show-overflow-tooltip="true" />
+      <el-table-column label="联系方式" align="center" prop="phone" width="120" :show-overflow-tooltip="true" />
       <el-table-column label="居住地所在区" align="center" prop="area" width="140" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.residential_area" :value="scope.row.area"/>
@@ -285,19 +292,15 @@
         </template>
       </el-table-column>
       <el-table-column label="小区/村名称" align="center" prop="communityName" width="120" :show-overflow-tooltip="true"/>
-      <el-table-column label="采集地点" align="center" prop="cjPlace" width="100" :show-overflow-tooltip="true" />
-      <el-table-column label="采集管号" align="center" prop="cjgh" width="140" :show-overflow-tooltip="true" />
-      <el-table-column label="姓名" align="center" prop="userName" width="100" :show-overflow-tooltip="true" />
-      <el-table-column label="身份证号码" align="center" prop="cardNo" width="180" :show-overflow-tooltip="true" />
-      <el-table-column label="联系方式" align="center" prop="phone" width="120" :show-overflow-tooltip="true" />
+      <el-table-column label="住址" align="center" prop="address" width="120" :show-overflow-tooltip="true" />
       <el-table-column label="性别" align="center" prop="sex" width="100" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
         </template>
       </el-table-column>
-      <el-table-column label="住址" align="center" prop="address" width="120" :show-overflow-tooltip="true" />
       <el-table-column label="年龄" align="center" prop="age" width="100" :show-overflow-tooltip="true" />
       <el-table-column label="类别" align="center" prop="category" width="100" :show-overflow-tooltip="true" />
+      <el-table-column label="人员关系" align="center" prop="rygx" width="100" :show-overflow-tooltip="true" />
       <el-table-column label="采集时间" align="center" prop="cjTime"width="100" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.cjTime)  ? parseTime(scope.row.cjTime).substring(0,10) : '' }}</span>
@@ -312,13 +315,6 @@
           <span>{{parseTime(scope.row.jcTime) ? parseTime(scope.row.jcTime).substring(0,10) : '' }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="人员关系" align="center" prop="rygx" width="100" :show-overflow-tooltip="true" />
-      <el-table-column label="箱号" align="center" prop="boxhao" width="100" :show-overflow-tooltip="true" />
-<!--      <el-table-column label="状态" align="center" prop="status">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
       <el-table-column label="备注" align="center" prop="remark" width="100" :show-overflow-tooltip="true" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160">
         <template slot-scope="scope">
@@ -355,7 +351,7 @@
     />
 
     <!-- 添加或修改核酸采集对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="800px" append-to-body>
       <el-form :disabled="title ==='查看核酸采集'"  v-loading="formLoading" ref="form" :model="form" :rules="rules" label-width="auto">
 <!--        <el-form-item label="序号" prop="xh">-->
 <!--          <el-input v-model="form.xh" placeholder="请输入序号" />-->
@@ -1345,7 +1341,7 @@ export default {
     handleExport() {
       this.download('system/hscj/export', {
         ...this.queryParams
-      }, `hscj_${new Date().getTime()}.xlsx`)
+      }, `核算采集数据.xlsx`)
     }
   }
 };

ruoyi-ui/src/views/system/jcglry/index.vue

@@ -255,7 +255,7 @@
     />
 
     <!-- 添加或修改解除隔离人员对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form :disabled="title ==='查看解除隔离人员'" v-loading="formLoading" ref="form" :model="form" :rules="rules" label-width="auto">
         <el-row>
           <el-col :span="12">
@@ -861,6 +861,9 @@ export default {
       this.form.street = ''
       this.form.bzStreet = ''
       this.form.bzAddress = ''
+      this.form.house = ''
+      this.form.unit = ''
+      this.form.building = ''
       this.zhenList.forEach(res => {
         if (res.parent === val) {
           this.zhen.push(res)
@@ -965,7 +968,7 @@ export default {
     handleExport() {
       this.download('system/jcglry/export', {
         ...this.queryParams
-      }, `jcglry_${new Date().getTime()}.xlsx`)
+      }, `解除隔离人员数据.xlsx`)
     }
   }
 }

ruoyi-ui/src/views/system/ycsb/index.vue

@@ -240,7 +240,7 @@
     />
 
     <!-- 添加或修改抗原异常上报对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="800px" append-to-body>
       <el-form :disabled="title ==='查看抗原异常上报'" v-loading="formLoading" ref="form" :model="form" :rules="rules" label-width="auto">
         <el-row>
           <el-col :span="12">
@@ -1092,7 +1092,7 @@ export default {
     handleExport() {
       this.download('system/ycsb/export', {
         ...this.queryParams
-      }, `ycsb_${new Date().getTime()}.xlsx`)
+      }, `抗原异常上报数据.xlsx`)
     }
   }
 };