From f692a364cdb559ddadc4f6dac86c25848a1d4f34 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 03 十一月 2025 16:54:53 +0800
Subject: [PATCH] 修改订单首页流程卡终止状态，以及自定义标签打印
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java | 59 ++++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 42 insertions(+), 17 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
index 60f47e5..aa48c94 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
@@ -332,6 +332,13 @@
// return map;
// }
+ private static String to080000(String s) {
+ if (s == null || s.isEmpty()) return null;
+ String v = s.trim();
+ // 鍙繚鐣欐棩鏈熼儴鍒嗭紙鍓�10浣� yyyy-MM-dd锛�
+ String datePart = v.length() >= 10 ? v.substring(0, 10) : v;
+ return datePart + " 08:00:00";
+ }
//璺ㄥ伐搴忔鐮�
public Map<String, Object> crossProcessBreakingSv(Integer pageNum, Integer pageSize,
List<String> selectDate,
@@ -339,15 +346,15 @@
Integer offset = (pageNum - 1) * pageSize;
// 榛樿鏃堕棿鑼冨洿锛氳繃鍘� 15 澶�
- String endDate = LocalDate.now().toString();
- String startDate = LocalDate.now().minusDays(15).toString();
+ String startDate = to080000(LocalDate.now().minusDays(15).toString());
+ String endDate = to080000(LocalDate.now().toString());
if (selectDate != null && selectDate.size() == 2) {
- if (!selectDate.get(0).isEmpty()) {
- startDate = selectDate.get(0);
+ if (selectDate.get(0) != null && !selectDate.get(0).isEmpty()) {
+ startDate = to080000(selectDate.get(0));
}
- if (!selectDate.get(1).isEmpty()) {
- endDate = selectDate.get(1);
+ if (selectDate.get(1) != null && !selectDate.get(1).isEmpty()) {
+ endDate = to080000(selectDate.get(1));
}
}
@@ -356,6 +363,7 @@
// 浣跨敤寮傛绾跨▼姹�
String finalEndDate = endDate;
String finalStartDate = startDate;
+ System.out.println(finalEndDate+"==="+finalStartDate);
CompletableFuture<List<CrossProcessBreakingDTO>> dataFuture = asyncExecutor.runAsync(() ->
reportMapper.getProcessBreaking(offset, pageSize, finalStartDate, finalEndDate, crossProcessBreakingDTO));
@@ -388,15 +396,15 @@
Integer offset = (pageNum - 1) * pageSize;
// 榛樿鏃堕棿鑼冨洿锛氳繃鍘� 15 澶�
- String endDate = LocalDate.now().toString();
- String startDate = LocalDate.now().minusDays(15).toString();
+ String startDate = to080000(LocalDate.now().minusDays(15).toString());
+ String endDate = to080000(LocalDate.now().toString());
if (selectDate != null && selectDate.size() == 2) {
- if (!selectDate.get(0).isEmpty()) {
- startDate = selectDate.get(0);
+ if (selectDate.get(0) != null && !selectDate.get(0).isEmpty()) {
+ startDate = to080000(selectDate.get(0));
}
- if (!selectDate.get(1).isEmpty()) {
- endDate = selectDate.get(1);
+ if (selectDate.get(1) != null && !selectDate.get(1).isEmpty()) {
+ endDate = to080000(selectDate.get(1));
}
}
@@ -590,21 +598,34 @@
// }
public Map<String, Object> selectDamageReportSv(Integer pageNum, Integer pageSize,
- String selectTime1, String selectTime2,
+ List<String> selectDate,
DamageReportDTO damageReportDTO) {
Integer offset = (pageNum - 1) * pageSize;
- Map<String, Object> result = new HashMap<>();
+ // 榛樿鏃堕棿鑼冨洿锛氳繃鍘� 15 澶�
+ String startDate = to080000(LocalDate.now().minusDays(15).toString());
+ String endDate = to080000(LocalDate.now().toString());
+ if (selectDate != null && selectDate.size() == 2) {
+ if (selectDate.get(0) != null && !selectDate.get(0).isEmpty()) {
+ startDate = to080000(selectDate.get(0));
+ }
+ if (selectDate.get(1) != null && !selectDate.get(1).isEmpty()) {
+ endDate = to080000(selectDate.get(1));
+ }
+ }
+ Map<String, Object> result = new HashMap<>();
+ String finalEndDate = endDate;
+ String finalStartDate = startDate;
// 寮傛浠诲姟瀹氫箟
CompletableFuture<List<DamageReportDTO>> dataFuture = asyncExecutor.runAsync(() ->
- reportMapper.selectDamageReportMp(offset, pageSize, selectTime1, selectTime2, damageReportDTO));
+ reportMapper.selectDamageReportMp(offset, pageSize, finalStartDate, finalEndDate, damageReportDTO));
CompletableFuture<Map<String, Integer>> totalFuture = asyncExecutor.runAsync(() ->
- reportMapper.getDamageReportPageTotal(offset, pageSize, selectTime1, selectTime2, damageReportDTO));
+ reportMapper.getDamageReportPageTotal(offset, pageSize, finalStartDate, finalEndDate, damageReportDTO));
CompletableFuture<Map<String, Float>> footSumFuture = asyncExecutor.runAsync(() ->
- reportMapper.damageReportFootSum(selectTime1, selectTime2, damageReportDTO));
+ reportMapper.damageReportFootSum(finalStartDate, finalEndDate, damageReportDTO));
//绛夊緟鍏ㄩ儴浠诲姟瀹屾垚
CompletableFuture.allOf(dataFuture, totalFuture, footSumFuture).join();
@@ -617,6 +638,10 @@
e.printStackTrace();
throw new RuntimeException("骞惰鏌ヨ寮傚父锛�" + e.getMessage(), e);
}
+ List<String> list = new ArrayList<>();
+ list.add(startDate);
+ list.add(endDate);
+ result.put("selectDate", list);
return result;
}
--
Gitblit v1.8.0