From 5b8a37a19193d673716d6a09e6de3ffdbf2112ae Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Mon, 20 Oct 2025 18:12:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/machine/MaterialStorageInfo.java   |  6 +++++-
 .../material/clz/MaterialMachineMapper.xml    | 20 ++++++++++++++-----
 .../material/lease/LeaseApplyInfoMapper.xml   |  4 +++-
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/machine/MaterialStorageInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/machine/MaterialStorageInfo.java
index 76d6be7f..83a772f5 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/machine/MaterialStorageInfo.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/machine/MaterialStorageInfo.java
@@ -21,7 +21,7 @@ public class MaterialStorageInfo {
     private Integer id;
 
     @ApiModelProperty(value = "序号")
-    @Excel(name = "序号", width = 5)
+    @Excel(name = "序号", width = 5, cellType = Excel.ColumnType.NUMERIC)
     private Integer seq;
 
     @ApiModelProperty(value = "机具名称")
@@ -104,4 +104,8 @@ public class MaterialStorageInfo {
 
     @ApiModelProperty(value = "是否分包直领标志(0 是 1 否)")
     private String subFlag;
+
+    @ApiModelProperty(value = "是否直转标志(0 是 1 否)")
+    @Excel(name = "是否直转", width = 10, readConverterExp = "0=是,1=否")
+    private String directFlag;
 }
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml
index a6847dcf..f6edbce2 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml
@@ -236,7 +236,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sai.type_id AS typeId,
         lai.code AS code,
         sai.ma_id AS maId,
-        bp.pro_name AS proName
+        bp.pro_name AS proName,
+        CASE WHEN
+        lai.direct_id IS NULL
+        THEN '1' ELSE '0'
+        END AS directFlag
         FROM
         slt_agreement_info sai
         LEFT JOIN ma_type mt ON mt.type_id = sai.type_id
@@ -259,7 +263,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         GROUP BY
         sai.type_id,
-        sai.ma_id
+        sai.ma_id,
+        lai.direct_id
     </select>
 
     <select id="selectInFo" resultType="com.bonus.material.clz.domain.machine.MaterialStorageInfo">
@@ -1561,14 +1566,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                sai.type_id    AS typeId,
                lai.code       AS code,
                sai.ma_id      AS maId,
-               bp.pro_name    AS proName
+               bp.pro_name    AS proName,
+               CASE WHEN
+               lai.direct_id IS NULL
+               THEN '1' ELSE '0'
+               END AS directFlag
         FROM clz_slt_agreement_info sai
                  LEFT JOIN ma_type mt ON mt.type_id = sai.type_id
                  LEFT JOIN ma_type mt2 ON mt.parent_id = mt2.type_id
                  LEFT JOIN ma_machine mm ON mm.ma_id = sai.ma_id
                  LEFT JOIN clz_bm_agreement_info bai ON bai.agreement_id = sai.agreement_id
                  LEFT JOIN bm_unit bt ON bai.unit_id = bt.unit_id AND bt.del_flag = '0'
-                 LEFT JOIN lease_apply_info lai ON lai.id = sai.lease_id
+                 LEFT JOIN clz_lease_apply_info lai ON lai.id = sai.lease_id
                  LEFT JOIN bm_project bp ON bai.project_id = bp.pro_id
         WHERE sai.status = '0'
           AND sai.end_time IS NULL
@@ -1584,7 +1593,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           </if>
         GROUP BY
         sai.type_id,
-        sai.ma_id
+        sai.ma_id,
+        lai.direct_id
     </select>
 
     <select id="getImpUnitNameList" resultType="com.bonus.material.clz.domain.vo.MaterialRetainedEquipmentInfo">
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml
index b795277f..307ec1cb 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml
@@ -54,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             bai.unit_id,bai.project_id,bu.unit_name, bp.pro_name, bai.agreement_code, tt.task_status as taskStatus,
             sda.dict_label as taskStatusName,
             IFNULL(sum(lad.pre_num),0) as preCountNum,
-            IFNULL(sum(lad.al_num),0) as alNum,
+            IFNULL(sum(lod.num),0) as alNum,
             GROUP_CONCAT(DISTINCT mt1.type_name) as maTypeNames,
             bp.contract_part as contractPart,
             sd.dept_name as impUnitName,
@@ -67,6 +67,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             lease_apply_info lai
         left join tm_task tt on lai.task_id = tt.task_id
         left join lease_apply_details lad on lai.id = lad.parent_id
+        LEFT JOIN (SELECT parent_id,type_id ,IFNULL( sum( out_num ), 0 ) as num FROM lease_out_details
+        GROUP BY parent_id,type_id) lod ON lai.id = lod.parent_id and lad.type_id = lod.type_id
         left join tm_task_agreement tta on lai.task_id = tta.task_id
         left join bm_agreement_info bai on tta.agreement_id = bai.agreement_id
         left join bm_unit bu on bu.unit_id = bai.unit_id