bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
jjLv 2024-11-14 16:32:00 +08:00
parent 35c7b83383 17b5a846d8
commit 2f0311f475
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MachineController.java
View File

@ -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)

3
bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml
View File

@ -92,6 +92,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
or ma.own_house like concat('%', #{keyWord}, '%')
)
</if>
<if test="typeId != null">
and ma.type_id = #{typeId}
</if>
<if test="materialType != null and materialType != ''">
and mt3.type_name like concat('%', #{materialType}, '%')
</if>