设备查询补充

@@ -529,6 +529,8 @@ public class EquipmentController {
         String isMeterage = equipmentDTO.getEquipmentInfo().getIsMeterage();//是否计量设备
         String isMeterage = equipmentDTO.getEquipmentInfo().getIsMeterage();//是否计量设备
         String orderFiled = equipmentDTO.getOrderFiled();
         String orderFiled = equipmentDTO.getOrderFiled();
         boolean orderType = equipmentDTO.isOrderType();
         boolean orderType = equipmentDTO.isOrderType();
+        String startTime = equipmentDTO.getStartTime();
+        String endTime = equipmentDTO.getEndTime();
 
 
         List<String> equipmentLevelList = null;
         List<String> equipmentLevelList = null;
         Base base = BaseFactory.JOIN().select(EquipmentAsset.class).select(EquipmentInfo.class).select(EquipmentBrand.class).select(EquipmentCategory.class)
         Base base = BaseFactory.JOIN().select(EquipmentAsset.class).select(EquipmentInfo.class).select(EquipmentBrand.class).select(EquipmentCategory.class)
@@ -555,7 +557,9 @@ public class EquipmentController {
                 .like(StringUtils.isNotEmpty(equipmentCode), "equipment_code", equipmentCode)
                 .like(StringUtils.isNotEmpty(equipmentCode), "equipment_code", equipmentCode)
                 .eq(StringUtils.isNotEmpty(equipmentStatus), "equipment_status", equipmentStatus)
                 .eq(StringUtils.isNotEmpty(equipmentStatus), "equipment_status", equipmentStatus)
                 .like(StringUtils.isNotEmpty(installPosition), EquipmentInfo::getInstallPosition, installPosition)
                 .like(StringUtils.isNotEmpty(installPosition), EquipmentInfo::getInstallPosition, installPosition)
-                .eq(StringUtils.isNotEmpty(equipmentDTO.getEquipmentInfo().getId()), "equipment_info.id", equipmentDTO.getEquipmentInfo().getId());
+                .eq(StringUtils.isNotEmpty(equipmentDTO.getEquipmentInfo().getId()), "equipment_info.id", equipmentDTO.getEquipmentInfo().getId())
+                .ge(StringUtils.isNotEmpty(startTime), "equipment_info.create_time", startTime)
+                .le(StringUtils.isNotEmpty(endTime), "equipment_info.create_time", endTime);
         if (StringUtils.isNotEmpty(orderFiled)) {
         if (StringUtils.isNotEmpty(orderFiled)) {
             base.orderBy(true,orderType,"equipment_info." + getFiledName(orderFiled));
             base.orderBy(true,orderType,"equipment_info." + getFiledName(orderFiled));
         }else {
         }else {

@@ -24,4 +24,8 @@ public class EquipmentDTO {
     private String orderFiled;//排序字段
     private String orderFiled;//排序字段
     private boolean orderType;//排序类型,true:升序,false:降序
     private boolean orderType;//排序类型,true:升序,false:降序
 
 
+    private String startTime;
+
+    private String endTime;
+
 }
 }