阳性人员加字段

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

@@ -53,6 +53,10 @@ public class Yxry extends BaseEntity
     @Excel(name = "隔离状态")
     private String isolationStatus;
 
+    /** 是否已管控 */
+    @Excel(name = "是否已管控")
+    private String isControl;
+
     /** 小区/村名称 */
     @Excel(name = "小区/村名称")
     private String community;
@@ -157,6 +161,15 @@ public class Yxry extends BaseEntity
     {
         return isolationStatus;
     }
+    public void setIsControl(String isControl)
+    {
+        this.isControl = isControl;
+    }
+
+    public String getIsControl()
+    {
+        return isControl;
+    }
     public void setCommunity(String community)
     {
         this.community = community;
@@ -224,6 +237,7 @@ public class Yxry extends BaseEntity
                 .append("area", getArea())
                 .append("street", getStreet())
                 .append("isolationStatus", getIsolationStatus())
+                .append("isControl", getIsControl())
                 .append("community", getCommunity())
                 .append("unit", getUnit())
                 .append("hasAcid", getHasAcid())

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

@@ -14,6 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="area"    column="area"    />
         <result property="street"    column="street"    />
         <result property="isolationStatus"    column="isolation_status"    />
+        <result property="isControl"    column="is_control"    />
         <result property="community"    column="community"    />
         <result property="unit"    column="unit"    />
         <result property="hasAcid"    column="has_acid"    />
@@ -28,11 +29,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectYxryVo">
-        select id, sb_date, ldry, user_name, card_no, phone, area, street, isolation_status, 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 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.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.gl_place, a.status, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time, a.remark 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
         where a.del_flag = 0
@@ -44,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="area != null  and area != ''"> and a.area = #{area}</if>
         <if test="street != null  and street != ''"> and a.street = #{street}</if>
         <if test="isolationStatus != null  and isolationStatus != ''"> and a.isolation_status = #{isolationStatus}</if>
+        <if test="isControl != null  and isControl != ''"> and a.is_control = #{isControl}</if>
         <if test="community != null  and community != ''"> and a.community like concat('%', #{community}, '%')</if>
         <if test="unit != null  and unit != ''"> and a.unit like concat('%', #{unit}, '%')</if>
         <if test="hasAcid != null  and hasAcid != ''"> and a.has_acid like concat('%', #{hasAcid}, '%')</if>
@@ -68,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="area != null">area,</if>
             <if test="street != null">street,</if>
             <if test="isolationStatus != null">isolation_status,</if>
+            <if test="isControl != null">is_control,</if>
             <if test="community != null">community,</if>
             <if test="unit != null">unit,</if>
             <if test="hasAcid != null">has_acid,</if>
@@ -89,6 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="area != null">#{area},</if>
             <if test="street != null">#{street},</if>
             <if test="isolationStatus != null">#{isolationStatus},</if>
+            <if test="isControl != null">#{isControl},</if>
             <if test="community != null">#{community},</if>
             <if test="unit != null">#{unit},</if>
             <if test="hasAcid != null">#{hasAcid},</if>
@@ -114,6 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="area != null">area = #{area},</if>
             <if test="street != null">street = #{street},</if>
             <if test="isolationStatus != null">isolation_status = #{isolationStatus},</if>
+            <if test="isControl != null">is_control = #{isControl},</if>
             <if test="community != null">community = #{community},</if>
             <if test="unit != null">unit = #{unit},</if>
             <if test="hasAcid != null">has_acid = #{hasAcid},</if>

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

@@ -71,6 +71,16 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="是否已管控" prop="isControl">
+        <el-select v-model="queryParams.isControl" placeholder="请选择是否已管控" clearable>
+          <el-option
+            v-for="dict in dict.type.control_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="小区/村名称" prop="community">
         <el-input
           v-model="queryParams.community"
@@ -192,6 +202,11 @@
           <dict-tag :options="dict.type.isolation_status" :value="scope.row.isolationStatus"/>
         </template>
       </el-table-column>
+      <el-table-column label="是否已管控" align="center" prop="isControl">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.control_status" :value="scope.row.isControl"/>
+        </template>
+      </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="hasAcid" />
@@ -259,7 +274,7 @@
               v-for="dict in dict.type.residential_area"
               :key="dict.value"
               :label="dict.label"
-:value="dict.value"
+              :value="dict.value"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -269,7 +284,7 @@
               v-for="dict in dict.type.street_town"
               :key="dict.value"
               :label="dict.label"
-:value="dict.value"
+              :value="dict.value"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -279,10 +294,19 @@
               v-for="dict in dict.type.isolation_status"
               :key="dict.value"
               :label="dict.label"
-:value="dict.value"
+              :value="dict.value"
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="是否已管控">
+          <el-radio-group v-model="form.isControl">
+            <el-radio
+              v-for="dict in dict.type.control_status"
+              :key="dict.value"
+              :label="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
         <el-form-item label="小区/村名称" prop="community">
           <el-input v-model="form.community" placeholder="请输入小区/村名称" />
         </el-form-item>
@@ -300,7 +324,7 @@
             <el-radio
               v-for="dict in dict.type.sys_normal_disable"
               :key="dict.value"
-:label="dict.value"
+              :label="dict.value"
             >{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
@@ -324,7 +348,7 @@ import { listYxry, getYxry, delYxry, addYxry, updateYxry } from "@/api/system/yx
 
 export default {
   name: "Yxry",
-  dicts: ['isolation_status', 'street_town', 'residential_area', 'sys_normal_disable'],
+  dicts: ['isolation_status', 'street_town', 'residential_area', 'sys_normal_disable', 'control_status'],
   data() {
     return {
       // 遮罩层
@@ -357,6 +381,7 @@ export default {
         area: null,
         street: null,
         isolationStatus: null,
+        isControl: null,
         community: null,
         unit: null,
         hasAcid: null,
@@ -400,6 +425,7 @@ export default {
         area: null,
         street: null,
         isolationStatus: null,
+        isControl: "0",
         community: null,
         unit: null,
         hasAcid: null,