From 17b5a846d8b83df049c2201703c70dc8206bc94c Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Thu, 14 Nov 2024 16:30:20 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E6=8E=A5=E5=8F=A3=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/material/ma/controller/MachineController.java | 4 ++-- .../src/main/resources/mapper/material/ma/MachineMapper.xml | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MachineController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MachineController.java index 916706d9..a01cfd8a 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MachineController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MachineController.java @@ -43,7 +43,7 @@ public class MachineController extends BaseController { /** * 查询机具设备管理列表 */ - @ApiOperation(value = "查询机具设备管理列表") + @ApiOperation(value = "查询机具设备管理列表1") @RequiresPermissions("ma:machine:list") @GetMapping("/list") public TableDataInfo list(Machine machine) @@ -56,7 +56,7 @@ public class MachineController extends BaseController { /** * 查询机具设备管理列表 */ - @ApiOperation(value = "查询机具设备管理列表") + @ApiOperation(value = "查询机具设备管理列表2") //@RequiresPermissions("ma:machine:typeList") @GetMapping("/getTypeList") public AjaxResult list(Type type) 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 99486019..2f9c55e8 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 @@ -92,6 +92,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" or ma.own_house like concat('%', #{keyWord}, '%') ) + + and ma.type_id = #{typeId} + and mt3.type_name like concat('%', #{materialType}, '%')