问题修改
This commit is contained in:
jiang
parent
8c16a8b9e7
commit
1e1db1892d
|
|
@ -2,61 +2,61 @@
|
||||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
<mapper namespace="com.bonus.material.devchange.mapper.MaDevInfoMapper">
|
<mapper namespace="com.bonus.material.devchange.mapper.MaDevInfoMapper">
|
||||||
<resultMap id="BaseResultMap" type="com.bonus.material.devchange.domain.MaDevInfo">
|
<resultMap id="BaseResultMap" type="com.bonus.material.devchange.domain.MaDevInfo">
|
||||||
<id column="ma_id" property="maId" />
|
<id column="ma_id" property="maId"/>
|
||||||
<result column="device_name" property="deviceName" />
|
<result column="device_name" property="deviceName"/>
|
||||||
<result column="device_weight" property="deviceWeight" />
|
<result column="device_weight" property="deviceWeight"/>
|
||||||
<result column="device_count" property="deviceCount" />
|
<result column="device_count" property="deviceCount"/>
|
||||||
<result column="code" property="code" />
|
<result column="code" property="code"/>
|
||||||
<result column="identify_code" property="identifyCode" />
|
<result column="identify_code" property="identifyCode"/>
|
||||||
<result column="type_id" property="typeId" />
|
<result column="type_id" property="typeId"/>
|
||||||
<result column="ma_status" property="maStatus" />
|
<result column="ma_status" property="maStatus"/>
|
||||||
<result column="lease_scope" property="leaseScope" />
|
<result column="lease_scope" property="leaseScope"/>
|
||||||
<result column="location" property="location" />
|
<result column="location" property="location"/>
|
||||||
<result column="brand" property="brand" />
|
<result column="brand" property="brand"/>
|
||||||
<result column="model_name" property="modelName" />
|
<result column="model_name" property="modelName"/>
|
||||||
<result column="production_date" property="productionDate" />
|
<result column="production_date" property="productionDate"/>
|
||||||
<result column="working_hours" property="workingHours" />
|
<result column="working_hours" property="workingHours"/>
|
||||||
<result column="serial_number" property="serialNumber" />
|
<result column="serial_number" property="serialNumber"/>
|
||||||
<result column="month_lease_price" property="monthLeasePrice" />
|
<result column="month_lease_price" property="monthLeasePrice"/>
|
||||||
<result column="day_lease_price" property="dayLeasePrice" />
|
<result column="day_lease_price" property="dayLeasePrice"/>
|
||||||
<result column="pic_url" property="picUrl" />
|
<result column="pic_url" property="picUrl"/>
|
||||||
<result column="js_month_price" property="jsMonthPrice" />
|
<result column="js_month_price" property="jsMonthPrice"/>
|
||||||
<result column="js_day_price" property="jsDayPrice" />
|
<result column="js_day_price" property="jsDayPrice"/>
|
||||||
<result column="description" property="description" />
|
<result column="description" property="description"/>
|
||||||
<result column="gps_code" property="gpsCode" />
|
<result column="gps_code" property="gpsCode"/>
|
||||||
<result column="own_co" property="ownCo" />
|
<result column="own_co" property="ownCo"/>
|
||||||
<result column="person" property="person" />
|
<result column="person" property="person"/>
|
||||||
<result column="person_phone" property="personPhone" />
|
<result column="person_phone" property="personPhone"/>
|
||||||
<result column="create_time" property="createTime" />
|
<result column="create_time" property="createTime"/>
|
||||||
<result column="creator" property="creator" />
|
<result column="creator" property="creator"/>
|
||||||
<result column="deposit" property="deposit" />
|
<result column="deposit" property="deposit"/>
|
||||||
<result column="is_active" property="isActive" />
|
<result column="is_active" property="isActive"/>
|
||||||
<result column="update_time" property="updateTime" />
|
<result column="update_time" property="updateTime"/>
|
||||||
<result column="update_by" property="updateBy" />
|
<result column="update_by" property="updateBy"/>
|
||||||
<result column="is_operator" property="isOperator" />
|
<result column="is_operator" property="isOperator"/>
|
||||||
<result column="specification" property="specification" />
|
<result column="specification" property="specification"/>
|
||||||
<result column="province_id" property="provinceId" />
|
<result column="province_id" property="provinceId"/>
|
||||||
<result column="city_id" property="cityId" />
|
<result column="city_id" property="cityId"/>
|
||||||
<result column="area_id" property="areaId" />
|
<result column="area_id" property="areaId"/>
|
||||||
<result column="video_url" property="videoUrl" />
|
<result column="video_url" property="videoUrl"/>
|
||||||
<result column="own_id" property="ownId" />
|
<result column="own_id" property="ownId"/>
|
||||||
<result column="check_date" property="checkDate" />
|
<result column="check_date" property="checkDate"/>
|
||||||
<result column="check_cycle" property="checkCycle" />
|
<result column="check_cycle" property="checkCycle"/>
|
||||||
<result column="is_qc" property="isQc" />
|
<result column="is_qc" property="isQc"/>
|
||||||
<result column="is_safe_book" property="isSafeBook" />
|
<result column="is_safe_book" property="isSafeBook"/>
|
||||||
<result column="is_zone" property="isZone" />
|
<result column="is_zone" property="isZone"/>
|
||||||
<result column="zone_id" property="zoneId" />
|
<result column="zone_id" property="zoneId"/>
|
||||||
<result column="total_up_day" property="totalUpDay" />
|
<result column="total_up_day" property="totalUpDay"/>
|
||||||
<result column="total_lease_day" property="totalLeaseDay" />
|
<result column="total_lease_day" property="totalLeaseDay"/>
|
||||||
<result column="origina_value" property="originaValue" />
|
<result column="origina_value" property="originaValue"/>
|
||||||
<result column="change_status" jdbcType="CHAR" property="changeStatus" />
|
<result column="change_status" jdbcType="CHAR" property="changeStatus"/>
|
||||||
<result column="expiration_time" jdbcType="DATE" property="expirationTime" />
|
<result column="expiration_time" jdbcType="DATE" property="expirationTime"/>
|
||||||
<result column="entry_status" jdbcType="CHAR" property="entryStatus" />
|
<result column="entry_status" jdbcType="CHAR" property="entryStatus"/>
|
||||||
<result column="up_down_status" jdbcType="CHAR" property="upDownStatus" />
|
<result column="up_down_status" jdbcType="CHAR" property="upDownStatus"/>
|
||||||
<result column="json_data" property="jsonData" />
|
<result column="json_data" property="jsonData"/>
|
||||||
<result column="buy_price" property="buyPrice" />
|
<result column="buy_price" property="buyPrice"/>
|
||||||
<result column="item_type_model" property="itemTypeModel" />
|
<result column="item_type_model" property="itemTypeModel"/>
|
||||||
<result column="on_project" property="onProject" />
|
<result column="on_project" property="onProject"/>
|
||||||
<result column="childGx" property="childGx"/>
|
<result column="childGx" property="childGx"/>
|
||||||
<result column="company_name" property="companyName"/>
|
<result column="company_name" property="companyName"/>
|
||||||
<result column="devCategory" property="devCategory"/>
|
<result column="devCategory" property="devCategory"/>
|
||||||
|
|
@ -125,6 +125,49 @@
|
||||||
or mtv.maxTypeId = #{typeId}
|
or mtv.maxTypeId = #{typeId}
|
||||||
)
|
)
|
||||||
</if>
|
</if>
|
||||||
|
<if test="companyName != null and companyName !=''">
|
||||||
|
and c.company_name like concat('%',#{companyName},'%')
|
||||||
|
</if>
|
||||||
|
<if test="onProject != null and onProject !=''">
|
||||||
|
and mdi.on_project like concat('%',#{onProject},'%')
|
||||||
|
</if>
|
||||||
|
|
||||||
|
<if test="deviceName != null and deviceName !=''">
|
||||||
|
and mtv.devName like concat('%',#{deviceName},'%')
|
||||||
|
</if>
|
||||||
|
|
||||||
|
<if test="code != null and code !=''">
|
||||||
|
and mdi.`code` like concat('%',#{code},'%')
|
||||||
|
</if>
|
||||||
|
|
||||||
|
<if test="changeStatus != null and changeStatus !=''">
|
||||||
|
and mdi.ma_status like concat('%',#{changeStatus},'%')
|
||||||
|
</if>
|
||||||
|
|
||||||
|
<if test="brand != null and brand !=''">
|
||||||
|
and mdi.brand like concat('%',#{brand},'%')
|
||||||
|
</if>
|
||||||
|
<if test="productionDate != null and productionDate !=''">
|
||||||
|
and mdi.production_date like concat('%',#{brand},'%')
|
||||||
|
</if>
|
||||||
|
|
||||||
|
<if test="workingHours != null and workingHours !=''">
|
||||||
|
and mdi.working_hours like concat('%',#{workingHours},'%')
|
||||||
|
</if>
|
||||||
|
<if test="buyPrice != null and buyPrice !=''">
|
||||||
|
and mdi.buy_price like concat('%',#{buyPrice},'%')
|
||||||
|
</if>
|
||||||
|
<if test="nextCheckTime != null and nextCheckTime !=''">
|
||||||
|
and mdq.next_check_time like concat('%',#{nextCheckTime},'%')
|
||||||
|
</if>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<update id="updateDeviceStatus">
|
<update id="updateDeviceStatus">
|
||||||
|
|
@ -141,13 +184,11 @@
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="deviceTree" resultType="com.bonus.material.devchange.domain.DeviceTreeBean">
|
<select id="deviceTree" resultType="com.bonus.material.devchange.domain.DeviceTreeBean">
|
||||||
SELECT
|
SELECT mt.type_id as id,
|
||||||
mt.type_id as id,
|
|
||||||
mt.type_name as name,
|
mt.type_name as name,
|
||||||
mt.level,
|
mt.level,
|
||||||
mt.parent_id as pId
|
mt.parent_id as pId
|
||||||
FROM
|
FROM ma_type mt
|
||||||
ma_type mt
|
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="deviceCount" resultType="com.bonus.material.devchange.domain.DeviceCountBean">
|
<select id="deviceCount" resultType="com.bonus.material.devchange.domain.DeviceCountBean">
|
||||||
|
|
@ -177,17 +218,15 @@
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="getProperties" resultType="com.bonus.material.device.domain.vo.DevInfoPropertyVo">
|
<select id="getProperties" resultType="com.bonus.material.device.domain.vo.DevInfoPropertyVo">
|
||||||
select property_name propertyName,property_value propertyValue
|
select property_name propertyName, property_value propertyValue
|
||||||
from ma_dev_info_properties
|
from ma_dev_info_properties
|
||||||
where ma_id=#{maId}
|
where ma_id = #{maId}
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="deviceLocationSel" resultType="com.bonus.material.devchange.domain.MapBean">
|
<select id="deviceLocationSel" resultType="com.bonus.material.devchange.domain.MapBean">
|
||||||
SELECT
|
SELECT '0' as `key`,
|
||||||
'0' as `key`,
|
|
||||||
location as `value`
|
location as `value`
|
||||||
FROM
|
FROM ma_dev_info
|
||||||
ma_dev_info
|
|
||||||
WHERE is_active = 1
|
WHERE is_active = 1
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -137,6 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
)
|
)
|
||||||
</if>
|
</if>
|
||||||
and d.is_active='1'
|
and d.is_active='1'
|
||||||
|
and d.up_down_status ='1'
|
||||||
</where>
|
</where>
|
||||||
order by
|
order by
|
||||||
d.is_active
|
d.is_active
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue