From 1bffc4c4e32df2b5f6a3e994407b9e9b811139ec Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Mon, 10 Feb 2025 17:21:16 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E7=94=B3=E8=AF=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/common/biz/domain/lease/LeaseApplyInfo.java    | 3 +++
 .../material/lease/mapper/LeaseApplyInfoMapper.java      | 3 +++
 .../lease/service/impl/LeaseApplyInfoServiceImpl.java    | 8 ++++++++
 .../mapper/material/lease/LeaseApplyInfoMapper.xml       | 9 +++++++++
 4 files changed, 23 insertions(+)

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 f699c1a2..9b0c95f6 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
@@ -54,6 +54,9 @@ public class LeaseApplyInfo extends BaseEntity{
     @Excel(name = "租赁单位")
     private String leaseUnit;
 
+    @ApiModelProperty(value = "发料单位")
+    private String sendUnit;
+
     @ApiModelProperty(value = "领料id")
     private Integer leaseUnitId;
 
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyInfoMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyInfoMapper.java
index 79336de0..bcb23871 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyInfoMapper.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyInfoMapper.java
@@ -70,4 +70,7 @@ public interface LeaseApplyInfoMapper {
 
     /** 设置审批人签名url  防止代码冲突  **/
     String getDirectAuditUrl(LeaseApplyInfo leaseApplyInfo);
+
+    /** 设置发料单位  防止代码冲突  **/
+    String getSendUnit(LeaseApplyInfo leaseApplyInfo);
 }
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java
index e3ec397e..69fd8171 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java
@@ -102,6 +102,14 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
                 String directAuditUrl =   leaseApplyInfoMapper.getDirectAuditUrl(info);
                 info.setDirectAuditSignUrl(directAuditUrl);
                 /** 设置审批人签名url  防止代码冲突  **/
+
+                /** 设置发料单位  防止代码冲突  **/
+                if(info.getDirectAuditBy() != null){
+                    String sendUnit =   leaseApplyInfoMapper.getSendUnit(info);
+                    info.setSendUnit(sendUnit);
+                }
+                /** 设置发料单位  防止代码冲突  **/
+
                 leaseApplyRequestVo.setLeaseApplyInfo(info);
                 // 获取领料单详情
                 List<LeaseApplyDetails> details = leaseApplyDetailsMapper.selectLeaseApplyDetailsList(new LeaseApplyDetails(info.getId(), keyword, userId));
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 e6c335d8..ba4940bc 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
@@ -248,4 +248,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from sys_user su
         where su.user_id = #{directAuditBy} and su.del_flag = 0
     </select>
+
+    <!--   设置发料单位  防止代码冲突-->
+    <select id="getSendUnit"  resultType="java.lang.String">
+        select
+            sd.dept_name as sendUnit
+        from sys_user su
+        left join sys_dept sd on su.dept_id = sd.dept_id and sd.del_flag = 0
+        where su.user_id = #{directAuditBy} and su.del_flag = 0
+    </select>
 </mapper>
\ No newline at end of file