修改 隔离点导入

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

@@ -22,7 +22,7 @@ public class Fcry extends BaseEntity
     private Long id;
 
     /** 方舱名称 */
-    @Excel(name = "方舱名称")
+    @Excel(name = "方舱名称",dictType = "fcPlace")
     private String fcPlace;
 
     /** 房间号 */

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GldryServiceImpl.java

@@ -161,7 +161,6 @@ public class GldryServiceImpl implements IGldryService
                     && StringUtils.isNotEmpty(gldry.getJzName())
                     && StringUtils.isNotEmpty(gldry.getCardNo())
                     && StringUtils.isNotEmpty(gldry.getPhone())
-                    && StringUtils.isNotEmpty(gldry.getIsYx())
                     && StringUtils.isNotEmpty(gldry.getArea())
                     && gldry.getZrTime()!=null
             ){

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

@@ -201,6 +201,7 @@
             <if test="glName != null">gl_name,</if>
             <if test="fcName != null">fc_name,</if>
             <if test="address != null">address,</if>
+            is_deisolation,
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="sbDate != null">#{sbDate},</if>
@@ -239,6 +240,7 @@
             <if test="glName != null">#{glName},</if>
             <if test="fcName != null">#{fcName},</if>
             <if test="address != null">#{address},</if>
+            null,
         </trim>
     </insert>
 
@@ -246,13 +248,13 @@
         insert into yxry
         (sb_date,ldry,user_name,card_no,phone,area,street,isolation_status,is_control,community,unit,building,
         house,has_acid,gl_place,create_by,create_time,remark,is_yz,is_yin,is_home,
-        risk_source,user_type,zy_time,check_card,gl_name,fc_name,address,committee,floor) values
+        risk_source,user_type,zy_time,check_card,gl_name,fc_name,address,committee,floor,is_deisolation) values
         <foreach item="item" index="index" collection="list" separator=",">
             (#{item.sbDate},#{item.ldry},#{item.userName},#{item.cardNo},#{item.phone},#{item.area},#{item.street},
             #{item.isolationStatus},#{item.isControl},#{item.community},#{item.unit},#{item.building},#{item.house},
             #{item.hasAcid},#{item.glPlace},#{item.createBy},#{item.createTime},#{item.remark},#{item.isYz},#{item.isYin},
             #{item.isHome},#{item.riskSource},#{item.userType},#{item.zyTime},#{item.checkCard},#{item.glName},#{item.fcName},
-            #{item.address},#{item.committee},#{item.floor})
+            #{item.address},#{item.committee},#{item.floor},null)
         </foreach>
     </insert>