Skip to content

D
data_management_system
Commit 0f43cfb1 authored by gaoyingwei's avatar gaoyingwei
Browse files
Options

阳性人员加字段

parent 3e586302
Hide whitespace changes
Inline Side-by-side
Showing with 125 additions and 80 deletions
ruoyi-system/src/main/java/com/ruoyi/system/domain/Yxry.java
View file @ 0f43cfb1
...@@ -9,7 +9,7 @@ import com.ruoyi.common.core.domain.BaseEntity; ...@@ -9,7 +9,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
/** /**
* 阳性人员对象 yxry * 阳性人员对象 yxry
* *
* @author ruoyi * @author ruoyi
* @date 2022-11-28 * @date 2022-11-28
*/ */
...@@ -53,6 +53,10 @@ public class Yxry extends BaseEntity ...@@ -53,6 +53,10 @@ public class Yxry extends BaseEntity
@Excel(name = "隔离状态") @Excel(name = "隔离状态")
private String isolationStatus; private String isolationStatus;
/** 是否已管控 */
@Excel(name = "是否已管控")
private String isControl;
/** 小区/村名称 */ /** 小区/村名称 */
@Excel(name = "小区/村名称") @Excel(name = "小区/村名称")
private String community; private String community;
...@@ -76,138 +80,147 @@ public class Yxry extends BaseEntity ...@@ -76,138 +80,147 @@ public class Yxry extends BaseEntity
/** 删除标志（0代表存在 2代表删除） */ /** 删除标志（0代表存在 2代表删除） */
private String delFlag; private String delFlag;
public void setId(Long id) public void setId(Long id)
{ {
this.id = id; this.id = id;
} }
public Long getId() public Long getId()
{ {
return id; return id;
} }
public void setSbDate(Date sbDate) public void setSbDate(Date sbDate)
{ {
this.sbDate = sbDate; this.sbDate = sbDate;
} }
public Date getSbDate() public Date getSbDate()
{ {
return sbDate; return sbDate;
} }
public void setLdry(String ldry) public void setLdry(String ldry)
{ {
this.ldry = ldry; this.ldry = ldry;
} }
public String getLdry() public String getLdry()
{ {
return ldry; return ldry;
} }
public void setUserName(String userName) public void setUserName(String userName)
{ {
this.userName = userName; this.userName = userName;
} }
public String getUserName() public String getUserName()
{ {
return userName; return userName;
} }
public void setCardNo(String cardNo) public void setCardNo(String cardNo)
{ {
this.cardNo = cardNo; this.cardNo = cardNo;
} }
public String getCardNo() public String getCardNo()
{ {
return cardNo; return cardNo;
} }
public void setPhone(String phone) public void setPhone(String phone)
{ {
this.phone = phone; this.phone = phone;
} }
public String getPhone() public String getPhone()
{ {
return phone; return phone;
} }
public void setArea(String area) public void setArea(String area)
{ {
this.area = area; this.area = area;
} }
public String getArea() public String getArea()
{ {
return area; return area;
} }
public void setStreet(String street) public void setStreet(String street)
{ {
this.street = street; this.street = street;
} }
public String getStreet() public String getStreet()
{ {
return street; return street;
} }
public void setIsolationStatus(String isolationStatus) public void setIsolationStatus(String isolationStatus)
{ {
this.isolationStatus = isolationStatus; this.isolationStatus = isolationStatus;
} }
public String getIsolationStatus() public String getIsolationStatus()
{ {
return isolationStatus; return isolationStatus;
} }
public void setCommunity(String community) public void setIsControl(String isControl)
{
this.isControl = isControl;
}
public String getIsControl()
{
return isControl;
}
public void setCommunity(String community)
{ {
this.community = community; this.community = community;
} }
public String getCommunity() public String getCommunity()
{ {
return community; return community;
} }
public void setUnit(String unit) public void setUnit(String unit)
{ {
this.unit = unit; this.unit = unit;
} }
public String getUnit() public String getUnit()
{ {
return unit; return unit;
} }
public void setHasAcid(String hasAcid) public void setHasAcid(String hasAcid)
{ {
this.hasAcid = hasAcid; this.hasAcid = hasAcid;
} }
public String getHasAcid() public String getHasAcid()
{ {
return hasAcid; return hasAcid;
} }
public void setGlPlace(String glPlace) public void setGlPlace(String glPlace)
{ {
this.glPlace = glPlace; this.glPlace = glPlace;
} }
public String getGlPlace() public String getGlPlace()
{ {
return glPlace; return glPlace;
} }
public void setStatus(String status) public void setStatus(String status)
{ {
this.status = status; this.status = status;
} }
public String getStatus() public String getStatus()
{ {
return status; return status;
} }
public void setDelFlag(String delFlag) public void setDelFlag(String delFlag)
{ {
this.delFlag = delFlag; this.delFlag = delFlag;
} }
public String getDelFlag() public String getDelFlag()
{ {
return delFlag; return delFlag;
} }
...@@ -215,26 +228,27 @@ public class Yxry extends BaseEntity ...@@ -215,26 +228,27 @@ public class Yxry extends BaseEntity
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId()) .append("id", getId())
.append("sbDate", getSbDate()) .append("sbDate", getSbDate())
.append("ldry", getLdry()) .append("ldry", getLdry())
.append("userName", getUserName()) .append("userName", getUserName())
.append("cardNo", getCardNo()) .append("cardNo", getCardNo())
.append("phone", getPhone()) .append("phone", getPhone())
.append("area", getArea()) .append("area", getArea())
.append("street", getStreet()) .append("street", getStreet())
.append("isolationStatus", getIsolationStatus()) .append("isolationStatus", getIsolationStatus())
.append("community", getCommunity()) .append("isControl", getIsControl())
.append("unit", getUnit()) .append("community", getCommunity())
.append("hasAcid", getHasAcid()) .append("unit", getUnit())
.append("glPlace", getGlPlace()) .append("hasAcid", getHasAcid())
.append("status", getStatus()) .append("glPlace", getGlPlace())
.append("delFlag", getDelFlag()) .append("status", getStatus())
.append("createBy", getCreateBy()) .append("delFlag", getDelFlag())
.append("createTime", getCreateTime()) .append("createBy", getCreateBy())
.append("updateBy", getUpdateBy()) .append("createTime", getCreateTime())
.append("updateTime", getUpdateTime()) .append("updateBy", getUpdateBy())
.append("remark", getRemark()) .append("updateTime", getUpdateTime())
.toString(); .append("remark", getRemark())
.toString();
} }
} }
ruoyi-system/src/main/resources/mapper/system/YxryMapper.xml
View file @ 0f43cfb1
...@@ -14,6 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -14,6 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="area" column="area" /> <result property="area" column="area" />
<result property="street" column="street" /> <result property="street" column="street" />
<result property="isolationStatus" column="isolation_status" /> <result property="isolationStatus" column="isolation_status" />
<result property="isControl" column="is_control" />
<result property="community" column="community" /> <result property="community" column="community" />
<result property="unit" column="unit" /> <result property="unit" column="unit" />
<result property="hasAcid" column="has_acid" /> <result property="hasAcid" column="has_acid" />
...@@ -28,35 +29,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -28,35 +29,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectYxryVo"> <sql id="selectYxryVo">
select id, sb_date, ldry, user_name, card_no, phone, area, street, isolation_status, community, unit, has_acid, gl_place, status, del_flag, create_by, create_time, update_by, update_time, remark from yxry select id, sb_date, ldry, user_name, card_no, phone, area, street, isolation_status, is_control, community, unit, has_acid, gl_place, status, del_flag, create_by, create_time, update_by, update_time, remark from yxry
</sql> </sql>
<select id="selectYxryList" parameterType="Yxry" resultMap="YxryResult"> <select id="selectYxryList" parameterType="Yxry" resultMap="YxryResult">
select a.id, a.sb_date, a.ldry, a.user_name, a.card_no, a.phone, a.area, a.street, a.isolation_status, a.community, a.unit, a.has_acid, a.gl_place, a.status, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time, a.remark from yxry a select a.id, a.sb_date, a.ldry, a.user_name, a.card_no, a.phone, a.area, a.street, a.isolation_status, a.is_control, a.community, a.unit, a.has_acid, a.gl_place, a.status, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time, a.remark from yxry a
left join sys_user u on u.user_id = a.create_by left join sys_user u on u.user_id = a.create_by
left join sys_dept d on u.dept_id = d.dept_id left join sys_dept d on u.dept_id = d.dept_id
where a.del_flag = 0 where a.del_flag = 0
<if test="sbDate != null "> and a.sb_date = #{sbDate}</if> <if test="sbDate != null "> and a.sb_date = #{sbDate}</if>
<if test="ldry != null and ldry != ''"> and a.ldry like concat('%', #{ldry}, '%')</if> <if test="ldry != null and ldry != ''"> and a.ldry like concat('%', #{ldry}, '%')</if>
<if test="userName != null and userName != ''"> and a.user_name like concat('%', #{userName}, '%')</if> <if test="userName != null and userName != ''"> and a.user_name like concat('%', #{userName}, '%')</if>
<if test="cardNo != null and cardNo != ''"> and a.card_no like concat('%', #{cardNo}, '%')</if> <if test="cardNo != null and cardNo != ''"> and a.card_no like concat('%', #{cardNo}, '%')</if>
<if test="phone != null and phone != ''"> and a.phone like concat('%', #{phone}, '%')</if> <if test="phone != null and phone != ''"> and a.phone like concat('%', #{phone}, '%')</if>
<if test="area != null and area != ''"> and a.area = #{area}</if> <if test="area != null and area != ''"> and a.area = #{area}</if>
<if test="street != null and street != ''"> and a.street = #{street}</if> <if test="street != null and street != ''"> and a.street = #{street}</if>
<if test="isolationStatus != null and isolationStatus != ''"> and a.isolation_status = #{isolationStatus}</if> <if test="isolationStatus != null and isolationStatus != ''"> and a.isolation_status = #{isolationStatus}</if>
<if test="community != null and community != ''"> and a.community like concat('%', #{community}, '%')</if> <if test="isControl != null and isControl != ''"> and a.is_control = #{isControl}</if>
<if test="unit != null and unit != ''"> and a.unit like concat('%', #{unit}, '%')</if> <if test="community != null and community != ''"> and a.community like concat('%', #{community}, '%')</if>
<if test="hasAcid != null and hasAcid != ''"> and a.has_acid like concat('%', #{hasAcid}, '%')</if> <if test="unit != null and unit != ''"> and a.unit like concat('%', #{unit}, '%')</if>
<if test="glPlace != null and glPlace != ''"> and a.gl_place like concat('%', #{glPlace}, '%')</if> <if test="hasAcid != null and hasAcid != ''"> and a.has_acid like concat('%', #{hasAcid}, '%')</if>
<if test="status != null and status != ''"> and a.status = #{status}</if> <if test="glPlace != null and glPlace != ''"> and a.gl_place like concat('%', #{glPlace}, '%')</if>
<if test="status != null and status != ''"> and a.status = #{status}</if>
${params.dataScope} ${params.dataScope}
</select> </select>
<select id="selectYxryById" parameterType="Long" resultMap="YxryResult"> <select id="selectYxryById" parameterType="Long" resultMap="YxryResult">
<include refid="selectYxryVo"/> <include refid="selectYxryVo"/>
where id = #{id} where id = #{id}
</select> </select>
<insert id="insertYxry" parameterType="Yxry" useGeneratedKeys="true" keyProperty="id"> <insert id="insertYxry" parameterType="Yxry" useGeneratedKeys="true" keyProperty="id">
insert into yxry insert into yxry
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
...@@ -68,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -68,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="area != null">area,</if> <if test="area != null">area,</if>
<if test="street != null">street,</if> <if test="street != null">street,</if>
<if test="isolationStatus != null">isolation_status,</if> <if test="isolationStatus != null">isolation_status,</if>
<if test="isControl != null">is_control,</if>
<if test="community != null">community,</if> <if test="community != null">community,</if>
<if test="unit != null">unit,</if> <if test="unit != null">unit,</if>
<if test="hasAcid != null">has_acid,</if> <if test="hasAcid != null">has_acid,</if>
...@@ -79,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -79,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateBy != null">update_by,</if> <if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if> <if test="updateTime != null">update_time,</if>
<if test="remark != null">remark,</if> <if test="remark != null">remark,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="sbDate != null">#{sbDate},</if> <if test="sbDate != null">#{sbDate},</if>
<if test="ldry != null">#{ldry},</if> <if test="ldry != null">#{ldry},</if>
...@@ -89,6 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -89,6 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="area != null">#{area},</if> <if test="area != null">#{area},</if>
<if test="street != null">#{street},</if> <if test="street != null">#{street},</if>
<if test="isolationStatus != null">#{isolationStatus},</if> <if test="isolationStatus != null">#{isolationStatus},</if>
<if test="isControl != null">#{isControl},</if>
<if test="community != null">#{community},</if> <if test="community != null">#{community},</if>
<if test="unit != null">#{unit},</if> <if test="unit != null">#{unit},</if>
<if test="hasAcid != null">#{hasAcid},</if> <if test="hasAcid != null">#{hasAcid},</if>
...@@ -100,7 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -100,7 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateBy != null">#{updateBy},</if> <if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if> <if test="updateTime != null">#{updateTime},</if>
<if test="remark != null">#{remark},</if> <if test="remark != null">#{remark},</if>
</trim> </trim>
</insert> </insert>
<update id="updateYxry" parameterType="Yxry"> <update id="updateYxry" parameterType="Yxry">
...@@ -114,6 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -114,6 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="area != null">area = #{area},</if> <if test="area != null">area = #{area},</if>
<if test="street != null">street = #{street},</if> <if test="street != null">street = #{street},</if>
<if test="isolationStatus != null">isolation_status = #{isolationStatus},</if> <if test="isolationStatus != null">isolation_status = #{isolationStatus},</if>
<if test="isControl != null">is_control = #{isControl},</if>
<if test="community != null">community = #{community},</if> <if test="community != null">community = #{community},</if>
<if test="unit != null">unit = #{unit},</if> <if test="unit != null">unit = #{unit},</if>
<if test="hasAcid != null">has_acid = #{hasAcid},</if> <if test="hasAcid != null">has_acid = #{hasAcid},</if>
......
ruoyi-ui/src/views/system/yxry/index.vue
View file @ 0f43cfb1
...@@ -71,6 +71,16 @@ ...@@ -71,6 +71,16 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="是否已管控" prop="isControl">
<el-select v-model="queryParams.isControl" placeholder="请选择是否已管控" clearable>
<el-option
v-for="dict in dict.type.control_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="小区/村名称" prop="community"> <el-form-item label="小区/村名称" prop="community">
<el-input <el-input
v-model="queryParams.community" v-model="queryParams.community"
...@@ -192,6 +202,11 @@ ...@@ -192,6 +202,11 @@
<dict-tag :options="dict.type.isolation_status" :value="scope.row.isolationStatus"/> <dict-tag :options="dict.type.isolation_status" :value="scope.row.isolationStatus"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="是否已管控" align="center" prop="isControl">
<template slot-scope="scope">
<dict-tag :options="dict.type.control_status" :value="scope.row.isControl"/>
</template>
</el-table-column>
<el-table-column label="小区/村名称" align="center" prop="community" /> <el-table-column label="小区/村名称" align="center" prop="community" />
<el-table-column label="楼号单元号门牌号" align="center" prop="unit" /> <el-table-column label="楼号单元号门牌号" align="center" prop="unit" />
<el-table-column label="转运状态" align="center" prop="hasAcid" /> <el-table-column label="转运状态" align="center" prop="hasAcid" />
...@@ -235,10 +250,10 @@ ...@@ -235,10 +250,10 @@
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="日期" prop="sbDate"> <el-form-item label="日期" prop="sbDate">
<el-date-picker clearable <el-date-picker clearable
v-model="form.sbDate" v-model="form.sbDate"
type="datetime" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择日期"> placeholder="请选择日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="流调人员" prop="ldry"> <el-form-item label="流调人员" prop="ldry">
...@@ -259,7 +274,7 @@ ...@@ -259,7 +274,7 @@
v-for="dict in dict.type.residential_area" v-for="dict in dict.type.residential_area"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -269,7 +284,7 @@ ...@@ -269,7 +284,7 @@
v-for="dict in dict.type.street_town" v-for="dict in dict.type.street_town"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -279,10 +294,19 @@ ...@@ -279,10 +294,19 @@
v-for="dict in dict.type.isolation_status" v-for="dict in dict.type.isolation_status"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="是否已管控">
<el-radio-group v-model="form.isControl">
<el-radio
v-for="dict in dict.type.control_status"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="小区/村名称" prop="community"> <el-form-item label="小区/村名称" prop="community">
<el-input v-model="form.community" placeholder="请输入小区/村名称" /> <el-input v-model="form.community" placeholder="请输入小区/村名称" />
</el-form-item> </el-form-item>
...@@ -300,7 +324,7 @@ ...@@ -300,7 +324,7 @@
<el-radio <el-radio
v-for="dict in dict.type.sys_normal_disable" v-for="dict in dict.type.sys_normal_disable"
:key="dict.value" :key="dict.value"
:label="dict.value" :label="dict.value"
>{{dict.label}}</el-radio> >{{dict.label}}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
...@@ -324,7 +348,7 @@ import { listYxry, getYxry, delYxry, addYxry, updateYxry } from "@/api/system/yx ...@@ -324,7 +348,7 @@ import { listYxry, getYxry, delYxry, addYxry, updateYxry } from "@/api/system/yx
export default { export default {
name: "Yxry", name: "Yxry",
dicts: ['isolation_status', 'street_town', 'residential_area', 'sys_normal_disable'], dicts: ['isolation_status', 'street_town', 'residential_area', 'sys_normal_disable', 'control_status'],
data() { data() {
return { return {
// 遮罩层 // 遮罩层
...@@ -357,6 +381,7 @@ export default { ...@@ -357,6 +381,7 @@ export default {
area: null, area: null,
street: null, street: null,
isolationStatus: null, isolationStatus: null,
isControl: null,
community: null, community: null,
unit: null, unit: null,
hasAcid: null, hasAcid: null,
...@@ -400,6 +425,7 @@ export default { ...@@ -400,6 +425,7 @@ export default {
area: null, area: null,
street: null, street: null,
isolationStatus: null, isolationStatus: null,
isControl: "0",
community: null, community: null,
unit: null, unit: null,
hasAcid: null, hasAcid: null,
......
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