Merge remote-tracking branch 'origin/master'

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/ly/util/ExcelExportUtil.java

@@ -65,7 +65,7 @@ public class ExcelExportUtil {
             Supplier<Collection<?>> dataSupplier = new DeviceDataSupplier(deviceCode, startTime, endTime, identity);
 
             EasyExcel.write(response.getOutputStream(), DeviceDataExcelDTO.class)
-                    .sheet("设备原始数据")
+                    .sheet("设备数采数据")
                     .doWrite(dataSupplier); // 此时参数完全匹配
 
             log.info("设备{}数据导出成功，时间范围：{} - {}", deviceCode, startTime, endTime);

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/vo/IotDevicePageReqVO.java

@@ -154,4 +154,8 @@ public class IotDevicePageReqVO extends PageParam {
     private String exportFields;
     private String deviceNo;
     private String carNo;
+    private String chargeName;
+    private String useProject;
+    private String assetOwnership;
+    private String address;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/IotDeviceMapper.java

@@ -38,8 +38,10 @@ public interface IotDeviceMapper extends BaseMapperX<IotDeviceDO> {
                 .likeIfPresent(IotDeviceDO::getYfDeviceCode, reqVO.getYfDeviceCode())
                 .likeIfPresent(IotDeviceDO::getDeviceCode, reqVO.getDeviceCode())
                 .likeIfPresent(IotDeviceDO::getDeviceName, reqVO.getDeviceName())
+                .likeIfPresent(IotDeviceDO::getAssetOwnership, reqVO.getAssetOwnership())
+                .likeIfPresent(IotDeviceDO::getAddress, reqVO.getAddress())
                 .eqIfPresent(IotDeviceDO::getBrand, reqVO.getBrand())
-                .eqIfPresent(IotDeviceDO::getModel, reqVO.getModel())
+                .likeIfPresent(IotDeviceDO::getModel, reqVO.getModel())
                         .likeIfPresent(IotDeviceDO::getBrandName, reqVO.getBrandName())
                 //.eqIfPresent(IotDeviceDO::getOrgId, reqVO.getOrgId())
                 .inIfPresent(IotDeviceDO::getDeptId, deptIds)
@@ -67,6 +69,8 @@ public interface IotDeviceMapper extends BaseMapperX<IotDeviceDO> {
                 .eqIfPresent(IotDeviceDO::getInfoRemark, reqVO.getInfoRemark())
                 .eqIfPresent(IotDeviceDO::getInfoUrl, reqVO.getInfoUrl())
                 .eqIfPresent(IotDeviceDO::getTemplateJson, reqVO.getTemplateJson())
+                .likeIfPresent(IotDeviceDO::getChargeName, reqVO.getChargeName())
+                .likeIfPresent(IotDeviceDO::getUseProject, reqVO.getUseProject())
                 .eqIfPresent(IotDeviceDO::getBomSyncStatus, reqVO.getBomSyncStatus()));
 //                .orderByAsc(IotDeviceDO::getSortColumn));
     }