From fde308872d62d5f4438e01860c9b7242cc6f2dde Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Tue, 3 Dec 2024 10:52:24 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=9F=E9=87=91=E4=BB=8Ema=5Ftype=E4=B8=AD?= =?UTF-8?q?=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/material/bookcar/BookCarMapper.xml | 2 +- .../mapper/material/device/DevInfoMapper.xml | 28 +++++-------------- .../mapper/material/home/MaTypeInfoMapper.xml | 4 +-- .../mapper/material/order/OrderInfoMapper.xml | 8 ++++-- 4 files changed, 15 insertions(+), 27 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/bookcar/BookCarMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/bookcar/BookCarMapper.xml index b4e04d9..bdfb3e0 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/bookcar/BookCarMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/bookcar/BookCarMapper.xml @@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" d.production_date as productionDate, d.working_hours as workingHours, d.serial_number as serialNumber, - d.day_lease_price as dayLeasePrice, + mt.lease_price as dayLeasePrice, d.person as person, d.person_phone as personPhone, c.company_name as companyName, diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml index 2fd5091..87ace72 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml @@ -20,7 +20,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - @@ -45,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select ma_id, device_name, device_weight, device_count, code, type_id, ma_status, lease_scope, location, province_id, city_id, area_id, brand, model_name, production_date, working_hours, serial_number, - month_lease_price, day_lease_price, pic_url, js_month_price, js_day_price, description, gps_code, own_co, create_time, + pic_url, js_month_price, js_day_price, description, gps_code, own_co, create_time, creator, update_time, person, person_phone, update_by, specification, deposit, is_operator, is_active, update_time, update_by from ma_dev_info @@ -66,8 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" d.production_date as productionDate, d.working_hours as workingHours, d.serial_number as serialNumber, - d.month_lease_price as monthLeasePrice, - d.day_lease_price as dayLeasePrice, + mt4.lease_price as dayLeasePrice, d.person as person, d.person_phone as personPhone, d.create_time as createTime, @@ -129,7 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and d.serial_number = #{serialNumber} - and d.day_lease_price >= #{dayLeasePriceMin} and d.day_lease_price <= #{dayLeasePriceMax} + and mt4.lease_price >= #{dayLeasePriceMin} and mt4.lease_price <= #{dayLeasePriceMax} and d.description = #{description} and d.gps_code = #{gpsCode} @@ -153,10 +151,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by d.is_active - ,d.day_lease_price + ,mt4.lease_price - ,d.day_lease_price DESC + ,mt4.lease_price DESC ,d.create_time @@ -181,8 +179,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" d.production_date as productionDate, d.working_hours as workingHours, d.serial_number as serialNumber, - d.month_lease_price as monthLeasePrice, - d.day_lease_price as dayLeasePrice, + mt4.lease_price as dayLeasePrice, d.person as person, d.person_phone as personPhone, c.company_name as companyName, @@ -228,8 +225,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" d.production_date as productionDate, d.working_hours as workingHours, d.serial_number as serialNumber, - d.month_lease_price as monthLeasePrice, - d.day_lease_price as dayLeasePrice, + mt4.lease_price as dayLeasePrice, d.person as person, d.person_phone as personPhone, c.company_id as companyId, @@ -282,8 +278,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" production_date, working_hours, serial_number, - month_lease_price, - day_lease_price, pic_url, js_month_price, js_day_price, @@ -320,8 +314,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{productionDate}, #{workingHours}, #{serialNumber}, - #{monthLeasePrice}, - #{dayLeasePrice}, #{picUrl}, #{jsMonthPrice}, #{jsDayPrice}, @@ -376,8 +368,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" production_date = #{productionDate}, working_hours = #{workingHours}, serial_number = #{serialNumber}, - month_lease_price = #{monthLeasePrice}, - day_lease_price = #{dayLeasePrice}, pic_url = #{picUrl}, js_month_price = #{jsMonthPrice}, js_day_price = #{jsDayPrice}, @@ -577,8 +567,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" production_date, working_hours, serial_number, - month_lease_price, - day_lease_price, pic_url, js_month_price, js_day_price, @@ -614,8 +602,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{productionDate}, #{workingHours}, #{serialNumber}, - #{monthLeasePrice}, - #{dayLeasePrice}, #{picUrl}, #{jsMonthPrice}, #{jsDayPrice}, diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/home/MaTypeInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/home/MaTypeInfoMapper.xml index 1307063..1c707b9 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/home/MaTypeInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/home/MaTypeInfoMapper.xml @@ -33,8 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" d.production_date as productionDate, d.working_hours as workingHours, d.serial_number as serialNumber, - d.month_lease_price as monthLeasePrice, - d.day_lease_price as dayLeasePrice, + mt.lease_price as dayLeasePrice, d.person as person, d.person_phone as personPhone, c.company_name as companyName, @@ -45,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ma_hot_search h LEFT JOIN ma_dev_info d on d.ma_id = h.ma_id LEFT JOIN bm_company_info c ON d.own_co = c.company_id + LEFT JOIN ma_type mt on mt.type_id = d.type_id where d.is_active='1' and d.ma_status = '2' diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml index 52509ba..2d39b0c 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml @@ -125,7 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND dept.companyName like concat('%',#{companyName},'%') - AND mdi.day_lease_price BETWEEN #{lowerBound} AND #{upperBound} + AND mt.lease_price BETWEEN #{lowerBound} AND #{upperBound} GROUP BY c.company_id, @@ -138,7 +138,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT mdi.device_name, - mdi.day_lease_price, + mt.lease_price as dayLeasePrice, hh.order_status, hh.days, bfi.url, @@ -226,6 +227,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN ma_order_info moi ON hh.order_id = moi.order_id LEFT JOIN ma_dev_info mdi ON hh.ma_id = mdi.ma_id LEFT JOIN bm_file_info bfi ON hh.ma_id = bfi.model_id + LEFT JOIN ma_type mt ON mdi.type_id = mt.type_id AND bfi.file_type = 0 WHERE moi.order_id = #{orderId}