板材纹路、查询排序修改

This commit is contained in:
lym
2024-06-25 17:52:08 +08:00
parent a06a1deecf
commit 1847bbde15
5 changed files with 86 additions and 10 deletions
@@ -59,4 +59,10 @@ public class PlatePageReqVO extends PageParam {
private LocalDateTime[] createTime;
private Long organId;
@Schema(description = "排序", example = "ascend")
private String order;
@Schema(description = "排序字段", example = "id")
private String field;
}
@@ -21,9 +21,9 @@ public interface PlateMapper extends BaseMapperX<PlateDO> {
}
default PageResult<PlateDO> selectPage(PlatePageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<PlateDO>()
LambdaQueryWrapperX<PlateDO> queryWrapper = new LambdaQueryWrapperX<PlateDO>()
.eqIfPresent(PlateDO::getOrganId, reqVO.getOrganId())
.eqIfPresent(PlateDO::getGoodsId, reqVO.getGoodsId())
.likeIfPresent(PlateDO::getGoodsId, reqVO.getGoodsId())
.likeIfPresent(PlateDO::getGoodsName, reqVO.getGoodsName())
.likeIfPresent(PlateDO::getMaterial, reqVO.getMaterial())
.likeIfPresent(PlateDO::getColor, reqVO.getColor())
@@ -35,8 +35,39 @@ public interface PlateMapper extends BaseMapperX<PlateDO> {
.likeIfPresent(PlateDO::getRemark, reqVO.getRemark())
.eqIfPresent(PlateDO::getPrice, reqVO.getPrice())
.likeIfPresent(PlateDO::getTexture, reqVO.getTexture())
.betweenIfPresent(PlateDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(PlateDO::getId));
.betweenIfPresent(PlateDO::getCreateTime, reqVO.getCreateTime());
if (reqVO.getOrder() == null) {
queryWrapper.orderByDesc(PlateDO::getId);
}else {
if (reqVO.getOrder().equals("ascend")) {
switch (reqVO.getField()) {
case "goodsId" -> queryWrapper.orderByAsc(PlateDO::getGoodsId);
case "goodsName" -> queryWrapper.orderByAsc(PlateDO::getGoodsName);
case "material" -> queryWrapper.orderByAsc(PlateDO::getMaterial);
case "color" -> queryWrapper.orderByAsc(PlateDO::getColor);
case "texture" -> queryWrapper.orderByAsc(PlateDO::getTexture);
case "width" -> queryWrapper.orderByAsc(PlateDO::getWidth);
case "height" -> queryWrapper.orderByAsc(PlateDO::getHeight);
case "thickness" -> queryWrapper.orderByAsc(PlateDO::getThickness);
case "brand" -> queryWrapper.orderByAsc(PlateDO::getBrand);
}
}else if (reqVO.getOrder().equals("descend")) {
switch (reqVO.getField()) {
case "goodsId" -> queryWrapper.orderByDesc(PlateDO::getGoodsId);
case "goodsName" -> queryWrapper.orderByDesc(PlateDO::getGoodsName);
case "material" -> queryWrapper.orderByDesc(PlateDO::getMaterial);
case "color" -> queryWrapper.orderByDesc(PlateDO::getColor);
case "texture" -> queryWrapper.orderByDesc(PlateDO::getTexture);
case "width" -> queryWrapper.orderByDesc(PlateDO::getWidth);
case "height" -> queryWrapper.orderByDesc(PlateDO::getHeight);
case "thickness" -> queryWrapper.orderByDesc(PlateDO::getThickness);
case "brand" -> queryWrapper.orderByDesc(PlateDO::getBrand);
}
}
}
return selectPage(reqVO, queryWrapper);
}
PlateDO selectOneById(@Param("id") Long id, @Param("organId") Long organId);