From 8c3665d599a6a970833952578a2a0c46c8e3ca31 Mon Sep 17 00:00:00 2001
From: csyue <1203338439@qq.com>
Date: Wed, 5 Jun 2024 17:48:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=95=E8=BF=90=E8=A1=8C=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/app/TmTaskMapper.xml     |  2 +-
 .../impl/PurchaseMacodeInfoServiceImpl.java   | 40 +++++++++----------
 .../impl/RepairTestInputServiceImpl.java      |  5 +--
 3 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
index 34c822a9..7e2f5204 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
@@ -584,7 +584,7 @@
           AND (bai.agreement_code like concat('%', #{record.keyWord}, '%') or tt.code like concat('%', #{record.keyWord}, '%'))
       </if>
       GROUP BY tt.task_id
-      ORDER BY tt.update_time DESC
+      ORDER BY tt.task_status,tt.update_time DESC
   </select>
 
   <select id="getAuditListByLeaseInfo" resultType="com.bonus.sgzb.app.domain.LeaseApplyInfo">
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java
index 82581601..64d17946 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java
@@ -55,7 +55,6 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
     private PurchaseCheckDetailsMapper checkDetailsMapper;
 
 
-
     /**
      * 查询新购验收编号管理
      *
@@ -77,19 +76,19 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
     public List<PurchaseMacodeInfo> selectPurchaseMacodeInfoList(PurchaseMacodeInfo purchaseMacodeInfo) {
 
         List<PurchaseMacodeInfo> purchaseMacodeInfoList = purchaseMacodeInfoMapper.selectPurchaseMacodeInfoList(purchaseMacodeInfo);
-       //判断有没有绑定固定资产
-        if (purchaseMacodeInfoList.size() > 0 && purchaseMacodeInfoList.get(0).getFixCode()!=null){
-           Map<Object,Long> groupCounts = purchaseMacodeInfoList.stream().map(PurchaseMacodeInfo::getFixCode).collect(Collectors.groupingBy(String::valueOf, Collectors.counting()));
-          //去重
-           purchaseMacodeInfoList = purchaseMacodeInfoList.stream().distinct().collect(Collectors.toList());
-           for (PurchaseMacodeInfo purchaseMacodeInfo1 : purchaseMacodeInfoList) {
-               groupCounts.forEach((fixCode, count) -> {
-                   if (purchaseMacodeInfo1.getFixCode().equals(fixCode)) {
-                       purchaseMacodeInfo1.setBindNum(count.intValue());
-                   }
-               });
-           }
-       }
+        //判断有没有绑定固定资产
+        if (purchaseMacodeInfoList.size() > 0 && purchaseMacodeInfoList.get(0).getFixCode() != null) {
+            Map<Object, Long> groupCounts = purchaseMacodeInfoList.stream().map(PurchaseMacodeInfo::getFixCode).collect(Collectors.groupingBy(String::valueOf, Collectors.counting()));
+            //去重
+            purchaseMacodeInfoList = purchaseMacodeInfoList.stream().distinct().collect(Collectors.toList());
+            for (PurchaseMacodeInfo purchaseMacodeInfo1 : purchaseMacodeInfoList) {
+                groupCounts.forEach((fixCode, count) -> {
+                    if (purchaseMacodeInfo1.getFixCode().equals(fixCode)) {
+                        purchaseMacodeInfo1.setBindNum(count.intValue());
+                    }
+                });
+            }
+        }
         return purchaseMacodeInfoList;
     }
 
@@ -329,7 +328,7 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
                 purchaseMacodeInfoMapper.updateTypeByTypeId(maType);
 
                 //判断是否是成套机具，是的话配件库存也要增加
-                if ("2".equals(maType.getManageType())){
+                if ("2".equals(maType.getManageType())) {
                     PurchaseCheckInfo purchaseCheckInfo = new PurchaseCheckInfo();
                     purchaseCheckInfo.setPurchaseNum(maInputRecord.getInputNum().toString());
                     purchaseCheckInfo.setTypeId(maInputRecord.getTypeId());
@@ -378,8 +377,8 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
             }
         }
         //判断是否全部已操作（通过或不通过）
-        int count=purchaseMacodeInfoMapper.isOperateAll(taskId);
-        if (count<=0){
+        int count = purchaseMacodeInfoMapper.isOperateAll(taskId);
+        if (count <= 0) {
             //全部审核任务状态改为已审核
             TmTask task = new TmTask();
             task.setTaskId(taskId);
@@ -430,10 +429,9 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
     public List<PurchaseMacodeInfo> selectPutinDetails(PurchaseMacodeInfo purchaseMacodeInfo) {
         List<PurchaseMacodeInfo> purchaseMacodeInfos = purchaseMacodeInfoMapper.selectPutinDetails(purchaseMacodeInfo);
         for (PurchaseMacodeInfo macodeInfo : purchaseMacodeInfos) {
-            List<String> userIds =  purchaseMacodeInfoMapper.selectKeepUser(macodeInfo.getTypeId().intValue());
-            if (CollUtil.isNotEmpty(userIds)){
-                macodeInfo.setUserIds(userIds);
-            }
+            List<String> userIds = purchaseMacodeInfoMapper.selectKeepUser(macodeInfo.getTypeId().intValue());
+            userIds.add("1");
+            macodeInfo.setUserIds(userIds);
         }
         return purchaseMacodeInfos;
     }
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairTestInputServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairTestInputServiceImpl.java
index e0ace689..5a773b42 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairTestInputServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairTestInputServiceImpl.java
@@ -58,9 +58,8 @@ public class RepairTestInputServiceImpl implements RepairTestInputService {
         List<RepairTestInputDetailVo> repairedDetailList = mapper.getRepairedDetailList(dto);
         for (RepairTestInputDetailVo repairTestInputDetailVo : repairedDetailList) {
             List<String> userIds = purchaseMacodeInfoMapper.selectKeepUser(repairTestInputDetailVo.getTypeId());
-            if (CollUtil.isNotEmpty(userIds)) {
-                repairTestInputDetailVo.setUserIds(userIds);
-            }
+            userIds.add("1");
+            repairTestInputDetailVo.setUserIds(userIds);
         }
         return repairedDetailList;
     }