From a93d59d255da1d3d410c2706e44b3069af8503e9 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 20 十月 2025 16:12:39 +0800
Subject: [PATCH] 将报表中查询‘全部’工序的中文替换成对应语言，并需改对应传入的参数
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 d54e28d..38731d4 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
@@ -336,7 +336,7 @@
if ("null".equals(optionVal)) {
optionVal = ("");
}
- if (selectProcesses.equals("鍏ㄩ儴")){
+ if (selectProcesses.equals("all")){
selectProcesses="";
}
String laminating = reportMapper.getLaminating(selectProcesses);
@@ -618,7 +618,7 @@
public List exportWorkInProgressSv(Map<String, Object> dates) {
String process= (String) dates.get("processes");
- if (process.equals("鍏ㄩ儴")){
+ if (process.equals("all")){
process="";
}
String inputVal= (String) dates.get("inputVal");
@@ -655,7 +655,7 @@
}
public Map<String, Object> teamOutputSv(Integer pageNum, Integer pageSize, String selectTime1, String selectTime2, String selectProcesses, TeamOutputDTO teamOutputDTO) {
- if (selectProcesses.equals("鍏ㄩ儴")){
+ if (selectProcesses.equals("all")){
selectProcesses="";
}
Integer offset = (pageNum - 1) * pageSize;
@@ -687,7 +687,7 @@
public List exportTeamOutputSv(Map<String, Object> dates) {
List<LocalDate> date= (List<LocalDate>) dates.get("date");
String process= (String) dates.get("processes");
- if (process.equals("鍏ㄩ儴")){
+ if (process.equals("all")){
process="";
}
String laminating = reportMapper.getLaminating(process);
@@ -728,7 +728,7 @@
if ("null".equals(optionVal)) {
optionVal = "";
}
- if ("鍏ㄩ儴".equals(selectProcesses)) {
+ if ("all".equals(selectProcesses)) {
selectProcesses = "";
}
@@ -806,7 +806,7 @@
public List exportWorkInProgressCombinationSv(Map<String, Object> dates) {
String process= (String) dates.get("processes");
- if (process.equals("鍏ㄩ儴")){
+ if (process.equals("all")){
process="";
}
String inputVal= (String) dates.get("inputVal");
--
Gitblit v1.8.0