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

fix

This commit is contained in:
sxu 2023-12-04 14:45:23 +08:00
parent 9d6bed3d9c
commit 8bef3e34bc
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/equip/vo/DevInfoVo.java
View File

@ -11,4 +11,5 @@ public class DevInfoVo extends DevInfo {
private long parentId; private long parentId;
private String typeName; private String typeName;
private String companyName; private String companyName;
private String keyWord;
} }

2
zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/DevInfoController.java
View File

@ -33,7 +33,7 @@ public class DevInfoController extends BaseController
* 查询设备信息列表 * 查询设备信息列表
*/ */
@RequiresPermissions("equip:info:list") @RequiresPermissions("equip:info:list")
@GetMapping("/list") @PostMapping("/list")
public TableDataInfo list(DevInfoVo devInfo) public TableDataInfo list(DevInfoVo devInfo)
{ {
startPage(); startPage();

10
zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml
View File

@ -63,6 +63,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="creator != null "> and d.creator = #{creator}</if> <if test="creator != null "> and d.creator = #{creator}</if>
<if test="deposit != null "> and d.deposit = #{deposit}</if> <if test="deposit != null "> and d.deposit = #{deposit}</if>
<if test="isActive != null and isActive != ''"> and d.is_active = #{isActive}</if> <if test="isActive != null and isActive != ''"> and d.is_active = #{isActive}</if>
<if test="keyWord != null and keyWord != ''">
and (
locate(#{typeName},t.type_name) > 0
or locate(#{companyName},c.company_name) > 0
or locate(#{maId},d.ma_id) > 0
or locate(#{modelName},d.model_name) > 0
or locate(#{serialNumber},d.serial_number) > 0
or locate(#{description},d.description) > 0
)
</if>
</where> </where>
</select> </select>