From 8f527cfc93518f5db3b90f31f78a358d79bcbb51 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 03 十一月 2023 16:58:04 +0800
Subject: [PATCH] #导出excel单据
---
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index 2872ba5..5012aa0 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -1,6 +1,7 @@
package com.zy.asrs.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.SnowflakeIdWorker;
@@ -73,8 +74,9 @@
}
if (complete) {
for (OrderDetl orderDetl : orderDetls) {
- //鐢熸垚鍗曟嵁鍜屽叆搴撻�氱煡妗ｆ椂锛岀粰batch涓虹┖鐨勬槑缁嗚祴浜嗕竴涓� =""锛� 鐜板湪鏀逛负null锛屽洖浼犵敤
- if (orderDetl.getBatch().equals("")){
+ if (Cools.isEmpty(orderDetl.getBatch())){
+ orderDetlService.updateById(orderDetl);
+ }else if (orderDetl.getBatch().equals("")){//鐢熸垚鍗曟嵁鍜屽叆搴撻�氱煡妗ｆ椂锛岀粰batch涓虹┖鐨勬槑缁嗚祴浜嗕竴涓� =""锛� 鐜板湪鏀逛负null锛屽洖浼犵敤
orderDetl.setBatch(null);
orderDetlService.updateById(orderDetl);
}
@@ -208,4 +210,15 @@
return this.baseMapper.selectToBeHistoryOrder(settle);
}
+ @Override
+ public List<OrderListDTO> selectAllorderNo() {
+ return this.baseMapper.selectAllorderNo();
+ }
+
+ @Override
+ public Page<Order> getOrderAll(Page<Order> page) {
+ page.setRecords(baseMapper.getOrderAll(page.getCondition()));
+ page.setTotal(baseMapper.getOrderAllCount(page.getCondition()));
+ return page;
+ }
}
--
Gitblit v1.9.1