Merge remote-tracking branch 'origin/master'

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

@@ -157,10 +157,12 @@ public class FcryController extends BaseController
         Class<? extends FcryDTO>  clazz = new FcryDTO().getClass();
         //
         // 获取当前登陆人所属方舱
-        SysUser loginUser = getLoginUser().getUser();
-        String fcPlace = loginUser.getNickName();
-        String[] fcPlaces={fcPlace};
-        ExcelUtil.setClassExcelAttribute(clazz,"fcPlace","combo",fcPlaces);
+        String value = DataUtils.getKey(null,null,null,String.valueOf(SecurityUtils.getUserId()),null);
+        List<SysDictData> fcPlace = DictUtils.getDictCache("shelters");
+        List<String> labels = fcPlace.stream().filter(l->value.equals(l.getDictValue()))
+                .map(SysDictData::getDictLabel).collect(Collectors.toList());
+
+        ExcelUtil.setClassExcelAttribute(clazz,"fcPlace","combo",labels);
         String[] isPositive = {"是","否"};
         ExcelUtil.setClassExcelAttribute( clazz,"isPositive","combo",isPositive);
         String[] positiveOnly = {"是","否"};

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

@@ -194,40 +194,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </trim>
         where id = #{id}
     </update>
-    <update id="updateBatchFcry" parameterType="com.ruoyi.system.domain.Fcry">
-        <foreach item="item" index="index" collection="list" separator=",">
+    <insert id="updateBatchFcry" parameterType="com.ruoyi.system.domain.Fcry">
+        <foreach item="item" index="index" collection="list" separator=";">
             update fcry
             <trim prefix="SET" suffixOverrides=",">
-                <if test="fcPlace != null">fc_place = #{fcPlace},</if>
-                <if test="room != null">room = #{room},</if>
-                <if test="jzName != null">jz_name = #{jzName},</if>
-                <if test="cardNo != null">card_no = #{cardNo},</if>
-                <if test="phone != null">phone = #{phone},</if>
-                <if test="area != null">area = #{area},</if>
-                <if test="street != null">street = #{street},</if>
-                <if test="community != null">community = #{community},</if>
-                <if test="unit != null">unit = #{unit},</if>
-                <if test="zrTime != null">zr_time = #{zrTime},</if>
-                <if test="zcTime != null">zc_time = #{zcTime},</if>
-                <if test="glPlace != null">gl_place = #{glPlace},</if>
-                <if test="status != null">status = #{status},</if>
-                <if test="delFlag != null">del_flag = #{delFlag},</if>
-                <if test="createBy != null">create_by = #{createBy},</if>
-                <if test="createTime != null">create_time = #{createTime},</if>
-                <if test="updateBy != null">update_by = #{updateBy},</if>
-                <if test="updateTime != null">update_time = #{updateTime},</if>
-                <if test="remark != null">remark = #{remark},</if>
-                <if test="doorplate != null">doorplate = #{doorplate},</if>
-                <if test="floor != null">floor = #{floor},</if>
-                <if test="committee != null">committee = #{committee},</if>
-                <if test="positiveOnly != null">positive_only = #{positiveOnly},</if>
-                <if test="isPositive != null">is_positive = #{isPositive},</if>
-                <if test="checkCard != null">check_card = #{checkCard},</if>
-                <if test="peopleType != null">people_type = #{peopleType},</if>
+                <if test="item.fcPlace != null">fc_place = #{item.fcPlace},</if>
+                <if test="item.room != null">room = #{item.room},</if>
+                <if test="item.jzName != null">jz_name = #{item.jzName},</if>
+                <if test="item.cardNo != null">card_no = #{item.cardNo},</if>
+                <if test="item.phone != null">phone = #{item.phone},</if>
+                <if test="item.area != null">area = #{item.area},</if>
+                <if test="item.street != null">street = #{item.street},</if>
+                <if test="item.community != null">community = #{item.community},</if>
+                <if test="item.unit != null">unit = #{item.unit},</if>
+                <if test="item.zrTime != null">zr_time = #{item.zrTime},</if>
+                <if test="item.zcTime != null">zc_time = #{item.zcTime},</if>
+                <if test="item.createBy != null">create_by = #{item.createBy},</if>
+                <if test="item.updateTime != null">update_time = #{item.updateTime},</if>
+                <if test="item.remark != null">remark = #{item.remark},</if>
+                <if test="item.doorplate != null">doorplate = #{item.doorplate},</if>
+                <if test="item.floor != null">floor = #{item.floor},</if>
+                <if test="item.committee != null">committee = #{item.committee},</if>
+                <if test="item.isPositive != null">is_positive = #{item.isPositive},</if>
+                <if test="item.positiveOnly != null">positive_only = #{item.positiveOnly},</if>
+                <if test="item.checkCard != null">check_card = #{item.checkCard},</if>
+                <if test="item.peopleType != null">people_type = #{item.peopleType},</if>
+                <if test="item.otherFcTime != null">other_fc_time = #{item.otherFcTime},</if>
+                <if test="item.otherGldTime != null">other_gld_time = #{item.otherGldTime},</if>
             </trim>
             where card_no = #{item.cardNo}
         </foreach>
-    </update>
+    </insert>
 
     <delete id="deleteFcryById" parameterType="Long">
         delete from fcry where id = #{id}

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>