From 368cf573866742ce6ad1bd3af905c80efcf6c07b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com>
Date: Wed, 26 Mar 2025 17:55:16 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/LargeScreenController.java     | 17 ++++++++++++++
 .../mapper/material/device/DevInfoMapper.xml  |  8 +++----
 .../material/lease/MaLeaseInfoMapper.xml      | 22 ++++++++++++++++---
 3 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/controller/LargeScreenController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/controller/LargeScreenController.java
index 8a2b884..ff89bc9 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/controller/LargeScreenController.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/controller/LargeScreenController.java
@@ -418,6 +418,23 @@ public class LargeScreenController extends BaseController {
     @GetMapping("/getLeaseTypeList")
     public AjaxResult getLeaseTypeList(MaLeaseOnlyInfo dto) {
         startPage();
+       /* List<MaLeaseOnlyInfo> list = leaseInfoMapper.getLeaseTypeList(dto);
+        if (!CollectionUtils.isEmpty(list)) {
+            for (MaLeaseOnlyInfo maLeaseOnlyInfo : list) {
+                // 获取list集合
+                List<String> typeIds = Arrays.asList(maLeaseOnlyInfo.getTypeId().split(","));
+                // 查询类型名称
+                String typeName = leaseInfoMapper.selectMaTypeList(typeIds);
+                maLeaseOnlyInfo.setTypeName(typeName);
+                long daysDifference = calculateDaysDifference(maLeaseOnlyInfo.getStartTime(), maLeaseOnlyInfo.getEndTime());
+                maLeaseOnlyInfo.setEstimateDays((int) daysDifference);
+            }
+            if (!StringUtils.isBlank(dto.getKeyWord())) {
+                list = list.stream()
+                        .filter(item -> containsTypeKeyword(item, dto.getKeyWord()))
+                        .collect(Collectors.toList());
+            }
+        }*/
         List<MaLeaseOnlyInfo> list = leaseInfoMapper.getLeaseTypeList(dto);
         if (!CollectionUtils.isEmpty(list)) {
             for (MaLeaseOnlyInfo maLeaseOnlyInfo : list) {
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 40bfbec..5cab1c8 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
@@ -461,13 +461,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 <when test="maIds.size() == 1">
                     <!-- 单个ID更新 -->
                         update ma_dev_info
-                        set ma_status = #{maStatus}
+                        set ma_status = #{maStatus}  ,update_time = now()
                         where ma_id = #{maIds[0]}
                 </when>
                 <otherwise>
                     <!-- 批量更新 -->
                         update ma_dev_info
-                        set ma_status = #{maStatus}
+                        set ma_status = #{maStatus},update_time = now()
                         where ma_id in
                         <foreach collection="maIds" item="maId" open="(" separator="," close=")">
                             #{maId}
@@ -1252,7 +1252,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="getDevTypeNumList" resultType="com.bonus.material.device.domain.vo.DevInfoVo">
         SELECT
-            count(mdi.type_id) as deviceCount, mt.type_name as typeName,mdi.device_name as deviceName,mt.type_name as modelName
+            count(mdi.type_id) as deviceCount, mt2.type_name as typeName,mdi.device_name as deviceName,mt.type_name as modelName
         FROM
             ma_dev_info mdi
                 LEFT JOIN ma_type mt ON mdi.type_id = mt.type_id
@@ -1291,7 +1291,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
         SELECT
             mdi.device_name as deviceName,mt.type_name as modelName,
-            mdi.day_lease_price as dayLeasePrice,
+            mt.lease_price as dayLeasePrice,
             count(DISTINCT(mrd.ma_id)) as rentNum
         FROM
             ma_order_details mrd
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 05889a3..6a49ff5 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
@@ -529,10 +529,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getLeaseCountByPublishCompany" resultType="com.bonus.material.lease.domain.MaLeaseInfo">
         SELECT
             sd.dept_name as publish_company,
-            COUNT( 1 ) AS lease_count
+           /* COUNT( 1 ) AS lease_count*/
+            COUNT(mld.lease_num) AS lease_count
         FROM
             ma_lease_info mli
                 LEFT JOIN sys_dept sd on sd.dept_id=mli.publish_company
+                LEFT JOIN ma_lease_details mld on mld.lease_id=mli.id
         GROUP BY
             mli.publish_company
         ORDER BY
@@ -597,7 +599,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="getLeaseTypeList" resultType="com.bonus.material.largeScreen.entity.MaLeaseOnlyInfo">
-        SELECT
+       /* SELECT
             ml.lease_name AS deviceName,
             COUNT( md.lease_num ) AS estimateCount,
             GROUP_CONCAT( md.type_id ) AS typeId,
@@ -607,7 +609,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ma_lease_info ml
                 LEFT JOIN ma_lease_details md ON ml.id = md.lease_id
         GROUP BY
-            ml.id
+            ml.id*/
+
+       SELECT
+           ml.lease_name AS deviceName,
+           COUNT(md.lease_num) AS estimateCount,
+           md.type_id AS typeId,
+           ml.lease_start_time AS startTime,
+           ml.lease_end_time AS endTime
+       FROM
+           ma_lease_details md
+               LEFT JOIN ma_lease_info ml ON ml.id = md.lease_id
+       GROUP BY
+
+           md.type_id
+
     </select>
 
     <select id="getDevRate" resultType="com.bonus.material.largeScreen.entity.MaDevRateInfo">