ruoyi-system/src/main/java/com/ruoyi/system/vo/EntrustDeviceListVo.java
@@ -14,6 +14,8 @@ private Integer id; @ApiModelProperty("项目名称") private String projectName; @ApiModelProperty("委托方id") private Integer clientId; @ApiModelProperty("设备类型：1-塔式起重机 2-施工升降机 3-物料提升机 4-桥式起重机 5-附着式升降脚手架 6-流动式起重机 7-高处作业吊篮 8-门式起重机 9-架桥机 10-其他") private Integer type; @ApiModelProperty("设备编号") ruoyi-system/src/main/resources/mapper/system/DeviceUsageMapper.xml
@@ -55,7 +55,10 @@ group by device_id ) latest on t2.id = latest.device_id left join project t3 on t1.project_id = t3.id where t1.project_id = #{query.projectId} and t1.deleted = 0 and t1.disabled = 0 where t1.deleted = 0 and t1.disabled = 0 and t3.client_id =#{query.clientId} <if test="query.projectId != null"> and t1.project_id = #{query.projectId} </if> <if test="query.type != null"> and t2.type = #{query.type} </if>
