Skip to content

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

修改 解除隔离人员加字段

parent d95972dd
Hide whitespace changes
Inline Side-by-side
Showing with 85 additions and 28 deletions
ruoyi-system/src/main/java/com/ruoyi/system/domain/Jcglry.java
View file @ 25422513
......@@ -67,12 +67,24 @@ public class Jcglry extends BaseEntity
// @Excel(name = "小区/村名称")
private String community;
/** 楼号单元号门牌号 */
@Excel(name = "楼号")
private String building;
/** 楼号单元号门牌号 */
@Excel(name = "单元号")
private String unit;
/** 楼号单元号门牌号 */
@Excel(name = "门牌号")
private String house;
/** 家庭住址 */
@Excel(name = "家庭住址")
private String address;
/** 转运状态 */
@Excel(name = "是否已转走",readConverterExp = "0=是,1=否")
// @Excel(name = "是否已转走",readConverterExp = "0=是,1=否")
private String zyStatus;
/** 是否安排司机 */
......@@ -333,4 +345,28 @@ public class Jcglry extends BaseEntity
public void setValue(String value) {
this.value = value;
}
public String getBuilding() {
return building;
}
public void setBuilding(String building) {
this.building = building;
}
public String getUnit() {
return unit;
}
public void setUnit(String unit) {
this.unit = unit;
}
public String getHouse() {
return house;
}
public void setHouse(String house) {
this.house = house;
}
}
ruoyi-system/src/main/resources/mapper/system/JcglryMapper.xml
View file @ 25422513
......@@ -29,14 +29,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
<result property="unit" column="unit"/>
<result property="building" column="building"/>
<result property="house" column="house"/>
</resultMap>
<sql id="selectJcglryVo">
select id, is_area, name, gl_place, rz_time, jc_time, rylb, card_no, phone, street, committee, community, address, zy_status, arrange_drivers, bz_street, bz_address, status, del_flag, create_by, create_time, update_by, update_time, remark from jcglry
select id, is_area, name, gl_place, rz_time, jc_time, rylb, card_no, phone, street, committee, community, address,
zy_status, arrange_drivers, bz_street, bz_address, status, del_flag, create_by, create_time, update_by,
update_time, remark,unit, house, building from jcglry
</sql>
<select id="selectJcglryList" parameterType="Jcglry" resultMap="JcglryResult">
select a.id, a.is_area, a.name, a.gl_place, a.rz_time, a.jc_time, a.rylb, a.card_no, a.phone, a.street, a.committee, a.community, a.address, a.zy_status, a.arrange_drivers, a.bz_street, a.bz_address, a.status, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time, a.remark from jcglry a
select a.id, a.is_area, a.name, a.gl_place, a.rz_time, a.jc_time, a.rylb, a.card_no, a.phone, a.street,
a.committee, a.community, a.address, a.zy_status, a.arrange_drivers, a.bz_street, a.bz_address,
a.status, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time, a.remark, a.unit, a.house, a.building
from jcglry 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
......@@ -87,6 +95,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="street != null">street,</if>
<if test="committee != null">committee,</if>
<if test="community != null">community,</if>
<if test="unit != null">unit,</if>
<if test="building != null">building,</if>
<if test="house != null">house,</if>
<if test="address != null">address,</if>
<if test="zyStatus != null">zy_status,</if>
<if test="arrangeDrivers != null">arrange_drivers,</if>
......@@ -112,6 +123,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="street != null">#{street},</if>
<if test="committee != null">#{committee},</if>
<if test="community != null">#{community},</if>
<if test="unit != null">#{unit},</if>
<if test="building != null">#{building},</if>
<if test="house != null">#{house},</if>
<if test="address != null">#{address},</if>
<if test="zyStatus != null">#{zyStatus},</if>
<if test="arrangeDrivers != null">#{arrangeDrivers},</if>
......@@ -130,12 +144,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="insertBatchYxry" parameterType="com.ruoyi.system.domain.Jcglry">
insert into jcglry
( is_area ,name, gl_place, rz_time, jc_time, rylb, card_no, phone, street, committee, community,
address, zy_status, arrange_drivers, bz_street, bz_address, create_by, create_time, remark) values
address, zy_status, arrange_drivers, bz_street, bz_address, create_by, create_time, remark,unit,building,
house ) values
<foreach item="item" index="index" collection="list" separator=",">
(#{item.isArea},#{item.name},#{item.glPlace},#{item.rzTime},#{item.jcTime},#{item.rylb},#{item.cardNo},#{item.phone},
#{item.street},#{item.committee},#{item.community},
#{item.address}, #{item.zyStatus}, #{item.arrangeDrivers},#{item.bzStreet}, #{item.bzAddress},#{item.createBy},
#{item.createTime},#{item.remark})
#{item.createTime},#{item.remark},#{item.unit},#{item.building},#{item.house})
</foreach>
</insert>
......@@ -153,6 +168,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="street != null">street = #{street},</if>
<if test="committee != null">committee = #{committee},</if>
<if test="community != null">community = #{community},</if>
<if test="unit != null">unit = #{unit},</if>
<if test="building != null">building = #{building},</if>
<if test="house != null">house = #{house},</if>
<if test="address != null">address = #{address},</if>
<if test="zyStatus != null">zy_status = #{zyStatus},</if>
<if test="arrangeDrivers != null">arrange_drivers = #{arrangeDrivers},</if>
......@@ -173,29 +191,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<foreach item="item" index="index" collection="list" separator=";">
update jcglry
<trim prefix="SET" suffixOverrides=",">
<if test="isArea != null">is_area = #{isArea},</if>
<if test="name != null">name = #{name},</if>
<if test="glPlace != null">gl_place = #{glPlace},</if>
<if test="rzTime != null">rz_time = #{rzTime},</if>
<if test="jcTime != null">jc_time = #{jcTime},</if>
<if test="rylb != null">rylb = #{rylb},</if>
<if test="cardNo != null">card_no = #{cardNo},</if>
<if test="phone != null">phone = #{phone},</if>
<if test="street != null">street = #{street},</if>
<if test="committee != null">committee = #{committee},</if>
<if test="community != null">community = #{community},</if>
<if test="address != null">address = #{address},</if>
<if test="zyStatus != null">zy_status = #{zyStatus},</if>
<if test="arrangeDrivers != null">arrange_drivers = #{arrangeDrivers},</if>
<if test="bzStreet != null">bz_street = #{bzStreet},</if>
<if test="bzAddress != null">bz_address = #{bzAddress},</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="item.isArea != null">is_area = #{item.isArea},</if>
<if test="item.name != null">name = #{item.name},</if>
<if test="item.glPlace != null">gl_place = #{item.glPlace},</if>
<if test="item.rzTime != null">rz_time = #{item.rzTime},</if>
<if test="item.jcTime != null">jc_time = #{item.jcTime},</if>
<if test="item.rylb != null">rylb = #{item.rylb},</if>
<if test="item.cardNo != null">card_no = #{item.cardNo},</if>
<if test="item.phone != null">phone = #{item.phone},</if>
<if test="item.street != null">street = #{item.street},</if>
<if test="item.committee != null">committee = #{item.committee},</if>
<if test="item.community != null">community = #{item.community},</if>
<if test="item.unit != null">unit = #{item.unit},</if>
<if test="item.building != null">building = #{item.building},</if>
<if test="item.house != null">house = #{item.house},</if>
<if test="item.address != null">address = #{item.address},</if>
<if test="item.zyStatus != null">zy_status = #{item.zyStatus},</if>
<if test="item.arrangeDrivers != null">arrange_drivers = #{item.arrangeDrivers},</if>
<if test="item.bzStreet != null">bz_street = #{item.bzStreet},</if>
<if test="item.bzAddress != null">bz_address = #{item.bzAddress},</if>
<if test="item.status != null">status = #{item.status},</if>
<if test="item.delFlag != null">del_flag = #{item.delFlag},</if>
<if test="item.createBy != null">create_by = #{citem.reateBy},</if>
<if test="item.createTime != null">create_time = #{item.createTime},</if>
<if test="item.updateBy != null">update_by = #{item.updateBy},</if>
<if test="updateTime != null">update_time = #{item.updateTime},</if>
<if test="item.remark != null">remark = #{item.remark},</if>
</trim>
where card_no = #{item.cardNo}
</foreach>
......
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