From b70ea28f51757ed39992d5a71b2e15b1d4cc7c7d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 27 十一月 2025 16:21:45 +0800
Subject: [PATCH] xml中筛选条件匹配方法修改
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java | 121 ++++++++++++++++++++++++---------------
1 files changed, 74 insertions(+), 47 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 a2580ed..ed8fb11 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
@@ -5,6 +5,7 @@
import com.alibaba.fastjson.TypeReference;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.example.erp.common.AsyncQueryExecutor;
+import com.example.erp.entity.sd.*;
import com.example.erp.tools.AreaComputed.*;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -12,10 +13,6 @@
import com.example.erp.dto.pp.*;
import com.example.erp.entity.pp.DamageDetails;
import com.example.erp.entity.pp.Report;
-import com.example.erp.entity.sd.BasicData;
-import com.example.erp.entity.sd.OrderDetail;
-import com.example.erp.entity.sd.OrderGlassDetail;
-import com.example.erp.entity.sd.ProductDetail;
import com.example.erp.mapper.pp.*;
import com.example.erp.mapper.sd.*;
import org.springframework.beans.factory.annotation.Autowired;
@@ -29,6 +26,9 @@
import java.sql.Date;
import java.sql.SQLOutput;
import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.concurrent.*;
import java.util.function.Function;
@@ -53,6 +53,7 @@
FlowCardMapper flowCardMapper;
private ReportingWorkMapper reportingWorkMapper;
+ private final OrderMapper orderMapper;
@Resource
private AsyncQueryExecutor asyncExecutor;
@@ -136,7 +137,7 @@
ProductionSchedulingMapper productionSchedulingMapper, FlowCardMapper flowCardMapper,
OrderGlassDetailMapper orderGlassDetailMapper, BasicDataMapper basicDataMapper,
ProductDetailMapper productDetailMapper, OrderDetailMapper orderDetailMapper,
- ReportingWorkMapper reportingWorkMapper, DamageDetailsMapper damageDetailsMapper) {
+ ReportingWorkMapper reportingWorkMapper, DamageDetailsMapper damageDetailsMapper, OrderMapper orderMapper) {
this.reportMapper = reportMapper;
this.orderProcessDetailMapper = orderProcessDetailMapper;
this.productionSchedulingMapper = productionSchedulingMapper;
@@ -147,6 +148,7 @@
this.orderDetailMapper = orderDetailMapper;
this.reportingWorkMapper = reportingWorkMapper;
this.damageDetailsMapper = damageDetailsMapper;
+ this.orderMapper = orderMapper;
}
//娴佺▼鍗¤繘搴︽柟娉�
@@ -305,8 +307,6 @@
}
-
-
map.put("data",dataList );
map.put("mergeCells", rowCount);
@@ -335,29 +335,47 @@
// 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";
+
+ private static final DateTimeFormatter DATE_TIME_FMT =
+ DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+ private String toReportTime(String dateStr, String reportTime) {
+ if (dateStr == null || dateStr.isEmpty()) {
+ return null;
+ }
+
+ // 鍙繚鐣� yyyy-MM-dd锛岄槻姝㈠墠绔紶瀹屾暣鏃堕棿瀵艰嚧 parse 寮傚父
+ String onlyDate = dateStr.length() > 10 ? dateStr.substring(0, 10) : dateStr;
+
+
+ String[] parts = reportTime.split(":");
+ int hour = Integer.parseInt(parts[0]);
+ int minute = parts.length > 1 ? Integer.parseInt(parts[1]) : 0;
+ int second = parts.length > 2 ? Integer.parseInt(parts[2]) : 0;
+
+ LocalDate date = LocalDate.parse(onlyDate);
+ LocalTime time = LocalTime.of(hour, minute, second);
+
+ return LocalDateTime.of(date, time).format(DATE_TIME_FMT);
}
//璺ㄥ伐搴忔鐮�
public Map<String, Object> crossProcessBreakingSv(Integer pageNum, Integer pageSize,
List<String> selectDate,
+ String reportTime,
CrossProcessBreakingDTO crossProcessBreakingDTO) {
Integer offset = (pageNum - 1) * pageSize;
- // 榛樿鏃堕棿鑼冨洿锛氳繃鍘� 15 澶�
- String startDate = to080000(LocalDate.now().minusDays(15).toString());
- String endDate = to080000(LocalDate.now().toString());
+ // 榛樿鏃堕棿鑼冨洿锛氳繃鍘� 15 澶╋紙鏃ユ湡 + reportTime锛�
+ String startDate = toReportTime(LocalDate.now().minusDays(15).toString(), reportTime);
+ String endDate = toReportTime(LocalDate.now().toString(), reportTime);
+ // 濡傛灉鍓嶇浼犱簡鏃堕棿锛屽氨鐢ㄥ墠绔棩鏈� + reportTime
if (selectDate != null && selectDate.size() == 2) {
if (selectDate.get(0) != null && !selectDate.get(0).isEmpty()) {
- startDate = to080000(selectDate.get(0));
+ startDate = toReportTime(selectDate.get(0), reportTime);
}
if (selectDate.get(1) != null && !selectDate.get(1).isEmpty()) {
- endDate = to080000(selectDate.get(1));
+ endDate = toReportTime(selectDate.get(1), reportTime);
}
}
@@ -366,7 +384,6 @@
// 浣跨敤寮傛绾跨▼姹�
String finalEndDate = endDate;
String finalStartDate = startDate;
- System.out.println(finalEndDate+"==="+finalStartDate);
CompletableFuture<List<CrossProcessBreakingDTO>> dataFuture = asyncExecutor.runAsync(() ->
reportMapper.getProcessBreaking(offset, pageSize, finalStartDate, finalEndDate, crossProcessBreakingDTO));
@@ -395,19 +412,21 @@
//闈炶法宸ュ簭娆＄牬
public Map<String, Object> notCrossProcessBreakingSv(Integer pageNum, Integer pageSize,
List<String> selectDate,
+ String reportTime,
CrossProcessBreakingDTO crossProcessBreakingDTO) {
Integer offset = (pageNum - 1) * pageSize;
- // 榛樿鏃堕棿鑼冨洿锛氳繃鍘� 15 澶�
- String startDate = to080000(LocalDate.now().minusDays(15).toString());
- String endDate = to080000(LocalDate.now().toString());
+ // 榛樿鏃堕棿鑼冨洿锛氳繃鍘� 15 澶╋紙鏃ユ湡 + reportTime锛�
+ String startDate = toReportTime(LocalDate.now().minusDays(15).toString(), reportTime);
+ String endDate = toReportTime(LocalDate.now().toString(), reportTime);
+ // 濡傛灉鍓嶇浼犱簡鏃堕棿锛屽氨鐢ㄥ墠绔棩鏈� + reportTime
if (selectDate != null && selectDate.size() == 2) {
if (selectDate.get(0) != null && !selectDate.get(0).isEmpty()) {
- startDate = to080000(selectDate.get(0));
+ startDate = toReportTime(selectDate.get(0), reportTime);
}
if (selectDate.get(1) != null && !selectDate.get(1).isEmpty()) {
- endDate = to080000(selectDate.get(1));
+ endDate = toReportTime(selectDate.get(1), reportTime);
}
}
@@ -604,25 +623,31 @@
public Map<String, Object> selectDamageReportSv(Integer pageNum, Integer pageSize,
List<String> selectDate,
+ String reportTime,
DamageReportDTO damageReportDTO) {
- Integer offset = (pageNum - 1) * pageSize;
- // 榛樿鏃堕棿鑼冨洿锛氳繃鍘� 15 澶�
- String startDate = to080000(LocalDate.now().minusDays(15).toString());
- String endDate = to080000(LocalDate.now().toString());
+ Integer offset = (pageNum - 1) * pageSize;
+
+
+ // 榛樿鏃堕棿鑼冨洿锛氳繃鍘� 15 澶╋紙鏃ユ湡 + reportTime锛�
+ String startDate = toReportTime(LocalDate.now().minusDays(15).toString(), reportTime);
+ String endDate = toReportTime(LocalDate.now().toString(), reportTime);
+
+ // 濡傛灉鍓嶇浼犱簡鏃堕棿锛屽氨鐢ㄥ墠绔棩鏈� + reportTime
if (selectDate != null && selectDate.size() == 2) {
if (selectDate.get(0) != null && !selectDate.get(0).isEmpty()) {
- startDate = to080000(selectDate.get(0));
+ startDate = toReportTime(selectDate.get(0), reportTime);
}
if (selectDate.get(1) != null && !selectDate.get(1).isEmpty()) {
- endDate = to080000(selectDate.get(1));
+ endDate = toReportTime(selectDate.get(1), reportTime);
}
}
- Map<String, Object> result = new HashMap<>();
- String finalEndDate = endDate;
- String finalStartDate = startDate;
- // 寮傛浠诲姟瀹氫箟
+ Map<String, Object> result = new HashMap<>();
+ String finalStartDate = startDate;
+ String finalEndDate = endDate;
+
+ // 寮傛浠诲姟瀹氫箟
CompletableFuture<List<DamageReportDTO>> dataFuture = asyncExecutor.runAsync(() ->
reportMapper.selectDamageReportMp(offset, pageSize, finalStartDate, finalEndDate, damageReportDTO));
@@ -632,7 +657,7 @@
CompletableFuture<Map<String, Float>> footSumFuture = asyncExecutor.runAsync(() ->
reportMapper.damageReportFootSum(finalStartDate, finalEndDate, damageReportDTO));
- //绛夊緟鍏ㄩ儴浠诲姟瀹屾垚
+ // 绛夊緟鍏ㄩ儴浠诲姟瀹屾垚
CompletableFuture.allOf(dataFuture, totalFuture, footSumFuture).join();
try {
@@ -641,8 +666,10 @@
result.put("footSum", footSumFuture.get());
} catch (Exception e) {
e.printStackTrace();
- throw new RuntimeException("骞惰鏌ヨ寮傚父锛�" + e.getMessage(), e);
+ throw new RuntimeException("娆＄牬鎬昏〃骞惰鏌ヨ寮傚父锛�" + e.getMessage(), e);
}
+
+ // 鍥炰紶鍓嶇鐨勬椂闂达紙鐜板湪鏄甫鏃跺垎绉掔殑锛�
List<String> list = new ArrayList<>();
list.add(startDate);
list.add(endDate);
@@ -650,6 +677,7 @@
return result;
}
+
public Map<String, Object> splittingDetailsOutsideSv(String orderId, Report report) {
Map<String, Object> map = new HashMap<>();
@@ -975,14 +1003,14 @@
}
String inputVal= (String) dates.get("inputVal");
String project= (String) dates.get("project");
- String terminationVals= (String) dates.get("terminationVals");
- if ("null".equals(inputVal)) {
+ String terminationVals= dates.get("terminationVals").toString();;
+ if (inputVal==null) {
inputVal = "";
}
- if ("null".equals(project)) {
+ if (project==null) {
project = "";
}
- if ("null".equals(terminationVals)) {
+ if (terminationVals==null) {
terminationVals = "";
}
List<WorkInProgressDTO> dataList1 =reportMapper.exportWorkInProgressMp(process,inputVal,project,terminationVals);
@@ -1246,14 +1274,14 @@
}
String inputVal= (String) dates.get("inputVal");
String project= (String) dates.get("project");
- String terminationVals= (String) dates.get("terminationVals");
- if ("null".equals(inputVal)) {
+ String terminationVals= dates.get("terminationVals").toString();;
+ if (inputVal==null) {
inputVal = "";
}
- if ("null".equals(project)) {
+ if (project==null) {
project = "";
}
- if ("null".equals(terminationVals)) {
+ if (terminationVals==null) {
terminationVals = "";
}
@@ -1445,11 +1473,10 @@
dataList.get(i).put("reportWorkQuantityShow",JSON.toJSONString(dataShow));
}
-
+ Order order = orderMapper.selectOrderId(orderId);
map.put("mergeCells", rowCount);
-
map.put("data",dataList);
-
+ map.put("order",order);
return map;
}
--
Gitblit v1.8.0