排序字段兼容

wangqian
1 parent 2cc6318d
Showing 5 changed files with 15 additions and 18 deletions
urbanops-framework/urbanops-common/src/main/java/com/zteits/urbanops/framework/common/pojo/PageParam.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/departmentcost/DepartmentCostMapper.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/rentalmechanicalcost/RentalMechanicalCostMapper.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/wasterecord/WasteRecordMapper.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/waterfee/WaterFeeMapper.java
@@ -38,22 +38,19 @@ public class PageParam implements Serializable {
     /**
      * 排序字段
      */
-    private String sortField = "id";
+    private String orderByColumn = "id";
     /**
      * 排序方向：asc（升序）/ desc（降序）
      */
-    private String sortOrder = "desc";
+    private String isAsc = "desc";
     /**
-     * isAsc=true（升序）
+     * sortAsc=true（升序）
      */
-    private Boolean isAsc = true;
-    /*执行该排序逻辑*/
-    private Boolean sortCondition = true;
+    private Boolean sortAsc = true;
-
-    public void setSortOrder(String sortOrder) {
-        this.sortOrder = StringUtils.hasText(sortOrder) ? sortOrder.trim() : "desc";
-        this.isAsc = "asc".equalsIgnoreCase(this.sortOrder);
+    public void setIsAsc(String isAsc) {
+        this.isAsc = StringUtils.hasText(isAsc) ? isAsc.trim() : "desc";
+        this.sortAsc = "asc".equalsIgnoreCase(this.isAsc);
     }
 }
@@ -29,8 +29,8 @@ public interface DepartmentCostMapper extends BaseMapperX&lt;DepartmentCostDO&gt; {
                 .eqIfPresent(DepartmentCostDO::getDeptId, reqVO.getDeptId())
                 .eqIfPresent(DepartmentCostDO::getRemark, reqVO.getRemark())
                 .betweenIfPresent(DepartmentCostDO::getCreateTime, reqVO.getCreateTime())
-                .orderBy(reqVO.getSortCondition(), reqVO.getIsAsc(),
-                        DepartmentCostPageReqVO.SORT_FIELD_MAP.get(reqVO.getSortField())
+                .orderBy(true, reqVO.getSortAsc(),
+                        DepartmentCostPageReqVO.SORT_FIELD_MAP.get(reqVO.getOrderByColumn())
                     )
                 );
     }
@@ -35,8 +35,8 @@ public interface RentalMechanicalCostMapper extends BaseMapperX&lt;RentalMechanical
                 //.eqIfPresent(RentalMechanicalCostDO::getRoadIds, reqVO.getRoadIds())
                 ///.//eqIfPresent(RentalMechanicalCostDO::getRemark, reqVO.getRemark())
                 //.betweenIfPresent(RentalMechanicalCostDO::getCreateTime, reqVO.getCreateTime())
-                .orderBy(reqVO.getSortCondition(), reqVO.getIsAsc(),
-                        RentalMechanicalCostPageReqVO.SORT_FIELD_MAP.get(reqVO.getSortField())
+                .orderBy(true, reqVO.getSortAsc(),
+                        RentalMechanicalCostPageReqVO.SORT_FIELD_MAP.get(reqVO.getOrderByColumn())
                 )
         );
     }
@@ -30,8 +30,8 @@ public interface WasteRecordMapper extends BaseMapperX&lt;WasteRecordDO&gt; {
                 .eqIfPresent(WasteRecordDO::getRemark, reqVO.getRemark())
                 .betweenIfPresent(WasteRecordDO::getCreateTime, reqVO.getCreateTime())
                 //.orderByDesc(WasteRecordDO::getId));
-                .orderBy(reqVO.getSortCondition(), reqVO.getIsAsc(),
-                        WasteRecordPageReqVO.SORT_FIELD_MAP.get(reqVO.getSortField())
+                .orderBy(true, reqVO.getSortAsc(),
+                        WasteRecordPageReqVO.SORT_FIELD_MAP.get(reqVO.getOrderByColumn())
                 )
         );
     }
@@ -30,8 +30,8 @@ public interface WaterFeeMapper extends BaseMapperX&lt;WaterFeeDO&gt; {
                 .eqIfPresent(WaterFeeDO::getCompanyId, reqVO.getCompanyId())
                 .betweenIfPresent(WaterFeeDO::getCreateTime, reqVO.getCreateTime())
                 //.orderByDesc(WaterFeeDO::getId));
-                .orderBy(reqVO.getSortCondition(), reqVO.getIsAsc(),
-                        WaterFeePageReqVO.SORT_FIELD_MAP.get(reqVO.getSortField())
+                .orderBy(true, reqVO.getSortAsc(),
+                        WaterFeePageReqVO.SORT_FIELD_MAP.get(reqVO.getOrderByColumn())
                 )
         );
     }