From 1847bbde15e2304de8a25e7e0ab7f469bbefbeed Mon Sep 17 00:00:00 2001 From: lym <1994302445@qq.com> Date: Tue, 25 Jun 2024 17:52:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=BF=E6=9D=90=E7=BA=B9=E8=B7=AF=E3=80=81?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=92=E5=BA=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/order/vo/order/OrderPageReqVO.java | 6 +++ .../executor/dal/mysql/order/OrderMapper.java | 27 +++++++++++-- .../admin/files/excel/ExcelTypeRealize.java | 18 +++++++-- .../admin/plate/vo/plate/PlatePageReqVO.java | 6 +++ .../manage/dal/mysql/plate/PlateMapper.java | 39 +++++++++++++++++-- 5 files changed, 86 insertions(+), 10 deletions(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderPageReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderPageReqVO.java index 6d9a44f29..da843d72c 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderPageReqVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderPageReqVO.java @@ -80,4 +80,10 @@ public class OrderPageReqVO extends PageParam { private Boolean deleted; private Long organId; + + @Schema(description = "排序", example = "ascend") + private String order; + + @Schema(description = "排序字段", example = "id") + private String field; } \ No newline at end of file diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java index 257cef790..354e9ecbb 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java @@ -27,7 +27,7 @@ import java.util.Map; public interface OrderMapper extends BaseMapperX { default PageResult selectPage(OrderPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() + LambdaQueryWrapperX query = new LambdaQueryWrapperX() .eqIfPresent(OrderDO::getParentNo, reqVO.getParentNo()) .likeIfPresent(OrderDO::getId, reqVO.getId() == null ? null : String.valueOf(reqVO.getId())) .betweenIfPresent(OrderDO::getDeliveryDate, reqVO.getDeliveryDate()) @@ -47,8 +47,29 @@ public interface OrderMapper extends BaseMapperX { .eqIfPresent(OrderDO::getRemark, reqVO.getRemark()) .eqIfPresent(OrderDO::getOrganId, reqVO.getOrganId()) .eqIfPresent(OrderDO::getDeleted, reqVO.getDeleted()) - .betweenIfPresent(OrderDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(OrderDO::getId)); + .betweenIfPresent(OrderDO::getCreateTime, reqVO.getCreateTime()); + + if (reqVO.getOrder() == null) { + query.orderByDesc(OrderDO::getId); + }else { + if (reqVO.getOrder().equals("ascend")) { + switch (reqVO.getField()) { + case "id" -> query.orderByAsc(OrderDO::getId); + case "customOrderNo" -> query.orderByAsc(OrderDO::getCustomOrderNo); + case "orderDate" -> query.orderByAsc(OrderDO::getOrderDate); + case "deliveryDate" -> query.orderByAsc(OrderDO::getDeliveryDate); + } + }else if (reqVO.getOrder().equals("descend")) { + switch (reqVO.getField()) { + case "id" -> query.orderByDesc(OrderDO::getId); + case "customOrderNo" -> query.orderByDesc(OrderDO::getCustomOrderNo); + case "orderDate" -> query.orderByDesc(OrderDO::getOrderDate); + case "deliveryDate" -> query.orderByDesc(OrderDO::getDeliveryDate); + } + } + } + + return selectPage(reqVO, query); } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/ExcelTypeRealize.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/ExcelTypeRealize.java index 0b4c134d4..de94cfd72 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/ExcelTypeRealize.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/ExcelTypeRealize.java @@ -22,6 +22,7 @@ import org.springframework.stereotype.Component; import javax.annotation.Resource; import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.*; import java.util.stream.Collectors; @@ -82,7 +83,7 @@ public class ExcelTypeRealize { p.getColor(), p.getSpec(), p.getTexture(), - p.getModel(), +// p.getModel(), p.getBrand()), Collectors.toList() )); @@ -179,10 +180,18 @@ public class ExcelTypeRealize { long plateNo = idWorker.nextId(); long obtainingTime = idWorker.obtainingTime(); + // 计算面积 + BigDecimal area = BigDecimal.valueOf(Double.parseDouble(combination.getWidth())) + .multiply(BigDecimal.valueOf(Double.parseDouble(combination.getHeight()))) + .movePointLeft(6) + .setScale(2, RoundingMode.HALF_UP); Long plateId = (Long) snowFlakeGenerator.nextId(null); PlateDO plateDO = PlateDO.builder() - .id(plateId).orderId(orderId).name(combination.getName()).plateNo(combination.getPlateNo()) - .goodsId(combination.getGoodId()).width(BigDecimal.valueOf(Double.parseDouble(combination.getWidth()))) + .id(plateId).orderId(orderId) + .name(combination.getName()) + .plateNo(combination.getPlateNo()) + .goodsId(combination.getGoodId()) + .width(BigDecimal.valueOf(Double.parseDouble(combination.getWidth()))) .plateNo(((obtainingTime)+ Long.toString(plateNo).substring(2))) .height(BigDecimal.valueOf(Double.parseDouble(combination.getHeight()))) .thickness(BigDecimal.valueOf(Double.parseDouble(combination.getThickness()))) @@ -195,6 +204,7 @@ public class ExcelTypeRealize { .sealDown(BigDecimal.valueOf(Double.parseDouble(combination.getSealDown()))) .holeFace(Integer.valueOf(combination.getTypographicFace())) .texture(Integer.valueOf(combination.getTexture())) + .area(area) .openDoorType(Integer.valueOf(combination.getOpenDoorType())) .isSpecialShaped(false) .isSculpt(false) @@ -300,6 +310,7 @@ public class ExcelTypeRealize { .rawGoodsId(excelVO.getGoodsId()) .goodsName(excelVO.getGoodsName()) .material(excelVO.getMaterial()) + .texture(Integer.valueOf(excelVO.getTexture())) .color(excelVO.getColor()) .thickness(Double.valueOf(excelVO.getThickness())) .spec(excelVO.getSpec()) @@ -317,6 +328,7 @@ public class ExcelTypeRealize { // .goodsId(plateGoodId) .goodsName(excelVO.getGoodsName()) .material(excelVO.getMaterial()) + .texture(Integer.valueOf(excelVO.getTexture())) .color(excelVO.getColor()) .width(BigDecimal.valueOf(Double.valueOf(excelVO.getWidth()))) .height(BigDecimal.valueOf(Double.valueOf(excelVO.getHeight()))) diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/plate/PlatePageReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/plate/PlatePageReqVO.java index 6a79a1eda..d1606e343 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/plate/PlatePageReqVO.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/plate/PlatePageReqVO.java @@ -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; } \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/plate/PlateMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/plate/PlateMapper.java index d06a7096d..0d518347d 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/plate/PlateMapper.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/plate/PlateMapper.java @@ -21,9 +21,9 @@ public interface PlateMapper extends BaseMapperX { } default PageResult selectPage(PlatePageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() + LambdaQueryWrapperX queryWrapper = new LambdaQueryWrapperX() .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 { .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);