renqianlong 1 年間 前
コミット
04a268d455

+ 2 - 40
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderInputServiceImpl.java

@@ -333,46 +333,8 @@ public class OrderInputServiceImpl extends ServiceImpl<OrderInputMapper, OrderIn
                     orderListImportVos.add(bean);
                 });
             });
-        } else {
-            OrderInputQueryBo orderInputQueryBo = new OrderInputQueryBo();
-            orderInputQueryBo.setStatus(1);
-            List<OrderInputVo> orderInputVos1 = this.selectList(orderInputQueryBo);
-            orderInputVos1 = orderInputVos1.stream().limit(50).collect(Collectors.toList());
-            orderInputVos1.forEach(item -> {
-                OrderInputImpotVo bean = BeanUtil.toBean(item, OrderInputImpotVo.class);
-                bean.setInputOrderSn(item.getEducationName() + item.getProjectName() + item.getBusinessName());
-                if (ObjectUtils.isEmpty(item.getGoodsRealPrice())) {
-                    bean.setGoodsRealPrice(BigDecimal.valueOf(0));
-                }
-                if (!ObjectUtils.isEmpty(item.getOrderFrom())){
-                    bean.setInputFrom(getGoodFromName(item.getOrderFrom()));
-                }
-                bean.setGoodsNoReceived(item.getPayPrice().subtract(item.getGoodsReceived()));
-                orderInputImpotVos.add(bean);
-                OrderQueryBo orderQueryBo = new OrderQueryBo();
-                orderQueryBo.setInputOrderSn(String.valueOf(item.getInputOrderSn()));
-                orderQueryBo.setStatus(new Integer[]{1});
-                List<OrderListVo> orderListVo = iOrderService.selectList(orderQueryBo);
-                orderListVo.forEach(orderLIst -> {
-                    OrderListImportVo importVo = BeanUtil.toBean(orderLIst, OrderListImportVo.class);
-                    importVo.setInputOrderSn(item.getInputOrderSn());
-                    importVo.setGoodsPayStatus(getGoodsPayStatus(orderLIst.getGoodsPayStatus()));
-                    importVo.setOrderStatus(getOrderStatus(orderLIst.getOrderStatus()));
-                    importVo.setInputOrderSn(orderLIst.getEducationName() + orderLIst.getProjectName() + orderLIst.getBusinessName());
-                    importVo.setRefundStatus(getRefundStatus(orderLIst.getRefundStatus()));
-                    if (!ObjectUtils.isEmpty(orderLIst.getInvoiceStatus())){
-                        importVo.setInvoiceStatus(getInvoiceStatus(orderLIst.getInvoiceStatus()));
-                    }
-                    importVo.setGoodsNotReceived(orderLIst.getPayPrice().subtract(orderLIst.getGoodsReceived()));
-                    if (!ObjectUtils.isEmpty(orderLIst.getRebuy())){
-                        importVo.setRebuy(getInvoiceStatus(orderLIst.getRebuy()));
-                    }
-                    if (ObjectUtils.isEmpty(orderLIst.getGoodsRealPrice())) {
-                        importVo.setGoodsRealPrice(BigDecimal.valueOf(0));
-                    }
-                    orderListImportVos.add(importVo);
-                });
-            });
+        }else {
+            throw new CustomException("请先勾选数据");
         }
         List<Map<String, Object>> sheetsList = new ArrayList<>();
         ExportParams deptExportParams = new ExportParams();