添加 小区封控导入

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

@@ -107,8 +107,9 @@ public class GldryController extends BaseController
 
 
         // 设置 是否阳性 下拉框
-        String[] resList = new String[]{"是","否"};
-        ExcelUtil.setClassExcelAttribute(clazz,"isYx","combo",resList);
+        List<SysDictData> isYxs = DictUtils.getDictCache("is_yx");
+        String[] isYx=isYxs.stream().map(SysDictData::getDictLabel).toArray(String[]::new);
+        ExcelUtil.setClassExcelAttribute( clazz,"isYx","combo",isYx);
 
 //        // 设置 居住所在地 下拉框
 //        List<SysDictData> dictResidentialArea = sysDictDataMapper.selectDictDataByType("residential_area");

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

@@ -47,7 +47,7 @@ public class Gldry extends BaseEntity
 
     /** 是否阳性（阳，未阳） */
     // 新增字段
-    @Excel(name = "是否阳性")
+    @Excel(name = "是否阳性",dictType = "is_yx")
     private String isYx;
 
     /** 居住地所在区 */
@@ -55,15 +55,15 @@ public class Gldry extends BaseEntity
     private String area;
 
     /** 街道/镇 */
-    @Excel(name = "街道/镇", dictType = "street_town")
+    @Excel(name = "街道/镇")
     private String street;
 
     /** 居委会 */
-    @Excel(name = "居委会", dictType = "committee")
+    @Excel(name = "居委会")
     private String committee;
 
     /** 小区/村名称 */
-    @Excel(name = "小区/村名称", dictType = "community")
+    @Excel(name = "小区/村名称")
     private String community;
 
     /** 楼号单元号门牌号 */

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

@@ -195,7 +195,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
     <insert id="updateBatchFcry" parameterType="com.ruoyi.system.domain.Fcry">
-        <foreach item="item" index="index" collection="list" separator=",">
+        <foreach item="item" index="index" collection="list" separator=";">
             update fcry
             <trim prefix="SET" suffixOverrides=",">
                 <if test="item.fcPlace != null">fc_place = #{item.fcPlace},</if>

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

@@ -225,7 +225,7 @@
     </insert>
 
     <insert id="updateBatchYxry" parameterType="com.ruoyi.system.domain.Yxry">
-        <foreach item="item" index="index" collection="list" separator=",">
+        <foreach item="item" index="index" collection="list" separator=";">
             update yxry
                 <trim prefix="SET" suffixOverrides=",">
                     <if test="item.sbDate != null">sb_date = #{item.sbDate},</if>