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

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

@@ -147,8 +147,11 @@ public class YxryController extends BaseController
         List<SysDictData> isHomes = DictUtils.getDictCache("home_status");
         String[] isYin=isYins.stream().map(SysDictData::getDictLabel).toArray(String[]::new);
         String[] isHome=isHomes.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"};
         ExcelUtil.setClassExcelAttribute( clazz,"isYin","combo",isYin);
         ExcelUtil.setClassExcelAttribute( clazz,"isHome","combo",isHome);
+        ExcelUtil.setClassExcelAttribute( clazz,"level","combo",level);
         //设置文本格式表头在第几列
         String columes = "13";
         util.importTemplateExcelSetHead(response, "阳性人员",columes);

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

@@ -38,6 +38,9 @@ public class JcglTask
                 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);
             }
         }

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/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>
 
@@ -152,6 +157,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             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/JcglryMapper.xml

@@ -242,6 +242,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <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},

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

@@ -460,7 +460,14 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="楼层" prop="floor">
-              <el-input v-model="form.floor" maxlength="4" show-word-limit placeholder="请输入单元号" />
+              <el-select style="width: 100%" v-model="form.floor" placeholder="请选择楼层">
+                <el-option
+                  v-for="item in floorOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -953,8 +960,42 @@ export default {
       },
       // 表单参数
       formLoading: false,
+      floorOptions: [
+        {label: '1', value: '1'},
+        {label: '2', value: '2'},
+        {label: '3', value: '3'},
+        {label: '4', value: '4'},
+        {label: '5', value: '5'},
+        {label: '6', value: '6'},
+        {label: '7', value: '7'},
+        {label: '8', value: '8'},
+        {label: '9', value: '9'},
+        {label: '10', value: '10'},
+        {label: '11', value: '11'},
+        {label: '12', value: '12'},
+        {label: '13', value: '13'},
+        {label: '14', value: '14'},
+        {label: '15', value: '15'},
+        {label: '16', value: '16'},
+        {label: '17', value: '17'},
+        {label: '18', value: '18'},
+        {label: '19', value: '19'},
+        {label: '20', value: '20'},
+        {label: '21', value: '21'},
+        {label: '22', value: '22'},
+        {label: '23', value: '23'},
+        {label: '24', value: '24'},
+        {label: '25', value: '25'},
+        {label: '26', value: '26'},
+        {label: '27', value: '27'},
+        {label: '28', value: '28'},
+        {label: '29', value: '29'},
+        {label: '30', value: '30'},
+        {label: '31', value: '31'},
+        {label: '32', value: '32'},
+      ],
       form: {
-        floor: null,
+        floor: [],
         sbDate:  moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),
         cyTime: moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),
         zyTime: moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),
@@ -1205,7 +1246,7 @@ export default {
         community: null,
         building: null,
         unit: null,
-        floor: null,
+        floor: [],
         house: null,
         hasAcid: null,
         isHome: null,
@@ -1257,6 +1298,9 @@ export default {
           this.juSelect(response.data.committee)
         }
         this.form = response.data;
+        if(this.form.floor.length > 0) {
+          this.form.floor = this.form.floor.split(',')
+        }
         this.getInfoByCard()
         this.formLoading = false
       });
@@ -1275,6 +1319,9 @@ export default {
           this.juSelect(response.data.committee)
         }
         this.form = response.data;
+        if(this.form.floor.length > 0) {
+          this.form.floor = this.form.floor.split(',')
+        }
         this.getInfoByCard()
         this.title = "修改阳性人员";
         this.formLoading = false
@@ -1297,6 +1344,9 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          if(this.form.floor.length > 0) {
+            this.form.floor = this.form.floor.toString()
+          }
           if (this.form.id != null) {
             updateYxry(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");