司机上报优化

performance-api/src/main/java/com/clx/performance/enums/integral/IntegralTruckRuleEnum.java

+package com.clx.performance.enums.integral;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+public enum IntegralTruckRuleEnum {
+    ;
+    @Getter
+    @AllArgsConstructor
+    public enum Status{
+        OPEN(1, "开启"),
+        CLOSE(2, "关闭"),
+
+        ;
+
+        private final Integer code;
+        private final String msg;
+        public static Optional<Status> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+    }
+
+
+}

performance-api/src/main/java/com/clx/performance/vo/pc/integral/AppIntegralTruckRuleVO.java

 package com.clx.performance.vo.pc.integral;
 
+import com.clx.performance.enums.integral.IntegralTruckRuleEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -31,12 +32,37 @@ public class AppIntegralTruckRuleVO {
     private Integer integralRatioBegin;
     @ApiModelProperty(value = "积分结束范围", example = "")
     private Integer integralRatioEnd;
+
+    @ApiModelProperty(value = "积分结束范围", example = "")
+    private String integralRatioMsg;
+    public String getIntegralRatioMsg() {
+        if (integralRatioBegin == null && integralRatioEnd !=null) {return "积分小于"+integralRatioEnd;}
+        if (integralRatioEnd == null && integralRatioBegin !=null) {return "积分大于"+integralRatioBegin;}
+        return "积分"+ integralRatioBegin + "—" + integralRatioEnd;
+    }
+
     @ApiModelProperty(value = "状态：1开启 2关闭", example = "")
     private Integer status;
+
+    @ApiModelProperty(value = "状态：1开启 2关闭", example = "")
+    private String statusMsg;
+    public String getStatusMsg() {
+        return IntegralTruckRuleEnum.Status.getByCode(status).get().getMsg();
+    }
+
     @ApiModelProperty(value = "预期收益开始范围（分）", example = "")
     private BigDecimal incomeBegin;
     @ApiModelProperty(value = "预期收益结束范围（分）", example = "")
     private BigDecimal incomeEnd;
+
+    @ApiModelProperty(value = "预期收益结束范围", example = "")
+    private String incomeMsg;
+    public String getIncomeMsg() {
+        if (incomeBegin == null && incomeEnd !=null) {return "日收益小于等于"+incomeEnd.toString()+"元";}
+        if (incomeEnd == null && incomeBegin !=null) {return "日收益大于等于"+incomeBegin.toString()+"元";}
+        return "日收益"+ incomeBegin.toString() + "元—" + incomeBegin.toString()+"元";
+    }
+
     @ApiModelProperty(value = "创建时间", example = "")
     private String createTime;
     @ApiModelProperty(value = "修改时间", example = "")