diff --git a/cloud-market-server/src/main/java/com/muyu/cloud/market/controller/OrdersController.java b/cloud-market-server/src/main/java/com/muyu/cloud/market/controller/OrdersController.java index 0812ccc..20df932 100644 --- a/cloud-market-server/src/main/java/com/muyu/cloud/market/controller/OrdersController.java +++ b/cloud-market-server/src/main/java/com/muyu/cloud/market/controller/OrdersController.java @@ -1,5 +1,6 @@ package com.muyu.cloud.market.controller; +import com.alibaba.nacos.api.naming.pojo.healthcheck.impl.Http; import com.dtflys.forest.springboot.annotation.ForestScannerRegister; import com.github.pagehelper.PageInfo; import com.muyu.cloud.market.domin.Orders; @@ -119,15 +120,26 @@ public class OrdersController { //导出 @GetMapping("/getOutAll") - public void getOutAll(@Validated @RequestBody HttpServletResponse response){ + public void gatOutAll(HttpServletResponse response){ //创建工具类对象 + ExcelUtil excelUtil =new ExcelUtil<>(Orders.class); + //去数据库查询要导出来的数据 + List outAll = orderShowService.getOutAll(); + + excelUtil.exportExcel(response,outAll ,"订单信息表"); + } + + //选中导出 + @GetMapping("/getseleOut") + public void selectOut (HttpServletResponse response,Integer[] ids){ + //创建 ExcelUtil excelUtil = new ExcelUtil<>(Orders.class); //去数据库查询要导出来的数据 - List list = orderShowService.getOutAll(); - //调用工具类导出的方法 - excelUtil.exportExcel(response,list,"订单信息表"); + List list = orderShowService.getseleOut(ids); + + excelUtil.exportExcel(response,list,"订单信息选中导出"); + } - } diff --git a/cloud-market-server/src/main/java/com/muyu/cloud/market/mapper/OrderShowMapper.java b/cloud-market-server/src/main/java/com/muyu/cloud/market/mapper/OrderShowMapper.java index e8e2cb4..6a0d968 100644 --- a/cloud-market-server/src/main/java/com/muyu/cloud/market/mapper/OrderShowMapper.java +++ b/cloud-market-server/src/main/java/com/muyu/cloud/market/mapper/OrderShowMapper.java @@ -77,9 +77,7 @@ public interface OrderShowMapper { //导出 List getOutAll(); //选中导出 - List getseleOut(@Param("ids") Integer[] ids); - //搜索导出 - List getsearOut(@Param("empName") String empName); + List getSeleOut(@Param("ids") Integer[] ids); /** diff --git a/cloud-market-server/src/main/java/com/muyu/cloud/market/service/OrderShowService.java b/cloud-market-server/src/main/java/com/muyu/cloud/market/service/OrderShowService.java index ca732e6..5bac22f 100644 --- a/cloud-market-server/src/main/java/com/muyu/cloud/market/service/OrderShowService.java +++ b/cloud-market-server/src/main/java/com/muyu/cloud/market/service/OrderShowService.java @@ -79,5 +79,6 @@ public interface OrderShowService { */ List getOutAll(); + List getseleOut(Integer[] ids); } diff --git a/cloud-market-server/src/main/java/com/muyu/cloud/market/service/impl/OrderShowServiceImpl.java b/cloud-market-server/src/main/java/com/muyu/cloud/market/service/impl/OrderShowServiceImpl.java index d335d25..aa15fed 100644 --- a/cloud-market-server/src/main/java/com/muyu/cloud/market/service/impl/OrderShowServiceImpl.java +++ b/cloud-market-server/src/main/java/com/muyu/cloud/market/service/impl/OrderShowServiceImpl.java @@ -128,6 +128,11 @@ public class OrderShowServiceImpl implements OrderShowService { return orderShowMapper.getOutAll(); } + @Override + public List getseleOut(Integer[] ids) { + return orderShowMapper.getSeleOut(ids); + } + public Orders selectByOrderNo(String ordersNum) { return orderShowMapper.selectByordersNum(ordersNum); } diff --git a/cloud-market-server/src/main/resources/mapper/market/OrderShowMapper.xml b/cloud-market-server/src/main/resources/mapper/market/OrderShowMapper.xml index 14e7c17..3f4303a 100644 --- a/cloud-market-server/src/main/resources/mapper/market/OrderShowMapper.xml +++ b/cloud-market-server/src/main/resources/mapper/market/OrderShowMapper.xml @@ -95,12 +95,43 @@ + + + +