BJ_FS / urbanops

Commit fbfd11555c99ec7fd96bdf4956a68f74ebbcb044

Authored by wangqian
1 parent 2cc6318d

排序字段兼容

Inline Side-by-side
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
  View file @fbfd115
... ... @@ -38,22 +38,19 @@ public class PageParam implements Serializable {
38 38 /**
39 39 * 排序字段
40 40 */
41   - private String sortField = "id";
  41 + private String orderByColumn = "id";
42 42 /**
43 43 * 排序方向：asc（升序）/ desc（降序）
44 44 */
45   - private String sortOrder = "desc";
  45 + private String isAsc = "desc";
46 46 /**
47   - * isAsc=true（升序）
  47 + * sortAsc=true（升序）
48 48 */
49   - private Boolean isAsc = true;
50   - /*执行该排序逻辑*/
51   - private Boolean sortCondition = true;
  49 + private Boolean sortAsc = true;
52 50  
53   -
54   - public void setSortOrder(String sortOrder) {
55   - this.sortOrder = StringUtils.hasText(sortOrder) ? sortOrder.trim() : "desc";
56   - this.isAsc = "asc".equalsIgnoreCase(this.sortOrder);
  51 + public void setIsAsc(String isAsc) {
  52 + this.isAsc = StringUtils.hasText(isAsc) ? isAsc.trim() : "desc";
  53 + this.sortAsc = "asc".equalsIgnoreCase(this.isAsc);
57 54 }
58 55  
59 56 }
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/departmentcost/DepartmentCostMapper.java
  View file @fbfd115
... ... @@ -29,8 +29,8 @@ public interface DepartmentCostMapper extends BaseMapperX<DepartmentCostDO> {
29 29 .eqIfPresent(DepartmentCostDO::getDeptId, reqVO.getDeptId())
30 30 .eqIfPresent(DepartmentCostDO::getRemark, reqVO.getRemark())
31 31 .betweenIfPresent(DepartmentCostDO::getCreateTime, reqVO.getCreateTime())
32   - .orderBy(reqVO.getSortCondition(), reqVO.getIsAsc(),
33   - DepartmentCostPageReqVO.SORT_FIELD_MAP.get(reqVO.getSortField())
  32 + .orderBy(true, reqVO.getSortAsc(),
  33 + DepartmentCostPageReqVO.SORT_FIELD_MAP.get(reqVO.getOrderByColumn())
34 34 )
35 35 );
36 36 }
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/rentalmechanicalcost/RentalMechanicalCostMapper.java
  View file @fbfd115
... ... @@ -35,8 +35,8 @@ public interface RentalMechanicalCostMapper extends BaseMapperX<RentalMechanical
35 35 //.eqIfPresent(RentalMechanicalCostDO::getRoadIds, reqVO.getRoadIds())
36 36 ///.//eqIfPresent(RentalMechanicalCostDO::getRemark, reqVO.getRemark())
37 37 //.betweenIfPresent(RentalMechanicalCostDO::getCreateTime, reqVO.getCreateTime())
38   - .orderBy(reqVO.getSortCondition(), reqVO.getIsAsc(),
39   - RentalMechanicalCostPageReqVO.SORT_FIELD_MAP.get(reqVO.getSortField())
  38 + .orderBy(true, reqVO.getSortAsc(),
  39 + RentalMechanicalCostPageReqVO.SORT_FIELD_MAP.get(reqVO.getOrderByColumn())
40 40 )
41 41 );
42 42 }
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/wasterecord/WasteRecordMapper.java
  View file @fbfd115
... ... @@ -30,8 +30,8 @@ public interface WasteRecordMapper extends BaseMapperX<WasteRecordDO> {
30 30 .eqIfPresent(WasteRecordDO::getRemark, reqVO.getRemark())
31 31 .betweenIfPresent(WasteRecordDO::getCreateTime, reqVO.getCreateTime())
32 32 //.orderByDesc(WasteRecordDO::getId));
33   - .orderBy(reqVO.getSortCondition(), reqVO.getIsAsc(),
34   - WasteRecordPageReqVO.SORT_FIELD_MAP.get(reqVO.getSortField())
  33 + .orderBy(true, reqVO.getSortAsc(),
  34 + WasteRecordPageReqVO.SORT_FIELD_MAP.get(reqVO.getOrderByColumn())
35 35 )
36 36 );
37 37 }
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/waterfee/WaterFeeMapper.java
  View file @fbfd115
... ... @@ -30,8 +30,8 @@ public interface WaterFeeMapper extends BaseMapperX<WaterFeeDO> {
30 30 .eqIfPresent(WaterFeeDO::getCompanyId, reqVO.getCompanyId())
31 31 .betweenIfPresent(WaterFeeDO::getCreateTime, reqVO.getCreateTime())
32 32 //.orderByDesc(WaterFeeDO::getId));
33   - .orderBy(reqVO.getSortCondition(), reqVO.getIsAsc(),
34   - WaterFeePageReqVO.SORT_FIELD_MAP.get(reqVO.getSortField())
  33 + .orderBy(true, reqVO.getSortAsc(),
  34 + WaterFeePageReqVO.SORT_FIELD_MAP.get(reqVO.getOrderByColumn())
35 35 )
36 36 );
37 37 }
... ...