From 1ceb48e1084395588c23598c01079901209ab112 Mon Sep 17 00:00:00 2001 From: lym <1994302445@qq.com> Date: Tue, 1 Apr 2025 09:58:25 +0800 Subject: [PATCH] =?UTF-8?q?bug1455,1456=E9=95=BF=E5=BA=A6=E4=B8=BA0?= =?UTF-8?q?=E6=97=B6=E8=BF=94=E5=9B=9Enull?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/plate/PlateManageServiceImpl.java | 13 +++++++++++-- .../executor/service/order/OrderServiceImpl.java | 8 +++++++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/plate/PlateManageServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/plate/PlateManageServiceImpl.java index 939f21626..48e635290 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/plate/PlateManageServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/plate/PlateManageServiceImpl.java @@ -30,6 +30,7 @@ import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicBoolean; @@ -76,6 +77,8 @@ public class PlateManageServiceImpl implements PlateManageService { private static final String EMPTY_STRING = new String(); + public static final Double ZERO = 0.0; + @Override @OrganIgnore public Long createPlate(PlateSaveReqVO createReqVO) { @@ -129,7 +132,9 @@ public class PlateManageServiceImpl implements PlateManageService { @Override @OrganIgnore public PlateGoodDO getPlate(Long id, Long organId) { - return plateGoodMapper.selectOneById(id, organId); + PlateGoodDO plate = plateGoodMapper.selectOneById(id, organId); + return plate.setWidth(Objects.equals(plate.getWidth(), ZERO) ? null : plate.getWidth()) + .setHeight(Objects.equals(plate.getHeight(), ZERO) ? null : plate.getHeight()); } @Override @@ -150,7 +155,11 @@ public class PlateManageServiceImpl implements PlateManageService { // if (pageReqVO.getOrganId() == null || pageReqVO.getOrganId() == 0) { pageReqVO.setOrganId(getOrganId(BASE_PLATE_QUERY_PERMISSION, getLoginUser().getId(), pageReqVO.getOrganId())); // } - return plateGoodMapper.selectPage(pageReqVO); + PageResult plateGoodDOPageResult = plateGoodMapper.selectPage(pageReqVO); + plateGoodDOPageResult.getList().forEach(plateGoodDO -> plateGoodDO.setWidth(Objects.equals(plateGoodDO.getWidth(), ZERO) ? null : plateGoodDO.getWidth()) + .setHeight(Objects.equals(plateGoodDO.getHeight(), ZERO) ? null : plateGoodDO.getHeight()) + .setPrice(Objects.equals(plateGoodDO.getPrice(), ZERO) ? null : plateGoodDO.getPrice())); + return plateGoodDOPageResult; } @Override diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java index bb72e6e2a..6e909001e 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java @@ -169,7 +169,7 @@ public class OrderServiceImpl implements OrderService { String ORDER_REMAIN_PLATE_MODEL = "imes_order_optimize_plate_model"; - + public static final Double ZERO = 0.0; @Resource private PlanService planService; @@ -313,6 +313,12 @@ public class OrderServiceImpl implements OrderService { IPage orderDetail = orderItemMapper.selectPartsDetailByOrderId(page, orderId, roomId, bodyId, groupId, name, getUserOrganId(), deleted, types); + orderDetail.getRecords().forEach(item -> { + if (Objects.equals(item.getLength(), ZERO)) { + item.setLength(null); + } + }); + return new PageResult(orderDetail.getRecords(), orderDetail.getTotal()); }