Commit 77f0e548 authored by 耿迪迪's avatar 耿迪迪

气瓶管理修改

parent 5e6165ab
......@@ -39,73 +39,73 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="selectTGasBottleInfoVo">
SELECT
bottle_id,
station_id,
bottle_code,
myself_num,
produce_unit,
produce_date,
produce_code,
bottle_status,
last_charge_date,
longitude,
latitude,
charge_medium,
bottle_specs,
rated_presure,
bottle.bottle_id,
bottle.station_id,
bottle.bottle_code,
bottle.myself_num,
bottle.produce_unit,
bottle.produce_date,
bottle.produce_code,
bottle.bottle_status,
bottle.last_charge_date,
bottle.longitude,
bottle.latitude,
bottle.charge_medium,
bottle.bottle_specs,
bottle.rated_presure,
bottle_capacity,
wall_thickness,
tare,
use_register_code,
register_date,
last_check_date,
next_check_date,
scrap_date,
current_status,
empty_type,
create_time,
update_time,
is_del,
remark,
(SELECT station_name FROM t_gas_storage_station_info info WHERE info.station_id = station_id) as station_name
bottle.wall_thickness,
bottle.tare,
bottle.use_register_code,
bottle.register_date,
bottle.last_check_date,
bottle.next_check_date,
bottle.scrap_date,
bottle.current_status,
bottle.empty_type,
bottle.create_time,
bottle.update_time,
bottle.is_del,
bottle.remark,
(SELECT station_name FROM t_gas_storage_station_info info WHERE info.station_id = bottle.station_id) as station_name
FROM
t_gas_bottle_info
t_gas_bottle_info bottle
</sql>
<select id="selectTGasBottleInfoList" parameterType="TGasBottleInfo" resultMap="TGasBottleInfoResult">
<include refid="selectTGasBottleInfoVo"/>
<where>
<if test="stationId != null "> and station_id = #{stationId}</if>
<if test="bottleCode != null and bottleCode != ''"> and bottle_code = #{bottleCode}</if>
<if test="myselfNum != null and myselfNum != ''"> and myself_num = #{myselfNum}</if>
<if test="produceUnit != null and produceUnit != ''"> and produce_unit = #{produceUnit}</if>
<if test="produceDate != null "> and produce_date = #{produceDate}</if>
<if test="produceBeginTime != null and produceEndTime">and produce_date between #{produceBeginTime} and #{produceEndTime}</if>
<if test="produceCode != null and produceCode != ''"> and produce_code = #{produceCode}</if>
<if test="bottleStatus != null and bottleStatus != ''"> and bottle_status = #{bottleStatus}</if>
<if test="lastChargeDate != null "> and last_charge_date = #{lastChargeDate}</if>
<if test="longitude != null "> and longitude = #{longitude}</if>
<if test="latitude != null "> and latitude = #{latitude}</if>
<if test="chargeMedium != null and chargeMedium != ''"> and charge_medium = #{chargeMedium}</if>
<if test="bottleSpecs != null and bottleSpecs != ''"> and bottle_specs = #{bottleSpecs}</if>
<if test="ratedPresure != null and ratedPresure != ''"> and rated_presure = #{ratedPresure}</if>
<if test="bottleCapacity != null and bottleCapacity != ''"> and bottle_capacity = #{bottleCapacity}</if>
<if test="wallThickness != null and wallThickness != ''"> and wall_thickness = #{wallThickness}</if>
<if test="tare != null and tare != ''"> and tare = #{tare}</if>
<if test="useRegisterCode != null and useRegisterCode != ''"> and use_register_code = #{useRegisterCode}</if>
<if test="registerDate != null "> and register_date = #{registerDate}</if>
<if test="lastCheckDate != null "> and last_check_date = #{lastCheckDate}</if>
<if test="nextCheckDate != null "> and next_check_date = #{nextCheckDate}</if>
<if test="scrapDate != null "> and scrap_date = #{scrapDate}</if>
<if test="currentStatus != null and currentStatus != ''"> and current_status = #{currentStatus}</if>
<if test="emptyType != null and emptyType != ''"> and empty_type = #{emptyType}</if>
<if test="isDel != null and isDel != ''"> and is_del = #{isDel}</if>
<if test="bottleCode != null and bottleCode != ''"> and bottle.bottle_code = #{bottleCode}</if>
<if test="myselfNum != null and myselfNum != ''"> and bottle.myself_num = #{myselfNum}</if>
<if test="produceUnit != null and produceUnit != ''"> and bottle.produce_unit = #{produceUnit}</if>
<if test="produceDate != null "> and bottle.produce_date = #{produceDate}</if>
<if test="produceBeginTime != null and produceEndTime">and bottle.produce_date between #{produceBeginTime} and #{produceEndTime}</if>
<if test="produceCode != null and produceCode != ''"> and bottle.produce_code = #{produceCode}</if>
<if test="bottleStatus != null and bottleStatus != ''"> and bottle.bottle_status = #{bottleStatus}</if>
<if test="lastChargeDate != null "> and bottle.last_charge_date = #{lastChargeDate}</if>
<if test="longitude != null "> and bottle.longitude = #{longitude}</if>
<if test="latitude != null "> and bottle.latitude = #{latitude}</if>
<if test="chargeMedium != null and chargeMedium != ''"> and bottle.charge_medium = #{chargeMedium}</if>
<if test="bottleSpecs != null and bottleSpecs != ''"> and bottle.bottle_specs = #{bottleSpecs}</if>
<if test="ratedPresure != null and ratedPresure != ''"> and bottle.rated_presure = #{ratedPresure}</if>
<if test="bottleCapacity != null and bottleCapacity != ''"> and bottle.bottle_capacity = #{bottleCapacity}</if>
<if test="wallThickness != null and wallThickness != ''"> and bottle.wall_thickness = #{wallThickness}</if>
<if test="tare != null and tare != ''"> and bottle.tare = #{tare}</if>
<if test="useRegisterCode != null and useRegisterCode != ''"> and bottle.use_register_code = #{useRegisterCode}</if>
<if test="registerDate != null "> and bottle.register_date = #{registerDate}</if>
<if test="lastCheckDate != null "> and bottle.last_check_date = #{lastCheckDate}</if>
<if test="nextCheckDate != null "> and bottle.next_check_date = #{nextCheckDate}</if>
<if test="scrapDate != null "> and bottle.scrap_date = #{scrapDate}</if>
<if test="currentStatus != null and currentStatus != ''"> and bottle.current_status = #{currentStatus}</if>
<if test="emptyType != null and emptyType != ''"> and bottle.empty_type = #{emptyType}</if>
<if test="isDel != null and isDel != ''"> and bottle.is_del = #{isDel}</if>
</where>
</select>
<select id="selectTGasBottleInfoById" parameterType="Long" resultMap="TGasBottleInfoResult">
<include refid="selectTGasBottleInfoVo"/>
where bottle_id = #{bottleId}
where bottle.bottle_id = #{bottleId}
</select>
<insert id="insertTGasBottleInfo" parameterType="TGasBottleInfo" useGeneratedKeys="true" keyProperty="bottleId">
......@@ -245,6 +245,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<!--查询气瓶详细信息-->
<select id="getInf" resultMap="TGasBottleInfoResult" parameterType="java.lang.String">
<include refid="selectTGasBottleInfoVo"/>
where bottle_code = #{bottleId}
where bottle.bottle_code = #{bottleId}
</select>
</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