Merge remote-tracking branch 'origin/master'

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/Hscj.java

@@ -61,7 +61,7 @@ public class Hscj extends BaseEntity
     private String cjgh;
 
     /** 采集管号 */
-    @Excel(name = "是否混管", readConverterExp = "0=单管,1=混管")
+    @Excel(name = "是否混管", readConverterExp = "0=单管,1=混管",combo = {"单管","混管"})
     private String isHun;
 
     /** 姓名 */

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/java/com/ruoyi/system/domain/Wzzry.java

@@ -93,11 +93,11 @@ public class Wzzry extends BaseEntity
     private String hospital;
 
     /** 生活能否自理（0：能自理，1：不能自理） */
-    @Excel(name = "生活能否自理", readConverterExp = "0=能自理,1=不能自理")
+    @Excel(name = "生活能否自理", readConverterExp = "0=能自理,1=不能自理",combo = {"能自理","不能自理"})
     private String isSelf;
 
     /** 是否有人照顾（0：是，1：否） */
-    @Excel(name = "是否有人照顾", readConverterExp = "0=是,1=否")
+    @Excel(name = "是否有人照顾", readConverterExp = "0=是,1=否",combo = {"是","否"})
     private String isCare;
 
     /** 同住人数(不包括自己) */
@@ -108,7 +108,7 @@ public class Wzzry extends BaseEntity
     private String remark;
 
     /** 情况是否属实（0：是，1否） */
-    @Excel(name = "情况是否属实", readConverterExp = "0=是,1=否")
+    @Excel(name = "情况是否属实", readConverterExp = "0=是,1=否",combo = {"是","否"})
     private String situationTrue;
 
     /** 包联人员姓名 */

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

@@ -33,7 +33,7 @@ public class Ycsb extends BaseEntity
     private String userName;
 
     /** 抗原结果 */
-    @Excel(name = "抗原结果",readConverterExp = "0=异常,1=正常")
+    @Excel(name = "抗原结果",readConverterExp = "0=异常,1=正常",combo = {"异常","正常"})
     private String kyResult;
 
     /** 是否做核酸 */

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>

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

@@ -206,7 +206,7 @@
       <el-table-column label="人员类别" align="center" prop="peopleType" :show-overflow-tooltip="true"/>
       <el-table-column label="是否阳性" align="center" prop="isPositive" width="180" :show-overflow-tooltip="true">
         <template slot-scope="scope">
-          <span>{{scope.row.isPositive === '0' ?'否' :scope.row.isPositive === '1' ?'是' : ''}}</span>
+          <span>{{scope.row.isPositive === '0' ?'未阳' :scope.row.isPositive === '1' ?'阳' : ''}}</span>
         </template>
       </el-table-column>
       <el-table-column label="仅抗原阳性" align="center" prop="positiveOnly" width="150" :show-overflow-tooltip="true"/>
@@ -351,8 +351,8 @@
           <el-col :span="12">
             <el-form-item label="是否阳性" prop="isPositive">
               <el-select v-model="form.isPositive" placeholder="请选择是否疾控判定阳性" style="width: 100%">
-                <el-option value="1" label="是"></el-option>
-                <el-option value="0" label="否"></el-option>
+                <el-option value="1" label="阳"></el-option>
+                <el-option value="0" label="未阳"></el-option>
               </el-select>
             </el-form-item>
           </el-col>

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

@@ -205,6 +205,7 @@
       </el-table-column>
       <el-table-column label="楼号" width="100" align="center" prop="building" :show-overflow-tooltip="true"/>
       <el-table-column label="单元号" width="100" align="center" prop="unit" :show-overflow-tooltip="true"/>
+      <el-table-column label="楼层" align="center" prop="floor" width="100" :show-overflow-tooltip="true" />
       <el-table-column label="门牌号" width="100" align="center" prop="house" :show-overflow-tooltip="true"/>
       <el-table-column label="家庭住址" width="120" align="center" prop="address" :show-overflow-tooltip="true"/>
       <el-table-column label="转运状态" align="center" prop="zyStatus">
@@ -408,17 +409,31 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="门牌号" prop="house">
-              <el-input :disabled="form.isArea !== '0'" style="width: 90%" v-model="form.house" placeholder="请输入门牌号"/>
+            <el-form-item label="楼层" prop="floor">
+              <el-select :disabled="form.isArea !== '0'" style="width: 100%" v-model="form.floor" clearable 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>
         <el-row>
+          <el-col :span="12">
+            <el-form-item label="门牌号" prop="house">
+              <el-input :disabled="form.isArea !== '0'" style="width: 90%" v-model="form.house" placeholder="请输入门牌号"/>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="家庭住址" prop="address">
               <el-input style="width: 90%" v-model="form.address" placeholder="请输入家庭住址"/>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="12">
             <el-form-item label="转运状态" prop="arrangeDrivers">
               <el-select :disabled="true" style="width: 90%" v-model="form.zyStatus" placeholder="请选择转运状态">
@@ -427,8 +442,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="12">
             <el-form-item label="是否安排司机" prop="arrangeDrivers">
               <el-select style="width: 90%" v-model="form.arrangeDrivers" placeholder="请选择是否安排司机">
@@ -441,6 +454,8 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="12">
             <el-form-item label="备注街道" prop="bzStreet">
               <el-select :disabled="form.isArea !== '0'" style="width: 90%" v-model="form.bzStreet"
@@ -454,8 +469,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="12">
             <el-form-item label="备注住址" prop="bzAddress">
               <el-input :disabled="form.isArea !== '0'" style="width: 90%" v-model="form.bzAddress"
@@ -583,8 +596,51 @@ export default {
       },
       // 表单参数
       form: {
+        floor: [],
         rylb: '阳转阴'
       },
+      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'},
+        {label: '33', value: '33'},
+        {label: '34', value: '34'},
+        {label: '35', value: '35'},
+        {label: '36', value: '36'},
+        {label: '37', value: '37'},
+        {label: '38', value: '38'},
+        {label: '39', value: '39'},
+        {label: '40', value: '40'},
+      ],
       formLoading: false,
       // 表单校验
       rules: {
@@ -881,6 +937,7 @@ export default {
         phone: null,
         street: null,
         committee: null,
+        floor: [],
         community: null,
         address: null,
         zyStatus: null,
@@ -977,6 +1034,9 @@ export default {
         }
         this.formLoading = false
         this.form = response.data
+        if(this.form.floor) {
+          this.form.floor = this.form.floor.split(',')
+        }
       })
     },
     /** 修改按钮操作 */
@@ -993,6 +1053,9 @@ export default {
           this.juSelect(response.data.committee)
         }
         this.form = response.data
+        if(this.form.floor) {
+          this.form.floor = this.form.floor.split(',')
+        }
         this.title = '修改解除隔离人员'
         this.formLoading = false
       })
@@ -1001,6 +1064,9 @@ export default {
     submitForm() {
       this.$refs['form'].validate(valid => {
         if (valid) {
+          if(this.form.floor) {
+            this.form.floor = this.form.floor.toString()
+          }
           if (this.form.id != null) {
             updateJcglry(this.form).then(response => {
               this.$modal.msgSuccess('修改成功')