修改 解除隔离加字段

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

@@ -180,9 +180,12 @@ public class JcglryController extends BaseController
         String[] isArea=isAreas.stream().map(SysDictData::getDictLabel).toArray(String[]::new);
         String[] glPlaces=glPlace.stream().map(SysDictData::getDictLabel).toArray(String[]::new);
         String[] arrangeDriver=arrangeDrivers.stream().map(SysDictData::getDictLabel).toArray(String[]::new);
+        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","33","34","35","36","37","38","39","40"};
         ExcelUtil.setClassExcelAttribute( clazz,"isArea","combo",isArea);
         ExcelUtil.setClassExcelAttribute( clazz,"glPlace","combo",glPlaces);
         ExcelUtil.setClassExcelAttribute( clazz,"arrangeDrivers","combo",arrangeDriver);
+        ExcelUtil.setClassExcelAttribute( clazz,"floor","combo",level);
         //设置文本格式表头在第几列
         String columes = "6";
         util.importTemplateExcelSetHead(response, "解除隔离人员",columes);

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

 package com.ruoyi.quartz.task;
 
-import com.ruoyi.common.utils.DataUtils;
-import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.system.domain.*;
 import com.ruoyi.system.mapper.FcryMapper;
 import com.ruoyi.system.mapper.GldryMapper;
@@ -42,13 +40,14 @@ public class JcglTask
             List<Yxry> yxrieList = yxries.stream().filter(l->l.getCardNo()!=null&&l.getCardNo().equals(jcglry.getCardNo()))
                     .collect(Collectors.toList());
             if (!yxrieList.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.setStreet(yxrieList.get(0).getStreet());
+                jcglry.setCommittee(yxrieList.get(0).getCommittee());
+                jcglry.setCommunity(yxrieList.get(0).getCommunity());
+                jcglry.setBuilding(yxrieList.get(0).getBuilding());
+                jcglry.setUnit(yxrieList.get(0).getUnit());
+                jcglry.setHouse(yxrieList.get(0).getHouse());
+                jcglry.setFloor(yxrieList.get(0).getFloor());
+                if ("1".equals(yxrieList.get(0).getArea())){
                     jcglry.setIsArea("0");
                 }
                 jcglries.add(jcglry);

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

@@ -77,6 +77,10 @@ public class Jcglry extends BaseEntity
     @Excel(name = "单元号")
     private String unit;
 
+    /** 楼号单元号门牌号 */
+    @Excel(name = "楼层")
+    private String floor;
+
     /** 楼号单元号门牌号 */
     @Excel(name = "门牌号")
     private String house;
@@ -383,4 +387,12 @@ public class Jcglry extends BaseEntity
     public void setHouse(String house) {
         this.house = house;
     }
+
+    public String getFloor() {
+        return floor;
+    }
+
+    public void setFloor(String floor) {
+        this.floor = floor;
+    }
 }

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

@@ -32,17 +32,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="unit" column="unit"/>
         <result property="building" column="building"/>
         <result property="house" column="house"/>
+        <result property="floor" column="floor"/>
     </resultMap>
 
     <sql id="selectJcglryVo">
         select id, is_area, name, gl_place, rz_time, jc_time, rylb, card_no, phone, street, committee, community, address,
                zy_status, arrange_drivers, bz_street, bz_address, status, del_flag, create_by, create_time, update_by,
-               update_time, remark,unit, house, building from jcglry
+               update_time, remark,unit, house, building,floor from jcglry
     </sql>
 
     <select id="selectJcglryList" parameterType="Jcglry" resultMap="JcglryResult">
         select a.id, a.is_area, a.name, a.gl_place, a.rz_time, a.jc_time, a.rylb, a.card_no, a.phone, a.street,
-               a.committee, a.community, a.address, a.zy_status, a.arrange_drivers, a.bz_street, a.bz_address,
+               a.committee, a.community, a.address, a.zy_status, a.arrange_drivers, a.bz_street, a.bz_address,a.floor,
                a.status, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time, a.remark, a.unit, a.house, a.building
         from jcglry a
         left join sys_user u on u.user_id = a.create_by
@@ -72,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="selectJcglryListExport" parameterType="Jcglry" resultMap="JcglryResult">
         select a.id, a.is_area, a.name, a.gl_place, a.rz_time, a.jc_time, a.rylb, a.card_no, a.phone, a.street,
-               a.committee, a.community, a.address, a.zy_status, a.arrange_drivers, a.bz_street, a.bz_address,
+               a.committee, a.community, a.address, a.zy_status, a.arrange_drivers, a.bz_street, a.bz_address,a.floor,
                a.status, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time, a.remark, a.unit, a.house, a.building
         from jcglry a
         left join sys_user u on u.user_id = a.create_by
@@ -151,6 +152,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
+            <if test="floor != null">floor,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="isArea != null">#{isArea},</if>
@@ -179,6 +181,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="floor != null">#{floor},</if>
          </trim>
     </insert>
 
@@ -186,12 +189,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into jcglry
         ( is_area ,name, gl_place, rz_time, jc_time, rylb, card_no, phone, street, committee, community,
         address, zy_status, arrange_drivers, bz_street, bz_address, create_by, create_time, remark,unit,building,
-        house ) values
+        house,floor ) values
         <foreach item="item" index="index" collection="list" separator=",">
             (#{item.isArea},#{item.name},#{item.glPlace},#{item.rzTime},#{item.jcTime},#{item.rylb},#{item.cardNo},#{item.phone},
             #{item.street},#{item.committee},#{item.community},
             #{item.address}, #{item.zyStatus}, #{item.arrangeDrivers},#{item.bzStreet}, #{item.bzAddress},#{item.createBy},
-            #{item.createTime},#{item.remark},#{item.unit},#{item.building},#{item.house})
+            #{item.createTime},#{item.remark},#{item.unit},#{item.building},#{item.house},#{item.floor})
         </foreach>
     </insert>
 
@@ -224,6 +227,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="floor != null">floor = #{floor},</if>
         </trim>
         where id = #{id}
     </update>
@@ -258,6 +262,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 <if test="item.updateBy != null">update_by = #{item.updateBy},</if>
                 <if test="updateTime != null">update_time = #{item.updateTime},</if>
                 <if test="item.remark != null">remark = #{item.remark},</if>
+                <if test="item.floor != null">floor = #{item.floor},</if>
             </trim>
             where card_no = #{item.cardNo}
         </foreach>
@@ -285,6 +290,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 unit = #{item.unit},
                 building = #{item.building},
                 house = #{item.house},
+                floor = #{item.floor},
             </trim>
             where id = #{item.id}
         </foreach>