From 964a5a8c901bb1e7daa07edb8fc0d5e8aef83e6a Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Thu, 14 Aug 2025 14:59:09 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=96=99=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

---
 .../service/impl/BackApplyServiceImpl.java    | 10 ++---
 .../mapper/material/BackApplyMapper.xml       | 40 +++++++++----------
 2 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java
index cfc1b69..d076ca4 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java
@@ -1348,12 +1348,12 @@ public class BackApplyServiceImpl implements BackApplyService {
         if (dto == null) {
             return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), "参数不能为空");
         }
-        if (dto.getUnitId() == null) {
-            return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), "单位ID为空");
-        }
-        if (dto.getProjectId() == null) {
-            return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), "工程ID为空");
+        if (dto.getAgreementId() == null) {
+            return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), "协议ID为空");
         }
+//        if (dto.getProjectId() == null) {
+//            return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), "工程ID为空");
+//        }
         if (StringUtils.isBlank(dto.getTypeId())) {
             return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), "机具类型ID为空");
         }
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
index 4e26c7f..37a25eb 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
@@ -1188,33 +1188,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getMachineById" resultType="com.bonus.sgzb.base.api.domain.MaCodeDto">
         SELECT
-            mm.ma_id AS maId,
-            mm.ma_code AS maCode,
-            mm.ma_status AS maStatus,
-            mt1.type_name AS typeName,
-            mm.type_id AS typeId,
-            mt.type_name AS materialName,
-            mt2.type_name AS materialType
+        mm.ma_id AS maId,
+        mm.ma_code AS maCode,
+        mm.ma_status AS maStatus,
+        mt1.type_name AS typeName,
+        mm.type_id AS typeId,
+        mt.type_name AS materialName,
+        mt2.type_name AS materialType
         FROM
-            lease_out_details lod
-                LEFT JOIN ma_machine mm ON lod.ma_id = mm.ma_id
-                LEFT JOIN ma_type mt ON mm.type_id = mt.type_id
-                AND mt.del_flag = '0'
-                LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id
-                AND mt1.del_flag = '0'
-                LEFT JOIN ma_type mt2 ON mt1.parent_id = mt2.type_id
-                AND mt2.del_flag = '0'
-                LEFT JOIN slt_agreement_info sai on lod.type_id = sai.type_id
-                and sai.ma_id = lod.ma_id
-                LEFT JOIN bm_agreement_info ba ON sai.agreement_id = ba.agreement_id
+        slt_agreement_info sai
+        LEFT JOIN ma_machine mm ON sai.ma_id = mm.ma_id
+        LEFT JOIN ma_type mt ON mm.type_id = mt.type_id
+        AND mt.del_flag = '0'
+        LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id
+        AND mt1.del_flag = '0'
+        LEFT JOIN ma_type mt2 ON mt1.parent_id = mt2.type_id
+        AND mt2.del_flag = '0'
+
         WHERE
-          mm.ma_status = '16' and mm.type_id = #{typeId}
-          AND ba.unit_id = #{unitId}
-          AND ba.project_id = #{projectId}
+        sai.status = '0' and mm.type_id = #{typeId}
+        and sai.agreement_id = #{agreementId}
           <if test="maCode != null and maCode != ''">
               and mm.ma_code like concat('%',#{maCode},'%')
           </if>
-        GROUP BY mm.ma_code
     </select>
 
     <select id="queryBackCode" resultType="java.lang.Integer">