From 1aa8313f6435383d3bc64ca325d358a9cbd1778b Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Mon, 14 Jul 2025 13:43:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/RepairInputDetailsServiceImpl.java   | 45 +++++++++++--------
 .../mapper/material/common/SelectMapper.xml   |  4 +-
 .../repair/RepairInputDetailsMapper.xml       |  5 +--
 3 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairInputDetailsServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairInputDetailsServiceImpl.java
index daf30595..ebd06e6f 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairInputDetailsServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairInputDetailsServiceImpl.java
@@ -110,31 +110,38 @@ public class RepairInputDetailsServiceImpl implements IRepairInputDetailsService
     @Override
     public List<RepairInputDetails> selectRepairInputDetailsList(RepairInputDetails repairInputDetails) {
         List<RepairInputDetails> list = repairInputDetailsMapper.selectRepairInputDetailsList(repairInputDetails);
-        if (CollectionUtils.isNotEmpty(list)) {
-            for (RepairInputDetails inputDetails : list) {
-                List<RepairInputInfo> inputInfos = repairInputDetailsMapper.selectRepairInputDetailsById(inputDetails);
-                if (CollectionUtils.isNotEmpty(inputInfos)) {
-                    BigDecimal totalRepairNum = BigDecimal.ZERO.setScale(3, BigDecimal.ROUND_HALF_UP);
-                    BigDecimal totalInputNum = BigDecimal.ZERO.setScale(3, BigDecimal.ROUND_HALF_UP);
-                    BigDecimal totalPendingInputNum = BigDecimal.ZERO.setScale(3, BigDecimal.ROUND_HALF_UP);
-                    for (RepairInputInfo inputInfo : inputInfos) {
-                        totalRepairNum = totalRepairNum.add(inputInfo.getRepairNum());
-                        totalInputNum = totalInputNum.add(inputInfo.getInputNum());
-                        totalPendingInputNum = totalPendingInputNum.add(inputInfo.getPendingInputNum());
-                    }
-                    inputDetails.setRepairNum(totalRepairNum);
-                    inputDetails.setInputNum(totalInputNum);
-                    inputDetails.setPendingInputNum(totalPendingInputNum);
-                }
-            }
+//        if (CollectionUtils.isNotEmpty(list)) {
+//            for (RepairInputDetails inputDetails : list) {
+//                List<RepairInputInfo> inputInfos = repairInputDetailsMapper.selectRepairInputDetailsById(inputDetails);
+//                if (CollectionUtils.isNotEmpty(inputInfos)) {
+//                    BigDecimal totalRepairNum = BigDecimal.ZERO.setScale(3, BigDecimal.ROUND_HALF_UP);
+//                    BigDecimal totalInputNum = BigDecimal.ZERO.setScale(3, BigDecimal.ROUND_HALF_UP);
+//                    BigDecimal totalPendingInputNum = BigDecimal.ZERO.setScale(3, BigDecimal.ROUND_HALF_UP);
+//                    for (RepairInputInfo inputInfo : inputInfos) {
+//                        totalRepairNum = totalRepairNum.add(inputInfo.getRepairNum());
+//                        totalInputNum = totalInputNum.add(inputInfo.getInputNum());
+//                        totalPendingInputNum = totalPendingInputNum.add(inputInfo.getPendingInputNum());
+//                    }
+//                    inputDetails.setRepairNum(totalRepairNum);
+//                    inputDetails.setInputNum(totalInputNum);
+//                    inputDetails.setPendingInputNum(totalPendingInputNum);
+//                }
+//            }
+//            String keyWord = repairInputDetails.getKeyWord();
+//            // 如果关键字不为空，进行过滤
+//            if (!StringUtils.isBlank(keyWord)) {
+//                list = list.stream()
+//                        .filter(item -> containsKeyword(item, keyWord))
+//                        .collect(Collectors.toList());
+//            }
+//        }
             String keyWord = repairInputDetails.getKeyWord();
-            // 如果关键字不为空，进行过滤
+                    // 如果关键字不为空，进行过滤
             if (!StringUtils.isBlank(keyWord)) {
                 list = list.stream()
                         .filter(item -> containsKeyword(item, keyWord))
                         .collect(Collectors.toList());
             }
-        }
         return list;
     }
 
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml
index e3f8b872..cacedcc3 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml
@@ -210,10 +210,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN slt_agreement_info sai ON mt.type_id = sai.type_id
         LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id and mt1.del_flag = '0'
         WHERE
-            EXISTS ( SELECT 1 FROM slt_agreement_info sai2 WHERE sai2.type_id = mt.type_id AND sai2.agreement_id = #{agreementId}
-                                                             AND sai2.STATUS = '0' and IFNULL(sai.lease_type,0) = 0 and sai2.num > 0)
+           sai.STATUS = '0'
         GROUP BY
             mt.type_id
+        HAVING num> 0
     </select>
 
     <select id="getUseTypeTreeL3" resultType="com.bonus.common.biz.domain.TypeTreeNode">
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairInputDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairInputDetailsMapper.xml
index f685568f..43e7681b 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairInputDetailsMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairInputDetailsMapper.xml
@@ -51,9 +51,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN ma_type mt on rd.type_id = mt.type_id
         LEFT JOIN ma_type mt2 on mt.parent_id = mt2.type_id
         LEFT JOIN tm_task tt on rd.task_id = tt.task_id
-        LEFT JOIN repair_apply_details rad ON rad.id = rd.repair_id
-        LEFT JOIN tm_task tt1 on rad.task_id = tt1.task_id
-        LEFT JOIN tm_task_agreement tta ON rd.task_id = tta.task_id
+        LEFT JOIN tm_task tt1 on rd.repair_id = tt1.task_id
+        LEFT JOIN tm_task_agreement tta ON rd.repair_id = tta.task_id
         LEFT JOIN bm_agreement_info bai2 ON tta.agreement_id = bai2.agreement_id
         LEFT JOIN bm_unit bui ON bai2.unit_id = bui.unit_id
         LEFT JOIN bm_project bpi ON bai2.project_id = bpi.pro_id and bpi.del_flag = '0'