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

bug1455,1456长度为0时返回null

Browse Source
This commit is contained in:
lym
2025-04-01 09:58:25 +08:00
parent 3c28e104d8
commit 1ceb48e108
2 changed files with 18 additions and 3 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/service/manage/plate/PlateManageServiceImpl.java
+11 -2
View File
@@ -30,6 +30,7 @@ import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects;
import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
@@ -76,6 +77,8 @@ public class PlateManageServiceImpl implements PlateManageService {
private static final String EMPTY_STRING = new String(); private static final String EMPTY_STRING = new String();
public static final Double ZERO = 0.0;
@Override @Override
@OrganIgnore @OrganIgnore
public Long createPlate(PlateSaveReqVO createReqVO) { public Long createPlate(PlateSaveReqVO createReqVO) {
@@ -129,7 +132,9 @@ public class PlateManageServiceImpl implements PlateManageService {
@Override @Override
@OrganIgnore @OrganIgnore
public PlateGoodDO getPlate(Long id, Long organId) { 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 @Override
@@ -150,7 +155,11 @@ public class PlateManageServiceImpl implements PlateManageService {
// if (pageReqVO.getOrganId() == null || pageReqVO.getOrganId() == 0) { // if (pageReqVO.getOrganId() == null || pageReqVO.getOrganId() == 0) {
pageReqVO.setOrganId(getOrganId(BASE_PLATE_QUERY_PERMISSION, getLoginUser().getId(), pageReqVO.getOrganId())); pageReqVO.setOrganId(getOrganId(BASE_PLATE_QUERY_PERMISSION, getLoginUser().getId(), pageReqVO.getOrganId()));
// } // }
return plateGoodMapper.selectPage(pageReqVO); PageResult<PlateGoodDO> 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 @Override
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java
+7 -1
View File
@@ -169,7 +169,7 @@ public class OrderServiceImpl implements OrderService {
String ORDER_REMAIN_PLATE_MODEL = "imes_order_optimize_plate_model"; String ORDER_REMAIN_PLATE_MODEL = "imes_order_optimize_plate_model";
public static final Double ZERO = 0.0;
@Resource @Resource
private PlanService planService; private PlanService planService;
@@ -313,6 +313,12 @@ public class OrderServiceImpl implements OrderService {
IPage<OrderPartsRespVO> orderDetail = orderItemMapper.selectPartsDetailByOrderId(page, orderId, roomId, bodyId, groupId, name, getUserOrganId(), deleted, types); IPage<OrderPartsRespVO> 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()); return new PageResult(orderDetail.getRecords(), orderDetail.getTotal());
} }