fix

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

@@ -132,7 +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<String> ids) {
+    public AjaxResult exportInputOrder(@RequestBody List<String> ids) {
         return AjaxResult.success(iOrderInputService.excelImport(ids));
     }
 }

zhongzheng-common/src/main/java/com/zhongzheng/common/constant/Constants.java

@@ -160,4 +160,8 @@ public class Constants
      * 资源映射路径 前缀
      */
     public static final String RESOURCE_PREFIX = "/profile";
+    /**
+     * 序号
+     */
+    public static final Integer NUMBER = 1;
 }

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

@@ -9,6 +9,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.zhongzheng.common.config.RuoYiConfig;
+import com.zhongzheng.common.constant.Constants;
 import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
@@ -292,23 +293,12 @@ public class OrderInputServiceImpl extends ServiceImpl<OrderInputMapper, OrderIn
             throw new CustomException("超出文档导出上限");
         }
         if (ObjectUtils.isNotEmpty(ids)) {
+            final Integer[] number = {Constants.NUMBER};
             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);
-                    if (ObjectUtils.isEmpty(item.getGoodsRealPrice())) {
-                        bean.setGoodsRealPrice(BigDecimal.valueOf(0));
-                    }
-                    if (!ObjectUtils.isEmpty(item.getOrderFrom())){
-                        bean.setInputFrom(getGoodFromName(item.getOrderFrom()));
-                    }
-                    bean.setGoodBusiness(item.getEducationName() + item.getProjectName() + item.getBusinessName());
-                    bean.setGoodsNoReceived(item.getPayPrice().subtract(item.getGoodsReceived()));
-                    orderInputImpotVos.add(bean);
-                });
                 OrderQueryBo orderQueryBo = new OrderQueryBo();
                 orderQueryBo.setInputOrderSn(String.valueOf(id));
                 orderQueryBo.setStatus(new Integer[]{1});
@@ -318,6 +308,7 @@ public class OrderInputServiceImpl extends ServiceImpl<OrderInputMapper, OrderIn
                     if (ObjectUtils.isEmpty(orderLIst.getGoodsRealPrice())) {
                         bean.setGoodsRealPrice(BigDecimal.valueOf(0));
                     }
+                    bean.setId(number[0]);
                     bean.setGoodsPayStatus(getGoodsPayStatus(orderLIst.getGoodsPayStatus()));
                     bean.setInputOrderSn(id);
                     bean.setGoodsBusiness(orderLIst.getEducationName() + orderLIst.getProjectName() + orderLIst.getBusinessName());
@@ -331,11 +322,27 @@ public class OrderInputServiceImpl extends ServiceImpl<OrderInputMapper, OrderIn
                     }
                     bean.setGoodsNotReceived(orderLIst.getPayPrice().subtract(orderLIst.getGoodsReceived()));
                     orderListImportVos.add(bean);
+                    number[0]++;
                 });
             });
         }else {
             throw new CustomException("请先勾选数据");
         }
+        final Integer[] number = {Constants.NUMBER};
+        orderInputVos.forEach(item -> {
+            OrderInputImpotVo bean = BeanUtil.toBean(item, OrderInputImpotVo.class);
+            bean.setId(number[0]);
+            if (ObjectUtils.isEmpty(item.getGoodsRealPrice())) {
+                bean.setGoodsRealPrice(BigDecimal.valueOf(0));
+            }
+            if (!ObjectUtils.isEmpty(item.getOrderFrom())){
+                bean.setInputFrom(getGoodFromName(item.getOrderFrom()));
+            }
+            bean.setGoodBusiness(item.getEducationName() + item.getProjectName() + item.getBusinessName());
+            bean.setGoodsNoReceived(item.getPayPrice().subtract(item.getGoodsReceived()));
+            orderInputImpotVos.add(bean);
+            number[0]++;
+        });
         List<Map<String, Object>> sheetsList = new ArrayList<>();
         ExportParams deptExportParams = new ExportParams();
         deptExportParams.setSheetName("后台订单");
@@ -390,6 +397,9 @@ public class OrderInputServiceImpl extends ServiceImpl<OrderInputMapper, OrderIn
         if (type.equals("5")) {
             return "业务员录单";
         }
+        if (type.equals("6")) {
+            return "业务员系统";
+        }
         return null;
     }
     private String getGoodsPayStatus(Integer type) {

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderInputImpotVo.java

@@ -20,7 +20,7 @@ public class OrderInputImpotVo {
 
 	@Excel(name = "序号")
 	@ApiModelProperty("$pkColumn.columnComment")
-	private Long id;
+	private Integer id;
 	/** 录单订单编号 */
 	@Excel(name = "订单时间")
 	@ApiModelProperty("订单时间")