Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

板材纹路、查询排序修改

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderPageReqVO.java
+6
View File
@@ -80,4 +80,10 @@ public class OrderPageReqVO extends PageParam {
private Boolean deleted; private Boolean deleted;
private Long organId; private Long organId;
@Schema(description = "排序", example = "ascend")
private String order;
@Schema(description = "排序字段", example = "id")
private String field;
} }
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java
+24 -3
View File
@@ -27,7 +27,7 @@ import java.util.Map;
public interface OrderMapper extends BaseMapperX<OrderDO> { public interface OrderMapper extends BaseMapperX<OrderDO> {
default PageResult<OrderDO> selectPage(OrderPageReqVO reqVO) { default PageResult<OrderDO> selectPage(OrderPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<OrderDO>() LambdaQueryWrapperX<OrderDO> query = new LambdaQueryWrapperX<OrderDO>()
.eqIfPresent(OrderDO::getParentNo, reqVO.getParentNo()) .eqIfPresent(OrderDO::getParentNo, reqVO.getParentNo())
.likeIfPresent(OrderDO::getId, reqVO.getId() == null ? null : String.valueOf(reqVO.getId())) .likeIfPresent(OrderDO::getId, reqVO.getId() == null ? null : String.valueOf(reqVO.getId()))
.betweenIfPresent(OrderDO::getDeliveryDate, reqVO.getDeliveryDate()) .betweenIfPresent(OrderDO::getDeliveryDate, reqVO.getDeliveryDate())
@@ -47,8 +47,29 @@ public interface OrderMapper extends BaseMapperX<OrderDO> {
.eqIfPresent(OrderDO::getRemark, reqVO.getRemark()) .eqIfPresent(OrderDO::getRemark, reqVO.getRemark())
.eqIfPresent(OrderDO::getOrganId, reqVO.getOrganId()) .eqIfPresent(OrderDO::getOrganId, reqVO.getOrganId())
.eqIfPresent(OrderDO::getDeleted, reqVO.getDeleted()) .eqIfPresent(OrderDO::getDeleted, reqVO.getDeleted())
.betweenIfPresent(OrderDO::getCreateTime, reqVO.getCreateTime()) .betweenIfPresent(OrderDO::getCreateTime, reqVO.getCreateTime());
.orderByDesc(OrderDO::getId));
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);
} }
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/ExcelTypeRealize.java
+15 -3
View File
@@ -22,6 +22,7 @@ import org.springframework.stereotype.Component;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@@ -82,7 +83,7 @@ public class ExcelTypeRealize {
p.getColor(), p.getColor(),
p.getSpec(), p.getSpec(),
p.getTexture(), p.getTexture(),
p.getModel(), // p.getModel(),
p.getBrand()), p.getBrand()),
Collectors.toList() Collectors.toList()
)); ));
@@ -179,10 +180,18 @@ public class ExcelTypeRealize {
long plateNo = idWorker.nextId(); long plateNo = idWorker.nextId();
long obtainingTime = idWorker.obtainingTime(); 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); Long plateId = (Long) snowFlakeGenerator.nextId(null);
PlateDO plateDO = PlateDO.builder() PlateDO plateDO = PlateDO.builder()
.id(plateId).orderId(orderId).name(combination.getName()).plateNo(combination.getPlateNo()) .id(plateId).orderId(orderId)
.goodsId(combination.getGoodId()).width(BigDecimal.valueOf(Double.parseDouble(combination.getWidth()))) .name(combination.getName())
.plateNo(combination.getPlateNo())
.goodsId(combination.getGoodId())
.width(BigDecimal.valueOf(Double.parseDouble(combination.getWidth())))
.plateNo(((obtainingTime)+ Long.toString(plateNo).substring(2))) .plateNo(((obtainingTime)+ Long.toString(plateNo).substring(2)))
.height(BigDecimal.valueOf(Double.parseDouble(combination.getHeight()))) .height(BigDecimal.valueOf(Double.parseDouble(combination.getHeight())))
.thickness(BigDecimal.valueOf(Double.parseDouble(combination.getThickness()))) .thickness(BigDecimal.valueOf(Double.parseDouble(combination.getThickness())))
@@ -195,6 +204,7 @@ public class ExcelTypeRealize {
.sealDown(BigDecimal.valueOf(Double.parseDouble(combination.getSealDown()))) .sealDown(BigDecimal.valueOf(Double.parseDouble(combination.getSealDown())))
.holeFace(Integer.valueOf(combination.getTypographicFace())) .holeFace(Integer.valueOf(combination.getTypographicFace()))
.texture(Integer.valueOf(combination.getTexture())) .texture(Integer.valueOf(combination.getTexture()))
.area(area)
.openDoorType(Integer.valueOf(combination.getOpenDoorType())) .openDoorType(Integer.valueOf(combination.getOpenDoorType()))
.isSpecialShaped(false) .isSpecialShaped(false)
.isSculpt(false) .isSculpt(false)
@@ -300,6 +310,7 @@ public class ExcelTypeRealize {
.rawGoodsId(excelVO.getGoodsId()) .rawGoodsId(excelVO.getGoodsId())
.goodsName(excelVO.getGoodsName()) .goodsName(excelVO.getGoodsName())
.material(excelVO.getMaterial()) .material(excelVO.getMaterial())
.texture(Integer.valueOf(excelVO.getTexture()))
.color(excelVO.getColor()) .color(excelVO.getColor())
.thickness(Double.valueOf(excelVO.getThickness())) .thickness(Double.valueOf(excelVO.getThickness()))
.spec(excelVO.getSpec()) .spec(excelVO.getSpec())
@@ -317,6 +328,7 @@ public class ExcelTypeRealize {
// .goodsId(plateGoodId) // .goodsId(plateGoodId)
.goodsName(excelVO.getGoodsName()) .goodsName(excelVO.getGoodsName())
.material(excelVO.getMaterial()) .material(excelVO.getMaterial())
.texture(Integer.valueOf(excelVO.getTexture()))
.color(excelVO.getColor()) .color(excelVO.getColor())
.width(BigDecimal.valueOf(Double.valueOf(excelVO.getWidth()))) .width(BigDecimal.valueOf(Double.valueOf(excelVO.getWidth())))
.height(BigDecimal.valueOf(Double.valueOf(excelVO.getHeight()))) .height(BigDecimal.valueOf(Double.valueOf(excelVO.getHeight())))
cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/plate/PlatePageReqVO.java
+6
View File
@@ -59,4 +59,10 @@ public class PlatePageReqVO extends PageParam {
private LocalDateTime[] createTime; private LocalDateTime[] createTime;
private Long organId; private Long organId;
@Schema(description = "排序", example = "ascend")
private String order;
@Schema(description = "排序字段", example = "id")
private String field;
} }
cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/plate/PlateMapper.java
+35 -4
View File
@@ -21,9 +21,9 @@ public interface PlateMapper extends BaseMapperX<PlateDO> {
} }
default PageResult<PlateDO> selectPage(PlatePageReqVO reqVO) { 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::getOrganId, reqVO.getOrganId())
.eqIfPresent(PlateDO::getGoodsId, reqVO.getGoodsId()) .likeIfPresent(PlateDO::getGoodsId, reqVO.getGoodsId())
.likeIfPresent(PlateDO::getGoodsName, reqVO.getGoodsName()) .likeIfPresent(PlateDO::getGoodsName, reqVO.getGoodsName())
.likeIfPresent(PlateDO::getMaterial, reqVO.getMaterial()) .likeIfPresent(PlateDO::getMaterial, reqVO.getMaterial())
.likeIfPresent(PlateDO::getColor, reqVO.getColor()) .likeIfPresent(PlateDO::getColor, reqVO.getColor())
@@ -35,8 +35,39 @@ public interface PlateMapper extends BaseMapperX<PlateDO> {
.likeIfPresent(PlateDO::getRemark, reqVO.getRemark()) .likeIfPresent(PlateDO::getRemark, reqVO.getRemark())
.eqIfPresent(PlateDO::getPrice, reqVO.getPrice()) .eqIfPresent(PlateDO::getPrice, reqVO.getPrice())
.likeIfPresent(PlateDO::getTexture, reqVO.getTexture()) .likeIfPresent(PlateDO::getTexture, reqVO.getTexture())
.betweenIfPresent(PlateDO::getCreateTime, reqVO.getCreateTime()) .betweenIfPresent(PlateDO::getCreateTime, reqVO.getCreateTime());
.orderByDesc(PlateDO::getId));
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); PlateDO selectOneById(@Param("id") Long id, @Param("organId") Long organId);