From fdbeb27506b3dc55392a4c8fe23d626008a2dd39 Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Wed, 19 Nov 2025 16:35:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/service/impl/RepairServiceImpl.java     | 16 ++++++++--------
 .../main/resources/mapper/base/RepairMapper.xml  |  7 +++++--
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java
index 39c7339..49b2a4c 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java
@@ -166,14 +166,14 @@ public class RepairServiceImpl implements RepairService {
         }
 
 
-        if (!CollectionUtils.isEmpty(repairMaTypeList)) {
-            for (RepairTaskDetails repairTaskDetails : repairMaTypeList) {
-                // 根据合格数量和报废数量，对数据状态status重新定值完成状态,考虑维修查看页面的展示
-                if (repairTaskDetails.getRepairedNum() == 0 && repairTaskDetails.getScrapNum() == 0) {
-                    repairTaskDetails.setStatus("0");
-                }
-            }
-        }
+//        if (!CollectionUtils.isEmpty(repairMaTypeList)) {
+//            for (RepairTaskDetails repairTaskDetails : repairMaTypeList) {
+//                // 根据合格数量和报废数量，对数据状态status重新定值完成状态,考虑维修查看页面的展示
+//                if (repairTaskDetails.getRepairedNum() == 0 && repairTaskDetails.getScrapNum() == 0) {
+//                    repairTaskDetails.setStatus("0");
+//                }
+//            }
+//        }
         return repairMaTypeList;
     }
 
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/RepairMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/RepairMapper.xml
index d2162d5..364416f 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/RepairMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/RepairMapper.xml
@@ -487,7 +487,10 @@
         rad.repaired_num as repairedNum,
         rad.repair_remark as repairRemark,
         rad.scrap_num as scrapNum,
-        rad.status as status,
+        case
+            when rad.repaired_num = 0 and rad.scrap_num = 0 then '0'
+            else rad.status
+        end as status,
         rad.update_time as updateTime,
         rad.type_id as typeId,
         rad.repairer as repairer,
@@ -515,7 +518,7 @@
             </if>
         </where>
         order by
-        sub.createTime desc
+        sub.maId desc
     </select>
 
     <select id="getRepairPartListNew" resultType="com.bonus.sgzb.base.domain.RepairPartDetails">