添加排序

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleModel.java

@@ -156,4 +156,8 @@ public class VehicleModel implements Serializable {
 	@Column(name = "poster_background")
 	@ApiModelProperty(value = "海报背景")
 	private String posterBackground;
+
+	@Column(name = "sort")
+	@ApiModelProperty(value = "排序")
+	private Integer sort;
 }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleModelVo.java

@@ -168,6 +168,10 @@ public class VehicleModelVo extends VehicleModel implements Serializable {
 	@ApiModelProperty(value = "品牌")
 	private String brandName;
 
+	@Column(name = "sort")
+	@ApiModelProperty(value = "排序")
+	private Integer sort;
+
 
 //	@Column(name = "status")
 //	@ApiModelProperty(value = "状态 0--下架；1--上架")

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleModelController.java

@@ -28,11 +28,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.*;
+import tk.mybatis.mapper.entity.Example;
+import tk.mybatis.mapper.weekend.WeekendSqls;
 
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -167,6 +168,7 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
         vm.setCrtHost(host);
         vm.setIsdel(0);
         vm.setStatus(0);
+        vm.setSort(0);
         vm.setVioDeposit(BigDecimal.valueOf(500));
         try {
             //插入数据到车型并返回id
@@ -285,6 +287,18 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
         return ObjectRestResponse.succ(baseBiz.selectList(vehicleModel));
     }
 
+    @ApiOperation("查询所有")
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    @ResponseBody
+    public ObjectRestResponse getList() {
+        Example exa = Example.builder(VehicleModel.class).where(
+                WeekendSqls.<VehicleModel>custom()
+                        .andEqualTo(VehicleModel::getIsdel, 0)
+        ).orderByAsc("sort").build();
+
+        return ObjectRestResponse.succ(baseBiz.selectByExample(exa));
+    }
+
     /**
      * 优质车型
      *
@@ -292,12 +306,13 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
      * @param limit
      * @return
      */
-     @ApiOperation("优质车型")
+    @ApiOperation("优质车型")
     @GetMapping(value = "/goodList")
     @IgnoreUserToken
-    public ObjectRestResponse<List<GoodDataVO>>  goodList(@RequestParam(value = "page") Integer page, @RequestParam(value = "limit") Integer limit) {
+    public ObjectRestResponse<List<GoodDataVO>> goodList(@RequestParam(value = "page") Integer page, @RequestParam(value = "limit") Integer limit) {
         return ObjectRestResponse.succ(baseBiz.goodList(page, limit));
     }
+
     @ApiOperation("上下架")
     @PutMapping(value = "/setStatus/{id}/{status}")
     @Transactional