From 81f82e30075956596f15435a61de43576b982939 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Thu, 4 Sep 2025 19:54:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/push/domain/MachineInfoBean.java |  7 +++++-
 .../material/push/domain/ProIdsBean.java      |  3 +++
 .../push/service/impl/ProDataUseInfoImpl.java |  2 +-
 .../material/push/ProDataUseInfoMapper.xml    | 23 ++++++++++---------
 4 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/MachineInfoBean.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/MachineInfoBean.java
index 66803c40..03d12e39 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/MachineInfoBean.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/MachineInfoBean.java
@@ -51,7 +51,12 @@ public class MachineInfoBean {
     private String personName;
 
     // 联系方式
-    private String personPhone;
+    private String persoPhone;
+
+    private String specification;
+    private String materialName;
+    private String materialDw;
+    private String subKcNum;
 
 
 }
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/ProIdsBean.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/ProIdsBean.java
index 91f9ba30..fba3cf96 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/ProIdsBean.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/ProIdsBean.java
@@ -23,6 +23,9 @@ public class ProIdsBean {
     private String proCenter;
     private Integer deptId;
     private BigDecimal typeNum;
+    private String materialName;
+
+    private String specification;
 
     /**
      * 1 牵张设备  2 抱杆  3动力设备  4 变电专业设备 5安全工器具  6自主创新设备  7其他
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/impl/ProDataUseInfoImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/impl/ProDataUseInfoImpl.java
index 8eadba95..a2da1fdf 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/impl/ProDataUseInfoImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/impl/ProDataUseInfoImpl.java
@@ -180,7 +180,7 @@ public class ProDataUseInfoImpl implements ProDataUseInfoService {
         for (MachineInfoBean machineDetail : maTypeList) {
             SysUser user = proDataUseInfoMapper.getPersonNameAndPhone(machineDetail);
             machineDetail.setPersonName(user.getNickName());
-            machineDetail.setPersonPhone(user.getPhonenumber());
+            machineDetail.setPersoPhone(user.getPhonenumber());
         }
         return maTypeList;
     }
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml
index 845c4838..82982904 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml
@@ -76,7 +76,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ELSE
         IFNULL(mt.storage_num, 0) + IFNULL(subquery1.usNum, 0) + IFNULL(subquery2.repairNum, 0)
         END                             AS inventoryNum,
-        subquery1.unitName AS unitName,
         mt2.is_statics AS isStatics
         FROM ma_type mt
         LEFT JOIN (
@@ -174,7 +173,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN ma_type mt2 on mt2.type_id = mt.parent_id
         LEFT JOIN ma_type mt3 ON mt3.type_id = mt2.parent_id
         LEFT JOIN ma_type mt4 ON mt4.type_id = mt3.parent_id
-        WHERE mt.del_flag = '0' and mt.`level` = '4'
+        WHERE mt.del_flag = '0' and mt.`level` = '4' and mt2.is_statics is not null
         <if test="isStatics != null">
             and mt2.is_statics = #{isStatics}
         </if>
@@ -289,7 +288,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         mt.type_name as typeModelName,
         mt.unit_name as unit,
         mt2.type_name as typeName,
-        sd.dept_name as deptName
+        sd.dept_name as deptName,
+        sd.pro_center as proCenter
         from slt_agreement_info sai
         left join bm_agreement_info bai on sai.agreement_id = bai.agreement_id
         left join bm_project bp on bai.project_id = bp.pro_id
@@ -361,21 +361,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getMaTypeList" resultType="com.bonus.material.push.domain.MachineInfoBean">
         SELECT
         mt.type_id AS typeId,
-        mt.type_name AS typeModelName,
-        mt2.type_name AS typeName,
-        mt.unit_name AS unit,
-        mt.storage_num AS num
+        mt.type_name AS specification,
+        mt2.type_name AS materialName,
+        mt.unit_name AS materialDw,
+        mt.storage_num AS subKcNum
         FROM
         ma_type mt
         LEFT JOIN ma_type mt2 ON mt.parent_id = mt2.type_id
         WHERE
         mt.del_flag = 0
         AND mt.`level` =4
-        <if test="typeName != null and typeName !=''">
-            AND mt2.type_name like concat ('%', #{typeName}, '%')
+        <if test="materialName != null and materialName !=''">
+            AND mt2.type_name like concat ('%', #{materialName}, '%')
         </if>
-        <if test="typeModelName != null and typeModelName !=''">
-            AND mt.type_name like concat ('%', #{typeModelName}, '%')
+        <if test="specification != null and specification !=''">
+            AND mt.type_name like concat ('%', #{specification}, '%')
         </if>
     </select>
     <select id="getUseNumsDetails" resultType="com.bonus.material.push.domain.MachineInfoBean">
@@ -651,6 +651,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             sai.num num,
             mt.type_name as typeModelName,
             mt.unit_name as unit,
+            sd.dept_name,
             mt2.type_name as typeName
         from slt_agreement_info sai
                  left join bm_agreement_info bai on sai.agreement_id = bai.agreement_id