From 6460f63eecd56e621e28568dc8907f1d88641655 Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Mon, 10 Nov 2025 09:03:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bonus/material/basic/domain/BmAgreementInfo.java  | 3 +++
 .../resources/mapper/material/basic/BmAgreementInfoMapper.xml  | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmAgreementInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmAgreementInfo.java
index fe169166..6a8ac1f1 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmAgreementInfo.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmAgreementInfo.java
@@ -152,4 +152,7 @@ public class BmAgreementInfo extends BaseEntity
 
     @ApiModelProperty(value = "班组id")
     private Long teamId;
+
+    @ApiModelProperty(value = "所属项目部名称")
+    private String projectUnitName;
 }
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmAgreementInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmAgreementInfoMapper.xml
index 84486967..d8394ace 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmAgreementInfoMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmAgreementInfoMapper.xml
@@ -64,11 +64,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectBmAgreementInfoByAgreementId" parameterType="Long" resultMap="BmAgreementInfoResult">
         SELECT bai.agreement_id, bai.agreement_code , contract_code,sign_time,
-               bu.unit_id, bai.project_unit_id, bu.unit_name , bp.pro_id as projectId , bp.pro_name as projectName,
+               bu.unit_id, bai.project_unit_id,bu2.unit_name as projectUnitName, bu.unit_name , bp.pro_id as projectId , bp.pro_name as projectName,
                plan_start_time,lease_day,auth_person,phone,bai.remark,bai.protocol,tta.task_id,bai.branch_project as branchProIdsStr
         FROM bm_agreement_info bai
              LEFT JOIN bm_project bp ON bp.pro_id = bai.project_id
              LEFT JOIN bm_unit bu ON bu.unit_id = bai.unit_id
+             LEFT JOIN bm_unit bu2 on bu2.unit_id=bai.project_unit_id
              LEFT JOIN (select MIN(task_id) as task_id,agreement_id from tm_task_agreement
                         where agreement_id = #{agreementId}) tta on bai.agreement_id = tta.agreement_id
         where bai.status = '1' and bai.agreement_id = #{agreementId}