更改排序规则

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/InventorySummaryServiceImpl.java

@@ -102,12 +102,12 @@ public class InventorySummaryServiceImpl  extends ServiceImpl<InventorySummaryMa
         long size = list(wp).size();
 
             //对该装备typeId进行排序
-        Collections.sort(list, new Comparator<InventorySummary>() {
-            @Override
-            public int compare(InventorySummary o1, InventorySummary o2) {
-                return o1.getTypeId().compareTo(o2.getTypeId());
-            }
-        });
+//        Collections.sort(list, new Comparator<InventorySummary>() {
+//            @Override
+//            public int compare(InventorySummary o1, InventorySummary o2) {
+//                return o1.getTypeId().compareTo(o2.getTypeId());
+//            }
+//        });
 
         Page<InventorySummary> page1 = PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize());
         page1.setRecords(list);
@@ -407,10 +407,6 @@ public class InventorySummaryServiceImpl  extends ServiceImpl<InventorySummaryMa
         }
         //根据组织机构号查询
         wrapper.eq(ObjectUtil.isNotEmpty(req.getOrgId()), InventorySummary::getOrgId, req.getOrgId());
-//        wrapper.and(qw -> {
-//            qw.eq(ObjectUtil.isNotEmpty(req.getOrgId()), InventorySummary::getOrgId, req.getOrgId());
-//            // 其他条件...
-//        });
         //根据组织机构名模糊查询
         wrapper.like(ObjectUtil.isNotEmpty(req.getOrgName()), InventorySummary::getOrgName, req.getOrgName());
         //位置id（单警柜/仓库）
@@ -419,8 +415,6 @@ public class InventorySummaryServiceImpl  extends ServiceImpl<InventorySummaryMa
         wrapper.eq(ObjectUtil.isNotEmpty(req.getLocationType()),InventorySummary::getLocationType,req.getLocationType());
         //位置信息
         wrapper.like(ObjectUtil.isNotEmpty(req.getLocationName()), InventorySummary::getLocationName, req.getLocationName());
-        //装备类别名称
-//        wrapper.like(ObjectUtil.isNotEmpty(req.getTypeName()), InventorySummary::getTypeName, req.getTypeName());
         //根据类别
         if (ObjectUtil.isNotEmpty(req.typeIds) && req.typeIds.size()>0) {
             wrapper.and(qw -> req.typeIds.forEach(typeId -> qw.or().eq(InventorySummary::getTypeId, typeId)));
@@ -429,14 +423,14 @@ public class InventorySummaryServiceImpl  extends ServiceImpl<InventorySummaryMa
         if (ObjectUtil.isNotEmpty(req.getSizeNames()) && req.getSizeNames().size()>0) {
             wrapper.and(qw -> req.getSizeNames().forEach(sizeName -> qw.or().eq(InventorySummary::getSizeName, sizeName)));
         }
-        //型号名称
-//        wrapper.like(ObjectUtil.isNotEmpty(req.getSizeName()), InventorySummary::getSizeName, req.getSizeName());
-        //号型
-//        wrapper.eq(ObjectUtil.isNotEmpty(req.getSizeId()), InventorySummary::getSizeId, req.getSizeId());
-        if (ObjectUtil.isNotEmpty(req.getColumn()))
+        if (ObjectUtil.isNotEmpty(req.getColumn())&&!req.getColumn().equals("create_time"))
         {
             wrapper.last("order by " + req.getColumn() + " " + req.getOrder());
         }
+        else
+        {
+            wrapper.last("order by type_id");
+        }
 
 
         return wrapper;