小区封控，方舱人员管理

ruoyi-common/src/main/java/com/ruoyi/common/utils/DataUtils.java

@@ -16,8 +16,8 @@ public class DataUtils {
     public static String dateMap = "{\"area\":{ \"1\":\"11\",\"2\":\"11\",\"3\":\"11\",\"4\":\"11\",\"5\":\"11\",\"6\":\"11\",\"7\":\"11\",\"8\":\"11\",\"9\":\"11\",\"10\":\"11\",\"11\":\"11\",\"12\":\"11\",\"13\":\"11\",\"14\":\"11\",\"15\":\"11\",\"16\":\"11\",\"17\":\"11\",\"18\":\"11\",\"19\":\"11\",\"20\":\"11\",\"21\":\"11\",\"22\":\"11\",\"23\":\"11\",\"24\":\"11\"}," +
             "\"street\":{\"1\":\"11\",\"2\":\"11\", \"3\":\"11\", \"4\":\"11\",\"5\":\"11\", \"6\":\"11\", \"7\":\"11\", \"8\":\"11\", \"9\":\"11\", \"10\":\"11\", \"11\":\"11\"}," +
             "\"community\":{\"1\":\"11\",\"2\":\"11\", \"3\":\"11\",\"4\":\"11\", \"5\":\"11\", \"6\":\"11\", \"7\":\"11\", \"8\":\"11\", \"9\":\"11\", \"10\":\"11\", \"11\":\"11\", \"12\":\"11\", \"13\":\"11\", \"14\":\"11\", \"15\":\"11\", \"16\":\"11\", \"17\":\"11\", \"18\":\"11\", \"19\":\"11\", \"20\":\"11\", \"21\":\"11\", \"22\":\"11\", \"23\":\"11\", \"24\":\"11\", \"25\":\"11\",\"26\":\"11\",\"27\":\"11\",\"28\":\"11\",\"29\":\"11\",\"30\":\"11\",\"31\":\"11\",\"32\":\"11\", \"33\":\"11\", \"34\":\"11\", \"35\":\"11\", \"36\":\"11\", \"37\":\"11\", \"38\":\"11\", \"39\":\"11\", \"40\":\"11\", \"41\":\"11\", \"42\":\"11\", \"43\":\"11\", \"44\":\"11\", \"45\":\"11\", \"46\":\"11\", \"47\":\"11\", \"48\":\"11\"}," +
-            "\"shelters\":{\"1\":\"11\",\"2\":\"11\", \"3\":\"11\", \"4\":\"11\",\"5\":\"11\", \"6\":\"11\", \"7\":\"11\", \"8\":\"11\", \"9\":\"11\", \"10\":\"11\"}," +
-            "\"isolation\":{\"1\":\"11\",\"2\":\"11\", \"3\":\"11\", \"4\":\"11\",\"5\":\"11\", \"6\":\"11\", \"7\":\"11\", \"8\":\"11\"}}";
+            "\"shelters\":{\"1\":\"1\",\"2\":\"11\", \"3\":\"11\", \"4\":\"11\",\"5\":\"11\", \"6\":\"11\", \"7\":\"11\", \"8\":\"11\", \"9\":\"11\", \"10\":\"11\"}," +
+            "\"isolation\":{\"1\":\"1\",\"2\":\"11\", \"3\":\"11\", \"4\":\"11\",\"5\":\"11\", \"6\":\"11\", \"7\":\"11\", \"8\":\"11\"}}";
 
     public static String getValue(String area, String street, String community) {
         JSONObject map = JSON.parseObject(dateMap);

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

@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </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
+        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
         from fkqk a
         left join sys_user u on u.user_id = a.create_by

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

@@ -271,7 +271,7 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="方舱名称" prop="fcPlace">
-          <el-select v-model="form.fcPlace" placeholder="请选择方舱名称" clearable>
+          <el-select v-model="form.fcPlace" placeholder="请选择方舱名称" :disabled="true">
             <el-option
               v-for="dict in dict.type.shelters"
               :key="dict.value"
@@ -674,7 +674,7 @@ export default {
         type : 'shelters'
       }
       getGlPlace(params).then(res => {
-        this.form.fcPlace = res.data
+        this.form.fcPlace = res.msg
       })
       this.open = true;
       this.title = "添加方舱人员";

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

@@ -142,7 +142,7 @@
       <el-table-column label="楼号" align="center" prop="floor" />
       <el-table-column label="单元号" align="center" prop="unit" />
       <el-table-column label="封控明细" align="center" prop="fkDetailed" />
-      <el-table-column label="涉及封控户数" align="center" prop="isHs" width="180"/>
+      <el-table-column label="涉及封控户数" align="center" prop="fkHs" width="180"/>
       <el-table-column label="涉及封控人数" align="center" prop="fkRs" width="180"/>
       <el-table-column label="封控时间" align="center" prop="fkTime" width="180">
         <template slot-scope="scope">
@@ -344,6 +344,13 @@ export default {
   name: "Fkqk",
   dicts: ['street_town', 'residential_area', 'sys_normal_disable'],
   data() {
+    var validateStartTime = (rule, value, callback) => {
+      if (value === undefined || value === '' || value === null) {
+        callback(new Error('请选择封控时间'))
+      } else {
+        callback()
+      }
+    };
     return {
       importLoading: false,
       // 导入列表
@@ -401,7 +408,7 @@ export default {
         fkRs: [{ required: true, message: '请输入涉及封控人数', trigger: 'blur' }],
         street: [{ required: true, message: '请选择街道/镇', trigger: 'change' }],
         area: [{ required: true, message: '请选择所在区', trigger: 'change' }],
-        fkTime: [{ type: 'date', required: true, message: '请选择封控时间', trigger: 'change' }]
+        fkTime: [{ required: true, validator: validateStartTime, trigger: 'blur' }]
       }
     };
   },

sql/ry_20220822.sql

@@ -701,7 +701,8 @@ ALTER TABLE `ry`.`fkqk`
     ADD COLUMN `fk_detailed` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '封控明细' AFTER `hs_time`;
 ALTER TABLE `ry`.`fkqk`
     ADD COLUMN `area` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '所在区' AFTER `id`;
-
+ALTER TABLE `ry`.`fkqk`
+    ADD COLUMN `committee` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '居委会' AFTER `community`;
 /**
   方舱人员管理表
  */