阳性人员加字段回显

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

@@ -80,6 +80,9 @@ public class Yxry extends BaseEntity
     /** 删除标志（0代表存在 2代表删除） */
     private String delFlag;
 
+    /** 住址 */
+    private String address;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -251,4 +254,12 @@ public class Yxry extends BaseEntity
                 .append("remark", getRemark())
                 .toString();
     }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
 }

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

@@ -26,16 +26,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="remark"    column="remark"    />
+        <result property="address"    column="address"    />
     </resultMap>
 
     <sql id="selectYxryVo">
-        select id, sb_date, ldry, user_name, card_no, phone, area, street, isolation_status, is_control, community, unit, has_acid, gl_place, status, del_flag, create_by, create_time, update_by, update_time, remark from yxry
+        select id, sb_date, ldry, user_name, card_no, phone, area, street, isolation_status, is_control, community, unit,
+               has_acid, gl_place, status, del_flag, create_by, create_time, update_by, update_time, remark, address from yxry
     </sql>
 
     <select id="selectYxryList" parameterType="Yxry" resultMap="YxryResult">
-        select a.id, a.sb_date, a.ldry, a.user_name, a.card_no, a.phone, a.area, a.street, a.isolation_status, a.is_control, a.community, a.unit, a.has_acid, a.gl_place, a.status, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time, a.remark from yxry a
+        select a.id, a.sb_date, a.ldry, a.user_name, a.card_no, a.phone, a.area, a.street, a.isolation_status,
+               a.is_control, a.community, a.unit, a.has_acid, a.status, a.del_flag, a.create_by,
+               a.create_time, a.update_by, a.update_time, a.remark ,CONCAT(f.fc_place,f.room) gl_place, a.address
+        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
+        left join fcry f on f.card_no = a.card_no
         where a.del_flag = 0
         <if test="sbDate != null "> and a.sb_date = #{sbDate}</if>
         <if test="ldry != null  and ldry != ''"> and a.ldry like concat('%', #{ldry}, '%')</if>
@@ -52,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="glPlace != null  and glPlace != ''"> and a.gl_place like concat('%', #{glPlace}, '%')</if>
         <if test="status != null  and status != ''"> and a.status = #{status}</if>
         ${params.dataScope}
+        order by a.create_time desc ,a.id desc
     </select>
 
     <select id="selectYxryById" parameterType="Long" resultMap="YxryResult">

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

@@ -199,6 +199,7 @@
       </el-table-column>
       <el-table-column label="小区/村名称" align="center" prop="community" />
       <el-table-column label="楼号单元号门牌号" align="center" prop="unit" />
+      <el-table-column label="住址" align="center" prop="address" />
       <el-table-column label="隔离状态" align="center" prop="isolationStatus">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.isolation_status" :value="scope.row.isolationStatus"/>
@@ -316,7 +317,7 @@
         <el-form-item label="转运状态" prop="hasAcid">
           <el-input v-model="form.hasAcid" placeholder="请输入转运状态" />
         </el-form-item>
-        <el-form-item v-if="title == '添加阳性人员'" label="隔离位置" prop="glPlace">
+        <el-form-item v-if="form.id" label="隔离位置" prop="glPlace">
           <el-input v-model="form.glPlace" placeholder="请输入隔离位置" disabled/>
         </el-form-item>
         <el-form-item label="状态">