From 82f364a7c5d746e12b38a285bb2bc68dcb04dbf9 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Thu, 12 Dec 2024 15:53:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8D=95=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/material/lease/domain/MaLeaseInfo.java | 3 +++ .../resources/mapper/material/lease/MaLeaseInfoMapper.xml | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/domain/MaLeaseInfo.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/domain/MaLeaseInfo.java index 4d449de..492bcbe 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/domain/MaLeaseInfo.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/domain/MaLeaseInfo.java @@ -101,6 +101,9 @@ public class MaLeaseInfo extends BaseEntity implements Serializable { @ApiModelProperty(value = "接单公司") private String orderCompany; + @ApiModelProperty(value = "接单公司名称") + private String orderCompanyName; + /** * 接单时间 */ diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/MaLeaseInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/MaLeaseInfoMapper.xml index d363253..1f6613f 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/MaLeaseInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/MaLeaseInfoMapper.xml @@ -123,6 +123,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" m.lease_end_time as leaseEndTime, m.start_time as startTime, m.end_time as endTime, + m.order_time as orderTime, + m.order_company as orderCompany, + sd2.dept_name as orderCompanyName, m.person as person, m.person_phone as personPhone, m.description as description, @@ -144,6 +147,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN base_address b2 on m.city_code = b2.code LEFT JOIN ma_hot_search h ON h.lease_id = m.id LEFT JOIN sys_dept sd on m.publish_company = sd.dept_id + LEFT JOIN sys_dept sd2 on m.order_company = sd2.dept_id WHERE 1 = 1 and m.id = #{id}