From a99c1f36e52c75e0020127c62d39c1eddae4a036 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 28 七月 2025 17:07:54 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
index 3e78377..5b7e0ba 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
@@ -295,6 +295,10 @@
orderMapper.saveOrderFile(OrderDetails.get(i).getFileName(), OrderDetails.get(i).getFileData(),orderId,OrderDetails.get(i).getOrderNumber());
}
+ if(OrderDetails.get(i).getShape()==null){
+ OrderDetails.get(i).setShape("1");
+ }
+
}
@@ -384,7 +388,7 @@
public Map<String,Object> getOrderList(Integer pageNum, Integer pageSize, List<String> selectDate, Map<String,Object> config,Integer orderType) {
Integer offset = (pageNum-1)*pageSize;
String endDate = LocalDate.now().toString();
- String startDate = LocalDate.now().minusDays(15).toString();
+ String startDate = LocalDate.now().minusDays(365).toString();
if(selectDate !=null && selectDate.size()==2){
if(!selectDate.get(0).isEmpty()){
startDate = selectDate.get(0);
@@ -1011,4 +1015,26 @@
map.put("data",orderMapper.selectOrderFile(orderId,orderNumber));
return map;
}
+
+ public boolean updateOrderFile(Map<String,Object> object) {
+ String orderId = "";
+ if (object.get("orderId") != null) {
+ orderId = object.get("orderId").toString();
+ }
+ int orderNumber =0;
+ if (object.get("orderNumber") != null) {
+ orderNumber = Integer.parseInt(object.get("orderNumber").toString());
+ }
+ String dataBase64 = "";
+ if (object.get("dataBase64") != null) {
+ dataBase64 = object.get("dataBase64").toString();
+ }
+ Map<String,String> orderFile =orderMapper.selectOrderFile(orderId,orderNumber);
+ if(orderFile!=null){
+ orderMapper.updateOrderFile("map.dxf", dataBase64,orderId,orderNumber);
+ }else{
+ orderMapper.saveOrderFile("map.dxf", dataBase64,orderId,orderNumber);
+ }
+ return true;
+ }
}
--
Gitblit v1.8.0