From c7b3e2f7f8c48d827d715ae3c9c8761b95f35ee4 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Tue, 19 Nov 2024 13:50:48 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E6=A8=A1=E5=9D=97=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/lease/domain/LeaseApplyInfo.java |  6 ++++++
 .../lease/mapper/LeaseApplyDetailsMapper.java |  2 ++
 .../impl/LeaseApplyInfoServiceImpl.java       |  6 +++++-
 .../lease/LeaseApplyDetailsMapper.xml         | 20 +++++++++++++++++++
 4 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyInfo.java
index ca75a00c..1c993bf3 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyInfo.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyInfo.java
@@ -186,6 +186,12 @@ public class LeaseApplyInfo extends BaseEntity {
     @Excel(name = "领料工程", sort = 3)
     private String projectName;
 
+    /**
+     * 领料物资名称汇总
+     */
+    @ApiModelProperty(value = "领料物资名称汇总")
+    private String maTypeNames;
+
     /**
      * 预领料合计数
      */
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyDetailsMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyDetailsMapper.java
index 4e6ce118..059b6136 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyDetailsMapper.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyDetailsMapper.java
@@ -76,4 +76,6 @@ public interface LeaseApplyDetailsMapper {
     int updateLeaseApplyDetailsByLeaseOutRecord(@Param("record") LeaseOutDetails record);
 
     LeaseApplyDetails getOutboundNum(LeaseOutDetails record);
+
+    String selectMaTypeNameByParentId(Long parentId);
 }
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 e05866a5..b0679885 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
@@ -92,7 +92,11 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
      */
     @Override
     public List<LeaseApplyInfo> selectLeaseApplyInfoList(LeaseApplyInfo leaseApplyInfo) {
-        return leaseApplyInfoMapper.selectLeaseApplyInfoList(leaseApplyInfo);
+        List<LeaseApplyInfo> list = leaseApplyInfoMapper.selectLeaseApplyInfoList(leaseApplyInfo);
+        for (LeaseApplyInfo applyInfo : list) {
+            applyInfo.setMaTypeNames(leaseApplyDetailsMapper.selectMaTypeNameByParentId(applyInfo.getId()));
+        }
+        return list;
     }
 
     /**
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml
index f61195c3..3deba40e 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml
@@ -194,4 +194,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM lease_apply_details
         WHERE id = #{id} AND (pre_num - IFNULL(al_num, 0)) > 0
     </select>
+
+    <select id="selectMaTypeNameByParentId" resultType="java.lang.String">
+        select
+            GROUP_CONCAT(type_name) typeName
+        from
+            (
+            select
+                distinct lad.parent_id, mt1.type_name
+            from
+                lease_apply_details lad
+                left join ma_type mt on lad.type_id = mt.type_id
+                left join ma_type mt1 on mt.parent_id = mt1.type_id
+            where
+                1=1
+                <if test="parentId != null">
+                    and lad.parent_id = #{parentId}
+                </if>
+            ) t
+        GROUP BY parent_id
+    </select>
 </mapper>
\ No newline at end of file