From 43c2c01c7be099a5b9bdd25c9f49b79c5fb297c2 Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Wed, 5 Mar 2025 14:32:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/material/ma/domain/Machine.java |  2 +-
 .../material/ma/mapper/MachineMapper.java     |  7 +++++++
 .../ma/service/impl/MachineServiceImpl.java   | 21 ++++++++++++++++++-
 .../mapper/material/ma/MachineMapper.xml      | 20 +++++++++++++++++-
 4 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Machine.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Machine.java
index df10da9d..598933ec 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Machine.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Machine.java
@@ -179,6 +179,6 @@ public class Machine extends BaseEntity
     @ApiModelProperty("检测报告地址")
     private String exUrl;
 
-    @ApiModelProperty("是否为机具")
+    @ApiModelProperty("是否为机具 (0 代表机具)")
     private Integer isJj;
 }
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/MachineMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/MachineMapper.java
index 07175a97..51e46213 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/MachineMapper.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/MachineMapper.java
@@ -120,4 +120,11 @@ public interface MachineMapper
      * @return
      */
     Long selectMaId(LeaseApplyInfo leaseApplyInfo);
+
+    /**
+     * 查询机具信息
+     * @param dto
+     * @return
+     */
+    Machine selectHouse(Machine dto);
 }
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/MachineServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/MachineServiceImpl.java
index 96909ef0..0e7b559d 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/MachineServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/MachineServiceImpl.java
@@ -195,9 +195,28 @@ public class MachineServiceImpl implements IMachineService
         return AjaxResult.success(typeList);
     }
 
+    /**
+     * 查询电子标签信息
+     * @param machine
+     * @return
+     */
     @Override
     public List<Machine> getElectronicLabel(Machine machine) {
-        return machineMapper.getElectronicLabel(machine);
+        List<Machine> list = machineMapper.getElectronicLabel(machine);
+        if (CollectionUtils.isNotEmpty(list)) {
+            for (Machine dto : list) {
+                // 根据typeId查询信息
+                Machine info = machineMapper.selectHouse(dto);
+                if (info != null) {
+                    if ("机具库".equals(info.getOwnHouse())) {
+                        dto.setIsJj(0);
+                    } else {
+                        dto.setIsJj(1);
+                    }
+                }
+            }
+        }
+        return list;
     }
 
     /**
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml
index 36d761f9..c19748ba 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml
@@ -425,7 +425,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             mm.ma_vender as maVender,
             mm.ex_code as exCode,
             mm.ex_url as exUrl,
-            mm.is_jj as isJj
+            mm.is_jj as isJj,
+            mm.type_id as typeId
         FROM
             ma_machine mm
                 LEFT JOIN ma_type mt on mt.type_id=mm.type_id
@@ -441,6 +442,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE ma_code = #{maCode}
     </select>
 
+    <select id="selectHouse" resultType="com.bonus.material.ma.domain.Machine">
+        SELECT
+            whi.house_name as ownHouse
+        FROM
+            ma_type mt
+                LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id
+                AND mt1.del_flag = '0'
+                LEFT JOIN ma_type mt2 ON mt1.parent_id = mt2.type_id
+                AND mt2.del_flag = '0'
+                LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id
+                AND mt3.del_flag = '0'
+                LEFT JOIN wh_house_set whs ON mt3.type_id = whs.type_id
+                LEFT JOIN wh_house_info whi ON whs.house_id = whi.house_id
+        WHERE
+            mt.type_id = #{typeId}
+    </select>
+
     <delete id="deleteMachineByMaCodeAndTypeId">
         delete from ma_machine where ma_code = #{maCode} and type_id = #{typeId}
             and ma_status = '0'