fix

zhongzheng-admin/src/main/java/com/zhongzheng/controller/order/OrderInputController.java

@@ -16,6 +16,7 @@ import com.zhongzheng.modules.order.bo.OrderInputAddBo;
 import com.zhongzheng.modules.order.bo.OrderInputEditBo;
 import com.zhongzheng.modules.order.bo.OrderInputQueryBo;
 import com.zhongzheng.modules.order.bo.OrderInputWrongImportBo;
+import com.zhongzheng.modules.order.domain.OrderInput;
 import com.zhongzheng.modules.order.service.IOrderInputService;
 import com.zhongzheng.modules.order.vo.OrderInputVo;
 import lombok.RequiredArgsConstructor;
@@ -131,11 +132,7 @@ public class OrderInputController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:profile:export')")
     @Log(title = "导出错误录入订单", businessType = BusinessType.EXPORT)
     @PostMapping("/exportInputOrder")
-    public AjaxResult<Map<String,Object>> exportInputOrder(@RequestBody List<OrderInputVo> bo) {
-        Map<String,Object> map = new HashMap<>();
-        String timeStr= LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
-        ExcelUtil<OrderInputWrongImportBo> util = new ExcelUtil<OrderInputWrongImportBo>(OrderInputWrongImportBo.class);
-//        map.put("excel",util.exportEasyExcel(util.exportEasyData(bo), "导出订单错误数据-"+timeStr));
-        return AjaxResult.success(map);
+    public AjaxResult<Map<String,Object>> exportInputOrder(@RequestBody List<String> ids) {
+        return AjaxResult.success(iOrderInputService.excelImport(ids));
     }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderInputQueryBo.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -76,5 +77,4 @@ public class OrderInputQueryBo extends BaseEntity {
 	/** 录单来源 1普通录单 2新B端下单  3旧B端下单 */
 	@ApiModelProperty("录单来源 1普通录单 2新B端下单  3旧B端下单")
 	private Integer inputFrom;
-
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/domain/OrderInput.java

@@ -8,6 +8,8 @@ import lombok.experimental.Accessors;
 import java.io.Serializable;
 import java.util.Date;
 import java.math.BigDecimal;
+import java.util.List;
+
 import com.zhongzheng.common.annotation.Excel;
 
 /**
@@ -55,4 +57,6 @@ private static final long serialVersionUID=1L;
     private Integer checkStauts;
     /** 审核意见 */
     private String checkReason;
+    @TableField(exist = false)
+    private List<String> ids;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/IOrderInputService.java

@@ -5,7 +5,6 @@ import com.zhongzheng.modules.order.bo.OrderInputAddBo;
 import com.zhongzheng.modules.order.bo.OrderInputEditBo;
 import com.zhongzheng.modules.order.bo.OrderInputQueryBo;
 import com.zhongzheng.modules.order.domain.OrderInput;
-import com.zhongzheng.modules.order.vo.OrderInputImpotVo;
 import com.zhongzheng.modules.order.vo.OrderInputVo;
 
 import java.util.Collection;
@@ -63,5 +62,5 @@ public interface IOrderInputService extends IService<OrderInput> {
 	List<OrderInputVo> getUserGoodsList(OrderInputQueryBo bo);
 
     void questionOrderOpen(String orderSn,Long tenantId);
-	Map<String, Object> excelImport(List<OrderInputImpotVo> bo);
+	Map<String, Object> excelImport(List<String> ids);
 }

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

@@ -1,6 +1,5 @@
 package com.zhongzheng.modules.order.service.impl;
 
-import cn.afterturn.easypoi.excel.entity.ExportParams;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
@@ -20,7 +19,6 @@ import com.zhongzheng.modules.order.domain.Order;
 import com.zhongzheng.modules.order.domain.OrderGoods;
 import com.zhongzheng.modules.order.domain.OrderInput;
 import com.zhongzheng.modules.order.mapper.OrderInputMapper;
-import com.zhongzheng.modules.order.service.IOrderGoodsFreeService;
 import com.zhongzheng.modules.order.service.IOrderGoodsService;
 import com.zhongzheng.modules.order.service.IOrderInputService;
 import com.zhongzheng.modules.order.service.IOrderService;
@@ -43,8 +41,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.Page;
 
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -276,26 +272,57 @@ public class OrderInputServiceImpl extends ServiceImpl<OrderInputMapper, OrderIn
     }
 
     @Override
-    public Map<String, Object> excelImport(List<OrderInputImpotVo> bo) {
+    public Map<String, Object> excelImport(List<String> ids) {
         Map<String,Object> map = new HashMap<>();
+        List<OrderInputVo> orderInputVos = new ArrayList<>();
+        List<OrderInputImpotVo> orderInputImpotVos = new ArrayList<>();
+        List<OrderListImportVo> orderListImportVos = new ArrayList<>();
+        if (ids.size()>50){
+            throw new CustomException("超出文档导出上限");
+        }
+        if (ObjectUtils.isNotEmpty(ids)) {
+            ids.forEach(id -> {
+                OrderInputQueryBo orderInputQueryBo = new OrderInputQueryBo();
+                orderInputQueryBo.setInputOrderSn(String.valueOf(id));
+                OrderInputVo orderInputVo = this.selectList(orderInputQueryBo).get(0);
+                orderInputVos.add(orderInputVo);
+                orderInputVos.forEach(item -> {
+                    OrderInputImpotVo bean = BeanUtil.toBean(item, OrderInputImpotVo.class);
+                    orderInputImpotVos.add(bean);
+                });
+                OrderQueryBo orderQueryBo = new OrderQueryBo();
+                orderQueryBo.setInputOrderSn(String.valueOf(id));
+                orderQueryBo.setStatus(new Integer[]{1});
+                List<OrderListVo> orderListVo = iOrderService.selectList(orderQueryBo);
+                orderListVo.forEach(orderLIst->{
+                    OrderListImportVo bean = BeanUtil.toBean(orderLIst, OrderListImportVo.class);
+                    bean.setInputOrderSn(id);
+                    orderListImportVos.add(bean);
+                });
+            });
+        }
         OrderInputQueryBo orderInputQueryBo = new OrderInputQueryBo();
         orderInputQueryBo.setStatus(1);
-        List<OrderInputVo> orderInputVos = this.selectList(orderInputQueryBo);
-        List<OrderInputImpotVo> orderInputImpotVos = new ArrayList<>();
-        orderInputVos.forEach(item->{
+        List<OrderInputVo> orderInputVos1 = this.selectList(orderInputQueryBo);
+        orderInputVos1=orderInputVos1.stream().limit(50).collect(Collectors.toList());
+        orderInputVos1.forEach(item -> {
             OrderInputImpotVo bean = BeanUtil.toBean(item, OrderInputImpotVo.class);
             orderInputImpotVos.add(bean);
-        });
-        OrderQueryBo orderQueryBo = new OrderQueryBo();
-        ArrayList<OrderListVo> orderListVos1 = new ArrayList<>();
-        orderInputVos.forEach(orderInputVo -> {
-            orderQueryBo.setInputOrderSn(orderInputVo.getInputOrderSn());
-            List<OrderListVo> orderListVos = iOrderService.selectList(orderQueryBo);
+            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());
+                orderListImportVos.add(importVo);
+            });
         });
         ExcelUtil<OrderInputImpotVo> inputImpotVoExcelUtil = new ExcelUtil<>(OrderInputImpotVo.class);
         ExcelUtil<OrderListImportVo> importVoExcelUtil = new ExcelUtil<>(OrderListImportVo.class);
-        map.put("excel",util.exportEasyExcel(inputImpotVoExcelUtil.exportEasyData(orderInputImpotVos), "导出后台订单"));
-        map.put("excel",util.exportEasyExcel(importVoExcelUtil.exportEasyData(), "导出后台订单"));
+        map.put("excel",inputImpotVoExcelUtil.exportEasyExcel(inputImpotVoExcelUtil.exportEasyData(orderInputImpotVos), "导出后台订单"));
+        map.put("excel",inputImpotVoExcelUtil.exportEasyExcel(importVoExcelUtil.exportEasyData(orderListImportVos), "导出订单详情"));
+        return map;
     }