From 344a4b6694521a151f53821a3991134ac129c6a9 Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Tue, 15 Oct 2024 10:55:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E4=BD=8D=E7=B1=BB=E5=9E=8B=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E7=BB=91=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/material/basic/domain/BmUnit.java   |  5 ++-
 .../mapper/material/basic/BmUnitMapper.xml    | 39 ++++++++++++++++---
 2 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnit.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnit.java
index 62e5541d..9af11ee7 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnit.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnit.java
@@ -33,10 +33,13 @@ public class BmUnit extends BaseEntity
     private String status;
 
     /** 单位类型 */
-    @Excel(name = "单位类型")
     @ApiModelProperty(value = "单位类型")
     private Long typeId;
 
+    @Excel(name = "单位类型")
+    @ApiModelProperty(value = "单位类型名称")
+    private String typeName;
+
     /** 联系人 */
     @Excel(name = "联系人")
     @ApiModelProperty(value = "联系人")
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmUnitMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmUnitMapper.xml
index 98fc928d..f997f12b 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmUnitMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmUnitMapper.xml
@@ -23,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select unit_id, unit_name, status, type_id, link_man, telphone, dept_id, del_flag, create_by, create_time, update_by, update_time, remark from bm_unit
     </sql>
 
-    <select id="selectBmUnitList" parameterType="com.bonus.material.basic.domain.BmUnit" resultMap="BmUnitResult">
+    <select id="selectBmUnitList1" parameterType="com.bonus.material.basic.domain.BmUnit" resultMap="BmUnitResult">
         <include refid="selectBmUnitVo"/>
         <where>
             del_flag = 0
@@ -36,10 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     
-    <select id="selectBmUnitByUnitId" parameterType="Long" resultMap="BmUnitResult">
-        <include refid="selectBmUnitVo"/>
-        where del_flag = 0 and unit_id = #{unitId}
-    </select>
+
 
     <select id="selectBmUnitByProName" resultType="com.bonus.material.basic.domain.BmUnit">
         select unit_id as unitId, unit_name as unitName from bm_unit where del_flag = 0 and unit_name = #{unitName}
@@ -49,6 +46,38 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select count(1) from bm_unit_person where unit_id = #{unitId}
     </select>
 
+    <select id="selectBmUnitList" resultType="com.bonus.material.basic.domain.BmUnit">
+        select bu.unit_id as unitId, bu.unit_name as unitName, bu.status as status, bu.type_id as typeId, but.type_name
+        as typeName, bu.link_man as
+        linkMan, bu.telphone as telphone,
+        bu.dept_id as deptId, bu.del_flag as delFlag, bu.create_by as createBy, bu.create_time as createTime,
+        bu.update_by as updateBy, bu.update_time as updateTime, bu.remark as remark from bm_unit bu
+        left join bm_unit_type but on but.type_id = bu.type_id and but.del_flag = 0
+        where
+        bu.del_flag = 0
+            <if test="unitName != null  and unitName != ''">and unit_name like concat('%', #{unitName}, '%')</if>
+    </select>
+
+    <select id="selectBmUnitByUnitId" resultType="com.bonus.material.basic.domain.BmUnit">
+        select bu.unit_id     as unitId,
+               bu.unit_name   as unitName,
+               bu.status      as status,
+               bu.type_id     as typeId,
+               but.type_name  as typeName,
+               bu.link_man    as linkMan,
+               bu.telphone    as telphone,
+               bu.dept_id     as deptId,
+               bu.del_flag    as delFlag,
+               bu.create_by   as createBy,
+               bu.create_time as createTime,
+               bu.update_by   as updateBy,
+               bu.update_time as updateTime,
+               bu.remark      as remark
+        from bm_unit bu
+                 left join bm_unit_type but on but.type_id = bu.type_id and but.del_flag = 0
+        where bu.del_flag = 0 and bu.unit_id = #{unitId}
+    </select>
+
     <insert id="insertBmUnit" parameterType="com.bonus.material.basic.domain.BmUnit" useGeneratedKeys="true" keyProperty="unitId">
         insert into bm_unit
         <trim prefix="(" suffix=")" suffixOverrides=",">