From 0379bbe120f509f8c330713958b59687d25b80b3 Mon Sep 17 00:00:00 2001 From: zhangc <zc@123> Date: 星期六, 08 二月 2025 16:34:50 +0800 Subject: [PATCH] 兼容四期 --- src/main/java/com/zy/asrs/controller/OrderLogController.java | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OrderLogController.java b/src/main/java/com/zy/asrs/controller/OrderLogController.java index 379fdbd..237e355 100644 --- a/src/main/java/com/zy/asrs/controller/OrderLogController.java +++ b/src/main/java/com/zy/asrs/controller/OrderLogController.java @@ -1,5 +1,6 @@ package com.zy.asrs.controller; +import com.alibaba.excel.EasyExcel; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.Wrapper; @@ -8,13 +9,17 @@ import com.core.common.*; import com.zy.asrs.entity.*; import com.zy.asrs.entity.result.WrkTraceVo; +import com.zy.asrs.excel.CloseOrderReadListener; +import com.zy.asrs.excel.ExcelOrder; import com.zy.asrs.service.*; import com.zy.common.web.BaseController; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import java.io.IOException; import java.util.*; @Slf4j @@ -40,6 +45,9 @@ @Autowired private MatService matService; + @Autowired + private OrderService orderService; + @RequestMapping(value = "/orderLog/nav/list/auth") @ManagerAuth public R navList(@RequestParam(required = false) String orderNo){ -- Gitblit v1.9.1