Merge remote-tracking branch 'origin/master' into master

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

@@ -143,29 +143,14 @@ 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);
         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);
         //设置文本格式表头在第几列
-        String columes = "12";
+        String columes = "13";
         util.importTemplateExcelSetHead(response, "阳性人员",columes);
     }
 

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/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>
@@ -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>

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

@@ -355,7 +355,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="请输入序号" />-->

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">

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

@@ -313,7 +313,7 @@
     />
 
     <!-- 添加或修改阳性人员对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="800px"  :close-on-click-modal="false" 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">