From 40b6fa35b9f3917ecad29c97b8a0ca037d3fb7e4 Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Wed, 5 Mar 2025 14:48:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=B1=BB=E5=9E=8B=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sgzb/material/controller/SelectController.java   |  9 +++++++++
 .../com/bonus/sgzb/material/mapper/SelectMapper.java |  7 +++++++
 .../bonus/sgzb/material/service/SelectService.java   |  7 +++++++
 .../material/service/impl/SelectServiceImpl.java     | 12 ++++++++++++
 .../resources/mapper/base/MaMachineTypeMapper.xml    |  2 +-
 .../main/resources/mapper/material/SelectMapper.xml  |  8 ++++++++
 6 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SelectController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SelectController.java
index 4ec0b6b..0cb7e3e 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SelectController.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SelectController.java
@@ -46,6 +46,15 @@ public class SelectController {
         return service.getMaTypeData(dto);
     }
 
+    /**
+     * 根据三级查四级
+     */
+    @ApiOperation(value = "机具类型下拉选")
+    @PostMapping("getMaTypeDataById")
+    public AjaxResult getMaTypeDataById(@RequestBody SelectDto dto){
+        return service.getMaTypeDataById(dto);
+    }
+
     @ApiOperation(value = "数据字典下拉选")
     @PostMapping("getDictByPidCbx")
     public AjaxResult getDictByPidCbx(@RequestBody SelectDto dto){
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/SelectMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/SelectMapper.java
index 65a0879..dad5a47 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/SelectMapper.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/SelectMapper.java
@@ -197,4 +197,11 @@ public interface SelectMapper {
      * @return List<SelectVo>
      */
     List<SelectVo> getLevelTwoUnitData(SelectDto dto);
+
+    /**
+     * 机具类型下拉选
+     * @param dto
+     * @return
+     */
+    List<SelectVo> getMaTypeDataById(SelectDto dto);
 }
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/SelectService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/SelectService.java
index 7141c4b..8a8e2c7 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/SelectService.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/SelectService.java
@@ -182,4 +182,11 @@ public interface SelectService {
     * @return AjaxResult
     */
     AjaxResult getLevelTwoUnitData(SelectDto dto);
+
+    /**
+     * 机具类型下拉选 根据三级查四级
+     * @param dto
+     * @return
+     */
+    AjaxResult getMaTypeDataById(SelectDto dto);
 }
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SelectServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SelectServiceImpl.java
index 2388e3a..f38aa0d 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SelectServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SelectServiceImpl.java
@@ -74,6 +74,18 @@ public class SelectServiceImpl implements SelectService {
         return AjaxResult.success(list);
     }
 
+    @Override
+    public AjaxResult getMaTypeDataById(SelectDto dto) {
+        List<SelectVo> list = new ArrayList<>();
+        try {
+            list = mapper.getMaTypeDataById(dto);
+        } catch (Exception e) {
+            log.error("机具类型-查询失败", e);
+        }
+        return AjaxResult.success(list);
+    }
+
+
     @Override
     public AjaxResult getDictByPidCbx(SelectDto dto) {
         List<SelectVo> list = new ArrayList<>();
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineTypeMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineTypeMapper.xml
index c3af71d..800b3ed 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineTypeMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineTypeMapper.xml
@@ -168,7 +168,7 @@
             <if test="facModel != null">fac_model = #{facModel},</if>
             <if test="intelligentCode != null">intelligent_code = #{intelligentCode},</if>
             <if test="isReplace != null">is_replace = #{isReplace},</if>
-            <if test="isStoage != null">is_storage = #{isStorage},</if>
+            <if test="isStorage != null">is_storage = #{isStorage},</if>
         </trim>
         where type_id = #{typeId}
     </update>
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SelectMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SelectMapper.xml
index 7802c9a..5d9068b 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SelectMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SelectMapper.xml
@@ -49,6 +49,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM ma_type
         WHERE `level` = #{type} AND del_flag = '0'
     </select>
+
+    <select id="getMaTypeDataById" resultType="com.bonus.sgzb.material.domain.SelectVo">
+        SELECT type_id   AS id,
+               type_name AS `name`
+        FROM ma_type
+        WHERE del_flag = '0'
+          AND parent_id = #{id}
+    </select>
     <!--数据字典下拉选-->
     <select id="getDictByPidCbx" resultType="com.bonus.sgzb.material.domain.SelectVo">
         SELECT sd2.id,sd2.`name`