2022年10月20日18:00:18

blade-service/trade-purchase/src/main/java/com/trade/purchase/excel/GeneralLedgerExcel.java

@@ -27,18 +27,6 @@ public class GeneralLedgerExcel {
 	private String length;
 
 	/**
-	 * 宽
-	 */
-	@ExcelProperty(value = "宽")
-	private String width;
-
-	/**
-	 * 宽度明细
-	 */
-	@ExcelProperty(value = "宽度明细")
-	private String widthItem;
-
-	/**
 	 * 厚
 	 */
 	@ExcelProperty(value = "厚")

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/controller/WoodHarvestingCloudController.java

@@ -335,11 +335,11 @@ public class WoodHarvestingCloudController {
 	@GetMapping("/generalLedgerExport")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "库存导出", notes = "传入order")
-	public void generalLedgerExport(OrderTotalDTO order, Query query, HttpServletResponse response) {
+	public void generalLedgerExport(OrderTotalDTO order, HttpServletResponse response) {
 		order.setTenantId(AuthUtil.getTenantId());
-		IPage<GeneralLedgerExcel> pages = orderService.generalLedgerList(Condition.getPage(query), order);
-		if (ObjectUtils.isNotNull(pages.getRecords())) {
-			ExcelUtil.export(response, "库存数据导出", "库存数据", pages.getRecords(), GeneralLedgerExcel.class);
+		List<GeneralLedgerExcel> generalLedgerExcelList = orderService.generalLedgerListAll(order);
+		if (ObjectUtils.isNotNull(generalLedgerExcelList)) {
+			ExcelUtil.export(response, "库存数据导出", "库存数据", generalLedgerExcelList, GeneralLedgerExcel.class);
 		} else {
 			throw new SecurityException("未查到数据，导出失败");
 		}

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/service/IOrderService.java

@@ -260,4 +260,11 @@ public interface IOrderService extends IService<Order> {
 	 * @return
 	 */
 	List<GeneralLedgerExcel> generalLedgerTotal(OrderTotalDTO order);
+
+	/**
+	 *
+	 * @param order
+	 * @return
+	 */
+	List<GeneralLedgerExcel> generalLedgerListAll(OrderTotalDTO order);
 }

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/service/impl/OrderServiceImpl.java

@@ -2367,6 +2367,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		return baseMapper.generalLedgerTotal(order);
 	}
 
+	@Override
+	public List<GeneralLedgerExcel> generalLedgerListAll(OrderTotalDTO order) {
+		return baseMapper.generalLedgerTotal(order);
+	}
+
 	/**
 	 * 订单生成账单 并且推送财务消息
 	 *