Commit 8b52dc61 authored by 秦嘉's avatar 秦嘉

Merge remote-tracking branch 'origin/master'

parents cd22e8b7 377985cb
...@@ -157,10 +157,12 @@ public class FcryController extends BaseController ...@@ -157,10 +157,12 @@ public class FcryController extends BaseController
Class<? extends FcryDTO> clazz = new FcryDTO().getClass(); Class<? extends FcryDTO> clazz = new FcryDTO().getClass();
// //
// 获取当前登陆人所属方舱 // 获取当前登陆人所属方舱
SysUser loginUser = getLoginUser().getUser(); String value = DataUtils.getKey(null,null,null,String.valueOf(SecurityUtils.getUserId()),null);
String fcPlace = loginUser.getNickName(); List<SysDictData> fcPlace = DictUtils.getDictCache("shelters");
String[] fcPlaces={fcPlace}; List<String> labels = fcPlace.stream().filter(l->value.equals(l.getDictValue()))
ExcelUtil.setClassExcelAttribute(clazz,"fcPlace","combo",fcPlaces); .map(SysDictData::getDictLabel).collect(Collectors.toList());
ExcelUtil.setClassExcelAttribute(clazz,"fcPlace","combo",labels);
String[] isPositive = {"是","否"}; String[] isPositive = {"是","否"};
ExcelUtil.setClassExcelAttribute( clazz,"isPositive","combo",isPositive); ExcelUtil.setClassExcelAttribute( clazz,"isPositive","combo",isPositive);
String[] positiveOnly = {"是","否"}; String[] positiveOnly = {"是","否"};
......
...@@ -107,8 +107,9 @@ public class GldryController extends BaseController ...@@ -107,8 +107,9 @@ public class GldryController extends BaseController
// 设置 是否阳性 下拉框 // 设置 是否阳性 下拉框
String[] resList = new String[]{"是","否"}; List<SysDictData> isYxs = DictUtils.getDictCache("is_yx");
ExcelUtil.setClassExcelAttribute(clazz,"isYx","combo",resList); String[] isYx=isYxs.stream().map(SysDictData::getDictLabel).toArray(String[]::new);
ExcelUtil.setClassExcelAttribute( clazz,"isYx","combo",isYx);
// // 设置 居住所在地 下拉框 // // 设置 居住所在地 下拉框
// List<SysDictData> dictResidentialArea = sysDictDataMapper.selectDictDataByType("residential_area"); // List<SysDictData> dictResidentialArea = sysDictDataMapper.selectDictDataByType("residential_area");
......
...@@ -47,7 +47,7 @@ public class Gldry extends BaseEntity ...@@ -47,7 +47,7 @@ public class Gldry extends BaseEntity
/** 是否阳性(阳,未阳) */ /** 是否阳性(阳,未阳) */
// 新增字段 // 新增字段
@Excel(name = "是否阳性") @Excel(name = "是否阳性",dictType = "is_yx")
private String isYx; private String isYx;
/** 居住地所在区 */ /** 居住地所在区 */
...@@ -55,15 +55,15 @@ public class Gldry extends BaseEntity ...@@ -55,15 +55,15 @@ public class Gldry extends BaseEntity
private String area; private String area;
/** 街道/镇 */ /** 街道/镇 */
@Excel(name = "街道/镇", dictType = "street_town") @Excel(name = "街道/镇")
private String street; private String street;
/** 居委会 */ /** 居委会 */
@Excel(name = "居委会", dictType = "committee") @Excel(name = "居委会")
private String committee; private String committee;
/** 小区/村名称 */ /** 小区/村名称 */
@Excel(name = "小区/村名称", dictType = "community") @Excel(name = "小区/村名称")
private String community; private String community;
/** 楼号单元号门牌号 */ /** 楼号单元号门牌号 */
......
...@@ -194,40 +194,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -194,40 +194,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim> </trim>
where id = #{id} where id = #{id}
</update> </update>
<update id="updateBatchFcry" parameterType="com.ruoyi.system.domain.Fcry"> <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 update fcry
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">
<if test="fcPlace != null">fc_place = #{fcPlace},</if> <if test="item.fcPlace != null">fc_place = #{item.fcPlace},</if>
<if test="room != null">room = #{room},</if> <if test="item.room != null">room = #{item.room},</if>
<if test="jzName != null">jz_name = #{jzName},</if> <if test="item.jzName != null">jz_name = #{item.jzName},</if>
<if test="cardNo != null">card_no = #{cardNo},</if> <if test="item.cardNo != null">card_no = #{item.cardNo},</if>
<if test="phone != null">phone = #{phone},</if> <if test="item.phone != null">phone = #{item.phone},</if>
<if test="area != null">area = #{area},</if> <if test="item.area != null">area = #{item.area},</if>
<if test="street != null">street = #{street},</if> <if test="item.street != null">street = #{item.street},</if>
<if test="community != null">community = #{community},</if> <if test="item.community != null">community = #{item.community},</if>
<if test="unit != null">unit = #{unit},</if> <if test="item.unit != null">unit = #{item.unit},</if>
<if test="zrTime != null">zr_time = #{zrTime},</if> <if test="item.zrTime != null">zr_time = #{item.zrTime},</if>
<if test="zcTime != null">zc_time = #{zcTime},</if> <if test="item.zcTime != null">zc_time = #{item.zcTime},</if>
<if test="glPlace != null">gl_place = #{glPlace},</if> <if test="item.createBy != null">create_by = #{item.createBy},</if>
<if test="status != null">status = #{status},</if> <if test="item.updateTime != null">update_time = #{item.updateTime},</if>
<if test="delFlag != null">del_flag = #{delFlag},</if> <if test="item.remark != null">remark = #{item.remark},</if>
<if test="createBy != null">create_by = #{createBy},</if> <if test="item.doorplate != null">doorplate = #{item.doorplate},</if>
<if test="createTime != null">create_time = #{createTime},</if> <if test="item.floor != null">floor = #{item.floor},</if>
<if test="updateBy != null">update_by = #{updateBy},</if> <if test="item.committee != null">committee = #{item.committee},</if>
<if test="updateTime != null">update_time = #{updateTime},</if> <if test="item.isPositive != null">is_positive = #{item.isPositive},</if>
<if test="remark != null">remark = #{remark},</if> <if test="item.positiveOnly != null">positive_only = #{item.positiveOnly},</if>
<if test="doorplate != null">doorplate = #{doorplate},</if> <if test="item.checkCard != null">check_card = #{item.checkCard},</if>
<if test="floor != null">floor = #{floor},</if> <if test="item.peopleType != null">people_type = #{item.peopleType},</if>
<if test="committee != null">committee = #{committee},</if> <if test="item.otherFcTime != null">other_fc_time = #{item.otherFcTime},</if>
<if test="positiveOnly != null">positive_only = #{positiveOnly},</if> <if test="item.otherGldTime != null">other_gld_time = #{item.otherGldTime},</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>
</trim> </trim>
where card_no = #{item.cardNo} where card_no = #{item.cardNo}
</foreach> </foreach>
</update> </insert>
<delete id="deleteFcryById" parameterType="Long"> <delete id="deleteFcryById" parameterType="Long">
delete from fcry where id = #{id} delete from fcry where id = #{id}
......
...@@ -225,7 +225,7 @@ ...@@ -225,7 +225,7 @@
</insert> </insert>
<insert id="updateBatchYxry" parameterType="com.ruoyi.system.domain.Yxry"> <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 update yxry
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">
<if test="item.sbDate != null">sb_date = #{item.sbDate},</if> <if test="item.sbDate != null">sb_date = #{item.sbDate},</if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment