修改

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.example</groupId>
     <artifactId>dil-wms-api</artifactId>
-    <version>1.10</version>
+    <version>1.11</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>

src/main/java/com/steerinfo/dil/controller/OyeResultController.java

@@ -69,6 +69,9 @@ public class OyeResultController extends BaseRESTfulController {
                 mapValue.put("saleAreaRemark",saleAreaRemark);
             }
         }
+        if (mapValue.containsKey("isExcel")) {
+            return success(oyeResultService.getOyeInboundResult(mapValue));
+        }
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = oyeResultService.getOyeInboundResult(mapValue);
@@ -100,6 +103,9 @@ public class OyeResultController extends BaseRESTfulController {
                 mapValue.put("saleAreaRemark",saleAreaRemark);
             }
         }
+        if (mapValue.containsKey("isExcel")) {
+            return success(oyeResultService.getOyeOutboundResult(mapValue));
+        }
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = oyeResultService.getOyeOutboundResult(mapValue);
@@ -131,6 +137,9 @@ public class OyeResultController extends BaseRESTfulController {
                 mapValue.put("saleAreaRemark",saleAreaRemark);
             }
         }
+        if (mapValue.containsKey("isExcel")) {
+            return success(oyeResultService.getOyeRealTimeResult(mapValue));
+        }
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = oyeResultService.getOyeRealTimeResult(mapValue);