Skip to content

D
data_management_system
Commit 2fc3418a authored by 王琮's avatar 王琮
Browse files
Options

添加字段

parent ca4c977c
Hide whitespace changes
Inline Side-by-side
Showing with 125 additions and 83 deletions
ruoyi-system/src/main/java/com/ruoyi/system/domain/Hscj.java
View file @ 2fc3418a
......@@ -20,10 +20,6 @@ public class Hscj extends BaseEntity
/** 主键 */
private Long id;
/** 序号 */
// @Excel(name = "序号")
private String xh;
/** 省 */
// 新增字段
@Excel(name = "省")
......@@ -125,6 +121,10 @@ public class Hscj extends BaseEntity
@Excel(name = "备注")
private String remake;
// 新增字段
@Excel(name = "居委会")
private String committee;
/** 状态（0正常 1停用） */
// @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
private String status;
......@@ -165,15 +165,7 @@ public class Hscj extends BaseEntity
{
return id;
}
public void setXh(String xh)
{
this.xh = xh;
}
public String getXh()
{
return xh;
}
public void setCity(String city)
{
this.city = city;
......@@ -382,11 +374,18 @@ public class Hscj extends BaseEntity
this.bblx = bblx;
}
public String getCommittee() {
return committee;
}
public void setCommittee(String committee) {
this.committee = committee;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("xh", getXh())
.append("city", getCity())
.append("area", getArea())
.append("street", getStreet())
......
ruoyi-system/src/main/java/com/ruoyi/system/domain/Ycsb.java
View file @ 2fc3418a
......@@ -9,7 +9,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
/**
* 抗原异常上报对象 ycsb
*
*
* @author ruoyi
* @date 2022-11-28
*/
......@@ -49,6 +49,10 @@ public class Ycsb extends BaseEntity
@Excel(name = "单位")
private String street;
// 新增字段
@Excel(name = "居委会")
private String committee;
/** 小区/村名称 */
@Excel(name = "小区")
private String community;
......@@ -80,115 +84,123 @@ public class Ycsb extends BaseEntity
@Excel(name = "备注")
private String remark;
public void setId(Long id)
public void setId(Long id)
{
this.id = id;
}
public Long getId()
public Long getId()
{
return id;
}
public void setSbDate(Date sbDate)
public void setSbDate(Date sbDate)
{
this.sbDate = sbDate;
}
public Date getSbDate()
public Date getSbDate()
{
return sbDate;
}
public void setUserName(String userName)
public void setUserName(String userName)
{
this.userName = userName;
}
public String getUserName()
public String getUserName()
{
return userName;
}
public void setCardNo(String cardNo)
public void setCardNo(String cardNo)
{
this.cardNo = cardNo;
}
public String getCardNo()
public String getCardNo()
{
return cardNo;
}
public void setPhone(String phone)
public void setPhone(String phone)
{
this.phone = phone;
}
public String getPhone()
public String getPhone()
{
return phone;
}
public void setArea(String area)
public void setArea(String area)
{
this.area = area;
}
public String getArea()
public String getArea()
{
return area;
}
public void setStreet(String street)
public void setStreet(String street)
{
this.street = street;
}
public String getStreet()
public String getStreet()
{
return street;
}
public void setCommunity(String community)
public void setCommunity(String community)
{
this.community = community;
}
public String getCommunity()
public String getCommunity()
{
return community;
}
public void setUnit(String unit)
public void setUnit(String unit)
{
this.unit = unit;
}
public String getUnit()
public String getUnit()
{
return unit;
}
public void setHasAcid(String hasAcid)
public void setHasAcid(String hasAcid)
{
this.hasAcid = hasAcid;
}
public String getHasAcid()
public String getHasAcid()
{
return hasAcid;
}
public void setStatus(String status)
public void setStatus(String status)
{
this.status = status;
}
public String getStatus()
public String getStatus()
{
return status;
}
public void setDelFlag(String delFlag)
public void setDelFlag(String delFlag)
{
this.delFlag = delFlag;
}
public String getDelFlag()
public String getDelFlag()
{
return delFlag;
}
public String getCommittee() {
return committee;
}
public void setCommittee(String committee) {
this.committee = committee;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
......
ruoyi-system/src/main/resources/mapper/system/HscjMapper.xml
View file @ 2fc3418a
......@@ -6,7 +6,6 @@
<resultMap type="Hscj" id="HscjResult">
<result property="id" column="id"/>
<result property="xh" column="xh"/>
<result property="province" column="province"/>
<result property="city" column="city"/>
<result property="area" column="area"/>
......@@ -41,7 +40,6 @@
<sql id="selectHscjVo">
select id,
xh,
province,
city,
area,
......@@ -75,7 +73,7 @@
</sql>
<select id="selectHscjList" parameterType="Hscj" resultMap="HscjResult">
select a.id, a.province,a.xh, a.city, a.area, a.street, a.community, a.cj_place, a.cjgh, a.user_name, a.card_no,
select a.id, a.province, a.city, a.area, a.street, a.community, a.cj_place, a.cjgh, a.user_name, a.card_no,
a.phone,
a.sex, a.address, a.age, a.category, a.cj_time, a.cj_name, a.cj_phone, a.b_type, a.laboratory, a.jc_time,
a.rygx, a.boxhao, a.status, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time, a.remark from
......@@ -83,7 +81,6 @@
left join sys_user u on u.user_id = a.create_by
left join sys_dept d on u.dept_id = d.dept_id
where a.del_flag = 0
<if test="xh != null and xh != ''">and a.xh like concat('%', #{xh}, '%')</if>
<if test="city != null and city != ''">and a.city like concat('%', #{city}, '%')</if>
<if test="area != null and area != ''">and a.area = #{area}</if>
<if test="street != null and street != ''">and a.street = #{street}</if>
......@@ -117,7 +114,7 @@
<insert id="insertHscj" parameterType="Hscj" useGeneratedKeys="true" keyProperty="id">
insert into hscj
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="xh != null">xh,</if>
<if test="committee != null">committee,</if>
<if test="province != null">province,</if>
<if test="city != null">city,</if>
<if test="area != null">area,</if>
......@@ -150,7 +147,7 @@
<if test="remark != null">remark,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="xh != null">#{xh},</if>
<if test="committee != null">#{committee},</if>
<if test="province != null">#{province},</if>
<if test="city != null">#{city},</if>
<if test="area != null">#{area},</if>
......@@ -187,7 +184,6 @@
<update id="updateHscj" parameterType="Hscj">
update hscj
<trim prefix="SET" suffixOverrides=",">
<if test="xh != null">xh = #{xh},</if>
<if test="province != null">province=#{province},</if>
<if test="city != null">city = #{city},</if>
<if test="area != null">area = #{area},</if>
......
ruoyi-system/src/main/resources/mapper/system/YcsbMapper.xml
View file @ 2fc3418a
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.YcsbMapper">
<resultMap type="Ycsb" id="YcsbResult">
<result property="id" column="id" />
<result property="sbDate" column="sb_date" />
<result property="userName" column="user_name" />
<result property="cardNo" column="card_no" />
<result property="phone" column="phone" />
<result property="area" column="area" />
<result property="street" column="street" />
<result property="community" column="community" />
<result property="unit" column="unit" />
<result property="hasAcid" column="has_acid" />
<result property="status" column="status" />
<result property="delFlag" column="del_flag" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
<result property="id" column="id"/>
<result property="sbDate" column="sb_date"/>
<result property="userName" column="user_name"/>
<result property="cardNo" column="card_no"/>
<result property="phone" column="phone"/>
<result property="area" column="area"/>
<result property="street" column="street"/>
<result property="community" column="community"/>
<result property="unit" column="unit"/>
<result property="hasAcid" column="has_acid"/>
<result property="status" column="status"/>
<result property="delFlag" column="del_flag"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="remark" column="remark"/>
</resultMap>
<sql id="selectYcsbVo">
select id, sb_date, user_name, card_no, phone, area, street, community, unit, has_acid, status, del_flag, create_by, create_time, update_by, update_time, remark from ycsb
select id,
sb_date,
user_name,
card_no,
phone,
area,
street,
committee,
community,
unit,
has_acid,
status,
del_flag,
create_by,
create_time,
update_by,
update_time,
remark
from ycsb
</sql>
<select id="selectYcsbList" parameterType="Ycsb" resultMap="YcsbResult">
select a.id, a.sb_date, a.user_name, a.card_no, a.phone, a.area, a.street, a.community, a.unit, a.has_acid, a.status, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time, a.remark from ycsb a
select a.id, a.sb_date, a.user_name, a.card_no, a.phone, a.area, a.street,a.committee, a.community, a.unit,
a.has_acid, a.status, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time, a.remark
from ycsb a
left join sys_user u on u.user_id = a.create_by
left join sys_dept d on u.dept_id = d.dept_id
where a.del_flag = 0
<if test="sbDate != null "> and a.sb_date = #{sbDate}</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="phone != null and phone != ''"> and a.phone like concat('%', #{phone}, '%')</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="community != null and community != ''"> and a.community like concat('%', #{community}, '%')</if>
<if test="unit != null and unit != ''"> and a.unit like concat('%', #{unit}, '%')</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="sbDate != null ">and a.sb_date = #{sbDate}</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="phone != null and phone != ''">and a.phone like concat('%', #{phone}, '%')</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="community != null and community != ''">and a.community like concat('%', #{community}, '%')</if>
<if test="committee != null and committee != ''">and a.committee like concat('%', #{committee}, '%')</if>
<if test="unit != null and unit != ''">and a.unit like concat('%', #{unit}, '%')</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>
${params.dataScope}
</select>
<select id="selectYcsbById" parameterType="Long" resultMap="YcsbResult">
<include refid="selectYcsbVo"/>
where id = #{id}
</select>
<insert id="insertYcsb" parameterType="Ycsb" useGeneratedKeys="true" keyProperty="id">
insert into ycsb
<trim prefix="(" suffix=")" suffixOverrides=",">
......@@ -58,10 +79,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="userName != null">user_name,</if>
<if test="cardNo != null">card_no,</if>
<if test="phone != null">phone,</if>
<if test="address != null">address,</if>
<if test="area != null">area,</if>
<if test="street != null">street,</if>
<if test="community != null">community,</if>
<if test="committee != null">committee,</if>
<if test="building != null">building,</if>
<if test="unit != null">unit,</if>
<if test="house != null">house,</if>
<if test="hasAcid != null">has_acid,</if>
<if test="status != null">status,</if>
<if test="delFlag != null">del_flag,</if>
......@@ -70,16 +95,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="remark != null">remark,</if>
</trim>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="sbDate != null">#{sbDate},</if>
<if test="userName != null">#{userName},</if>
<if test="cardNo != null">#{cardNo},</if>
<if test="phone != null">#{phone},</if>
<if test="address != null">#{address},</if>
<if test="area != null">#{area},</if>
<if test="street != null">#{street},</if>
<if test="community != null">#{community},</if>
<if test="committee != null">#{committee},</if>
<if test="building != null">#{building},</if>
<if test="unit != null">#{unit},</if>
<if test="house != null">#{house},</if>
<if test="hasAcid != null">#{hasAcid},</if>
<if test="status != null">#{status},</if>
<if test="delFlag != null">#{delFlag},</if>
......@@ -88,7 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="remark != null">#{remark},</if>
</trim>
</trim>
</insert>
<update id="updateYcsb" parameterType="Ycsb">
......@@ -98,10 +127,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="userName != null">user_name = #{userName},</if>
<if test="cardNo != null">card_no = #{cardNo},</if>
<if test="phone != null">phone = #{phone},</if>
<if test="address != null">address=#{address},</if>
<if test="area != null">area = #{area},</if>
<if test="street != null">street = #{street},</if>
<if test="committee != null">committee=#{committee},</if>
<if test="community != null">community = #{community},</if>
<if test="building != null">building = #{building},</if>
<if test="unit != null">unit = #{unit},</if>
<if test="house != null">house = #{house},</if>
<if test="hasAcid != null">has_acid = #{hasAcid},</if>
<if test="status != null">status = #{status},</if>
<if test="delFlag != null">del_flag = #{delFlag},</if>
......@@ -115,7 +148,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</update>
<delete id="deleteYcsbById" parameterType="Long">
delete from ycsb where id = #{id}
delete
from ycsb
where id = #{id}
</delete>
<delete id="deleteYcsbByIds" parameterType="String">
......@@ -124,4 +159,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id}
</foreach>
</delete>
</mapper>
\ No newline at end of file
</mapper>
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