From ea37a7df12a6095e953dff94f88163da07638517 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Fri, 27 Dec 2024 13:51:46 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E8=AE=A2=E5=8D=95=E6=95=B0?=
 =?UTF-8?q?=EF=BC=8C=E6=8C=89=E8=A7=92=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/order/domain/OrderDetailDto.java    |  9 +++++++++
 .../order/service/impl/OrderServiceImpl.java     |  6 ++++++
 .../mapper/material/order/OrderInfoMapper.xml    | 16 +++++++++++++---
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java
index e0538a1..1cd8045 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java
@@ -147,4 +147,13 @@ public class OrderDetailDto {
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private String reliefEndTime;
 
+    @ApiModelProperty(value = "true:出租方  false:承租方")
+    private boolean flag;
+
+    @ApiModelProperty(value = "买方承租方公司id")
+    private Integer buyerCompany;
+
+    @ApiModelProperty(value = "卖方出租方公司id")
+    private Integer sellerCompany;
+
 }
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 3fa4a31..f4dbb9d 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
@@ -217,6 +217,12 @@ public class OrderServiceImpl implements OrderService {
 
     @Override
     public List<OrderInfoDto> getOrderStatusCount(OrderDetailDto dto) throws Exception {
+        //true:出租方  false:承租方
+        if (dto.isFlag()) {
+            dto.setSellerCompany(SecurityUtils.getLoginUser().getSysUser().getCompanyId().intValue());
+        } else {
+            dto.setBuyerCompany(SecurityUtils.getLoginUser().getSysUser().getCompanyId().intValue());
+        }
         List<OrderInfoDto> orderInfoDto = orderMapper.getOrderStatusCount(dto);
         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 129aead..a68545a 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
@@ -320,10 +320,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select a.order_status as orderStatus, count(a.order_status) as orderCount from
             (
                 SELECT
-                    order_id,
-                    min(order_status) as order_status
+                    mods.order_id,
+                    min(mods.order_status) as order_status
                 FROM
-                    ma_order_details
+                    ma_order_details mods
+                        LEFT JOIN ma_order_info moi ON mods.order_id = moi.order_id
+                        LEFT JOIN ma_dev_info mdi ON mods.ma_id = mdi.ma_id
+                WHERE
+                    1=1
+                    <if test="buyerCompany != null">
+                        AND moi.buyer_company = #{buyerCompany}
+                    </if>
+                    <if test="sellerCompany != null">
+                        AND mdi.own_co = #{sellerCompany}
+                    </if>
                 GROUP BY order_id
             ) a
         group by a.order_status