From 5637f67208ced0ed395b9564a58ccad70bc2966f Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Wed, 27 Nov 2024 15:13:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/controller/OrderController.java     |  4 +--
 .../material/order/domain/OrderInfoDto.java   |  6 ++++
 .../material/order/mapper/OrderMapper.java    |  1 +
 .../material/order/service/OrderService.java  |  2 ++
 .../order/service/impl/OrderServiceImpl.java  | 10 +++++++
 .../mapper/material/order/OrderInfoMapper.xml | 30 +++++++++++++++++++
 6 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java
index f7f9f5d..4811336 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java
@@ -62,8 +62,8 @@ public class OrderController extends BaseController {
     @GetMapping("/getOrderDetailsById")
     public AjaxResult getOrderDetailsById(OrderDetailDto dto) {
         if (dto.getId() != null) {
-            OrderDetailDto orderDetailDto = orderMapper.selectOrderDetailsById(dto.getId().toString());
-            return success(orderDetailDto);
+            OrderInfoDto orderInfoDto = orderService.getOrderDetailsById(dto);
+            return success(orderInfoDto);
         }else {
             return error("参数错误");
         }
diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java
index 1ac9832..ad02535 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java
@@ -72,9 +72,15 @@ public class OrderInfoDto {
     @ApiModelProperty(value = "出租方公司名称")
     private String czcompanyName;
 
+    @ApiModelProperty(value = "出租方联系人")
+    private String person;
+
     @ApiModelProperty(value = "出租方联系电话")
     private String personPhone;
 
+    @ApiModelProperty(value = "承租方联系人")
+    private String nickName;
+
     @ApiModelProperty(value = "承租方联系电话")
     private String phoneNumber;
 
diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/mapper/OrderMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/mapper/OrderMapper.java
index 309958c..827825c 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/mapper/OrderMapper.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/mapper/OrderMapper.java
@@ -20,6 +20,7 @@ public interface OrderMapper {
     Integer updateDeviceStatus(OrderDetailDto orderDetailDto);
 
     List<OrderInfoDto> getOrderDetails(OrderInfoDto orderInfoDto);
+    OrderInfoDto getOrderDetailsById(OrderDetailDto orderInfoDto);
 
     OrderDetailDto selectOrderDetailsById(String id);
 
diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/OrderService.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/OrderService.java
index ae43828..365478a 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/OrderService.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/OrderService.java
@@ -14,4 +14,6 @@ public interface OrderService {
     Integer submitOrderInfo(OrderInfoDto orderInfoDto);
 
     List<OrderInfoDto> getOrderDetails(OrderInfoDto orderInfoDto);
+
+    OrderInfoDto getOrderDetailsById(OrderDetailDto dto);
 }
diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java
index d64b99e..262a809 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java
@@ -75,4 +75,14 @@ public class OrderServiceImpl implements OrderService {
         }
         return orderInfoDtos;
     }
+
+    @Override
+    public OrderInfoDto getOrderDetailsById(OrderDetailDto dto) {
+        OrderInfoDto orderInfoDto = orderMapper.getOrderDetailsById(dto);
+        List<OrderDetailDto> list = new ArrayList();
+        OrderDetailDto orderDetailDto = orderMapper.selectOrderDetailsById(dto.getId().toString());
+        list.add(orderDetailDto);
+        orderInfoDto.setDetailsList(list);
+        return orderInfoDto;
+    }
 }
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 9538558..3c01d64 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
@@ -114,4 +114,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             hh.id = #{id}
     </select>
+    <select id="getOrderDetailsById" resultType="com.bonus.material.order.domain.OrderInfoDto">
+        SELECT
+            moi.code AS code,
+            moi.order_time,
+            c.company_name AS czcompanyName,
+            mdi.person as person,
+            mdi.person_phone AS personPhone,
+            su.phonenumber AS phoneNumber,
+            su.nick_name AS nickName,
+            moi.address,
+            dept.companyName
+        FROM
+            ma_order_details hh
+                LEFT JOIN ma_order_info moi ON moi.order_id = hh.order_id
+                LEFT JOIN ma_dev_info mdi ON hh.ma_id = mdi.ma_id
+                LEFT JOIN bm_company_info c ON mdi.own_co = c.company_id
+                LEFT JOIN ma_type mt ON mdi.type_id = mt.type_id
+                LEFT JOIN sys_user su ON su.user_id = moi.order_user
+                LEFT JOIN (
+                SELECT
+                    sd.dept_id AS deptId,
+                    sd1.dept_name AS companyName
+                FROM
+                    sys_dept sd
+                        JOIN ( SELECT SUBSTRING_INDEX( ancestors, ',', 1 ) AS first_ancestor, dept_id FROM sys_dept ) AS subquery ON sd.dept_id = subquery.dept_id
+                        LEFT JOIN sys_dept sd1 ON sd1.parent_id = subquery.first_ancestor
+            ) dept ON dept.deptId = su.dept_id
+        WHERE
+            mt.del_flag = '0' and hh.id = #{id}
+    </select>
 </mapper>
\ No newline at end of file