From e495597f4ee6a689b793d80f3e6346b083a93390 Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Wed, 3 Dec 2025 14:59:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E5=B7=A5=E5=99=A8=E5=85=B7?=
 =?UTF-8?q?=E7=9A=84=E5=8D=8F=E8=AE=AE=E5=8C=85=E5=90=AB=E6=9C=BA=E5=85=B7?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E8=83=BD=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/common/biz/domain/lease/LeaseApplyInfo.java    | 3 +++
 .../com/bonus/material/common/domain/vo/AgreementVo.java     | 4 ++++
 .../main/resources/mapper/material/common/SelectMapper.xml   | 3 ++-
 .../main/resources/mapper/material/lease/LeaseTaskMapper.xml | 5 +++++
 .../src/main/resources/mapper/material/ma/TypeMapper.xml     | 3 ++-
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java
index 47db4a3d..bf94393b 100644
--- a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java
+++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java
@@ -382,4 +382,7 @@ public class LeaseApplyInfo extends BaseEntity{
 
     @ApiModelProperty(value = "附件配件类四级类型id集合")
     private Set<String> typeIdSet;
+
+    @ApiModelProperty(value = "是否是安全工机具（0：否，1：是）")
+    private Integer isSafeType;
 }
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/domain/vo/AgreementVo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/domain/vo/AgreementVo.java
index 85170d1c..9a063356 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/domain/vo/AgreementVo.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/domain/vo/AgreementVo.java
@@ -25,4 +25,8 @@ public class AgreementVo implements Serializable {
     private String signTime;
 
 
+    /** 是否是安全工机具协议（0：不是，1：是）*/
+    private Integer isSafeType;
+
+
 }
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 73976c92..a57f688e 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,7 +210,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getAgreementInfoById" resultType="com.bonus.material.common.domain.vo.AgreementVo">
         SELECT agreement_id AS agreementId,
                agreement_code AS agreementCode,
-               is_slt AS isSlt
+               is_slt AS isSlt,
+               is_safe_type AS isSafeType
         FROM bm_agreement_info
         WHERE unit_id = #{unitId} AND project_id = #{projectId} AND status = '1'
     </select>
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml
index 925da796..8001140f 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml
@@ -41,6 +41,7 @@
         <result property="nextNodeId" column="next_node_id"/>
         <result property="nodeId" column="node_id"/>
         <result property="recordId" column="record_id"/>
+        <result property="isSafeType" column="is_safe_type"/>
     </resultMap>
 
     <resultMap type="com.bonus.material.lease.domain.LeaseApplyDetails" id="LeaseApplyDetailsResult">
@@ -494,6 +495,7 @@
             lai.unit_id,lai.project_id,bu.unit_name, bp.pro_name, tt.task_status as taskStatus,
             lai.supplier_time as supplierTime,
             lai.supplier_place as supplierPlace,
+            bai.is_safe_type as isSafeType,
             case tt.task_status
                 when 0 then '待审核'
                 when 1 then '待审核'
@@ -512,6 +514,7 @@
                 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 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 = lai.unit_id
                 left join bm_project bp on bp.pro_id = lai.project_id
                 left join sys_dept sd on sd.dept_id = bp.imp_unit
@@ -752,6 +755,7 @@
             mt.type_name AS typeName,
             mt2.type_id AS thirdTypeId,
             mt2.type_name AS maTypeName,
+            mt.jiju_type as jijuType,
             CASE
                 mt.manage_type
                 WHEN 0 THEN
@@ -1196,6 +1200,7 @@
     <select id="selectPendingOutNum" resultType="com.bonus.material.lease.domain.LeaseApplyDetails">
         SELECT
             #{typeId} as typeId,
+            mt.jiju_type as jiJuType,
             COALESCE(SUM(combined.pendingOutNum), 0) as pendingOutNum,
             CASE mt.manage_type
                 WHEN 0 THEN
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml
index fbeb60d7..9e46e553 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml
@@ -537,7 +537,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                         IFNULL(m.storage_num, 0)
                         END as storage_num,
                         m.company_id as companyId,
-                        IFNULL(subquery1.pendingOutNum,0) as pendingOutNum
+                        IFNULL(subquery1.pendingOutNum,0) as pendingOutNum,
+                        m.jiju_type
         from ma_type m
                  left join (SELECT mt.type_id,
                             mt2.type_name AS             typeName,