Merge remote-tracking branch 'origin/master'

@@ -514,6 +514,8 @@ public class EquipmentController {
         String energyLevel = equipmentDTO.getEquipmentInfo().getEnergyLevel();//能耗等级
         String energyLevel = equipmentDTO.getEquipmentInfo().getEnergyLevel();//能耗等级
         //Integer isSpecial = equipmentDTO.getEquipmentInfo().getIsSpecial();
         //Integer isSpecial = equipmentDTO.getEquipmentInfo().getIsSpecial();
         String isMeterage = equipmentDTO.getEquipmentInfo().getIsMeterage();//是否计量设备
         String isMeterage = equipmentDTO.getEquipmentInfo().getIsMeterage();//是否计量设备
+        String orderFiled = equipmentDTO.getOrderFiled();
+        boolean orderType = equipmentDTO.isOrderType();
 
 
         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)
@@ -540,8 +542,12 @@ 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())
-                .orderBy(true,false,"equipment_info.create_time");
+                .eq(StringUtils.isNotEmpty(equipmentDTO.getEquipmentInfo().getId()), "equipment_info.id", equipmentDTO.getEquipmentInfo().getId());
+        if (StringUtils.isNotEmpty(orderFiled)) {
+            base.orderBy(true,orderType,"equipment_info." + orderFiled);
+        }else {
+            base.orderBy(true,false,"equipment_info.create_time");
+        }
         Page<Map<String, Object>> mapPage = (Page<Map<String, Object>>) base.queryForPage(new Page<>(equipmentDTO.getPageNo(), equipmentDTO.getPageSize()));
         Page<Map<String, Object>> mapPage = (Page<Map<String, Object>>) base.queryForPage(new Page<>(equipmentDTO.getPageNo(), equipmentDTO.getPageSize()));
 
 
         // 转义
         // 转义

@@ -19,8 +19,9 @@ public class EquipmentDTO {
     private EquipmentAsset equipmentAsset = new EquipmentAsset();
     private EquipmentAsset equipmentAsset = new EquipmentAsset();
     private EquipmentInfo equipmentInfo = new EquipmentInfo();
     private EquipmentInfo equipmentInfo = new EquipmentInfo();
     private List<EquipmentInfoExtParam> equipmentInfoExtParams = new ArrayList<EquipmentInfoExtParam>();
     private List<EquipmentInfoExtParam> equipmentInfoExtParams = new ArrayList<EquipmentInfoExtParam>();
-
     private Long pageNo = 1L;
     private Long pageNo = 1L;
     private Long pageSize = 10L;
     private Long pageSize = 10L;
+    private String orderFiled;//排序字段
+    private boolean orderType;//排序类型,true:升序,false:降序
 
 
 }
 }