人机材排序

wangqian
1 parent a0e7fda1
Showing 5 changed files with 22 additions and 7 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/controller/admin/mechanicalcost/vo/MechanicalCostPageReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/mechanicaldepreciation/vo/MechanicalDepreciationPageReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/personalcost/vo/PersonalCostPageReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/rentalmechanicalcost/vo/RentalMechanicalCostPageReqVO.java
@@ -72,7 +72,6 @@ public class PageParam implements Serializable {
     public void setOrderByColumn(String orderByColumn) {
         if (!StringUtils.hasText(orderByColumn)) {
             this.orderByColumn = "id";
-            return;
         } else {
             this.orderByColumn = orderByColumn;
         }
 package com.zteits.urbanops.module.garden.controller.admin.mechanicalcost.vo;
+import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.zteits.urbanops.framework.common.pojo.PageParam;
+import com.zteits.urbanops.module.garden.dal.dataobject.mechanicalcost.MechanicalCostDO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -9,6 +11,7 @@ import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Map;
 import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -69,4 +72,14 @@ public class MechanicalCostPageReqVO extends PageParam {
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
+
+    //对应前端排序字段
+    public static final Map<String, SFunction<MechanicalCostDO, ?>> SORT_FIELD_MAP = Map.of(
+            "id", MechanicalCostDO::getId,
+            "unitPrice", MechanicalCostDO::getUnitPrice,
+            "quantity", MechanicalCostDO::getQuantity,
+            "serviceLife", MechanicalCostDO::getServiceLife,
+            "startUseTime", MechanicalCostDO::getStartUseTime,
+            "endUseTime" , MechanicalCostDO::getEndUseTime
+    );
 }
 package com.zteits.urbanops.module.garden.controller.admin.mechanicaldepreciation.vo;
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.zteits.urbanops.framework.common.pojo.PageParam;
-import java.math.BigDecimal;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -51,4 +51,4 @@ public class MechanicalDepreciationPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
-}
 \ No newline at end of file
+}
@@ -51,7 +51,9 @@ public class PersonalCostPageReqVO extends PageParam {
     public static final Map<String, SFunction<PersonalCostDO, ?>> SORT_FIELD_MAP = Map.of(
             "id", PersonalCostDO::getId,
-            "salaryAmount", PersonalCostDO::getSalaryAmount
+            "salaryMonth", PersonalCostDO::getSalaryMonth,
+            "salaryAmount", PersonalCostDO::getSalaryAmount,
+            "createTime", PersonalCostDO::getCreateTime
     );
 }
@@ -42,6 +42,7 @@ public class RentalMechanicalCostPageReqVO extends PageParam {
     public static final Map<String, SFunction<RentalMechanicalCostDO, ?>> SORT_FIELD_MAP = Map.of(
             "id", RentalMechanicalCostDO::getId,
+            "rentalTotalPrice",RentalMechanicalCostDO::getRentalTotalPrice,
             "quantity", RentalMechanicalCostDO::getQuantity,
             "useDuration", RentalMechanicalCostDO::getUseDuration,
             "startUseTime", RentalMechanicalCostDO::getStartUseTime,