From abfb2e93502962611e6e53def46eaea7ee285acc Mon Sep 17 00:00:00 2001
From: pangyang <475446853@qq.com>
Date: Fri, 27 Mar 2026 19:51:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A7=BD=E6=B6=B2=E6=8A=A5=E5=91=8A=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LiquidTankTaskCopyController.java         | 56 ++++++++++++++++---
 1 file changed, 49 insertions(+), 7 deletions(-)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java
index 0590404b..634d8b56 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java
@@ -170,23 +170,65 @@ public class LiquidTankTaskCopyController extends BladeController {
                     log.warn("key = {}, value = {}, type = {}", key, value, value.getClass());
                 }
         );
+        Date crStart = null;
+        Date crEnd = null;
+        if(!"".equals(map.get(BaseRequest.CREATE_TIME_START))){
+            crStart = RequestUtil.buildDateBeginOfDay(map, BaseRequest.CREATE_TIME_START);
+            crEnd = RequestUtil.buildDateEndOfDay(map, BaseRequest.CREATE_TIME_END);
+            map.put(BaseRequest.CREATE_TIME_START, null);
+            map.put(BaseRequest.CREATE_TIME_END, null);
+        }
 
+        String workTankId = "";
 
-        Date crStart = RequestUtil.buildDateBeginOfDay(map, BaseRequest.CREATE_TIME_START);
-        Date crEnd = RequestUtil.buildDateEndOfDay(map, BaseRequest.CREATE_TIME_END);
-        map.put(BaseRequest.CREATE_TIME_START, null);
-        map.put(BaseRequest.CREATE_TIME_END, null);
+        if("".equals(map.get("workTankId"))){
+            workTankId = "";
+        }else{
+            workTankId = Func.toStr(map.get("workTankId"));
+        }
+        map.put("workTankId", null);
+
+        String testElement = "";
 
+        if("".equals(map.get("testElement"))){
+            testElement = "";
+        }else{
+            testElement = Func.toStr(map.get("testElement"));
+        }
+        map.put("testElement", null);
+
+        Long workCenterId = null;
+
+        if("".equals(map.get("workCenterId"))){
+            workCenterId = null;
+        }else{
+            workCenterId = Func.toLong(map.get("workCenterId"));
+        }
+        map.put("workCenterId", null);
 
         QueryWrapper<LiquidTankTask> qw = Condition.getQueryWrapper(map, LiquidTankTask.class);
         // 正常结束的，异常结束的
         qw.in(BaseCol.STATUS, asList(LiquidTankTaskConst.S_FINISH_FAILED, LiquidTankTaskConst.S_FINISH_OK));
         // [作业中心]id
-        qw.eq(map.containsKey(LiquidTankTaskCopy.COL_WORK_CENTER_ID), LiquidTankTaskCopy.COL_WORK_CENTER_ID, Func.toLong(map.get("workCenterId")));
+//        qw.eq(map.containsKey(LiquidTankTaskCopy.COL_WORK_CENTER_ID), LiquidTankTaskCopy.COL_WORK_CENTER_ID, Func.toLong(map.get("workCenterId")));
         // [作业槽]id
-        qw.eq(map.containsKey(LiquidTankTaskCopy.COL_WORK_TANK_ID), LiquidTankTaskCopy.COL_WORK_TANK_ID, Func.toLong(map.get("workTankId")));
+
+        if(null != workCenterId){
+            qw.eq(LiquidTankTaskCopy.COL_WORK_CENTER_ID, Func.toLong(workCenterId));
+        }
+
+
+        if(!"".equals(workTankId)){
+            qw.eq(LiquidTankTaskCopy.COL_WORK_TANK_ID, Func.toLong(workTankId));
+        }
+
+        if(!"".equals(testElement)){
+            qw.like(LiquidTankTaskCopy.COL_TEST_ELEMENT, testElement);
+        }
+
+//        qw.eq(map.containsKey(LiquidTankTaskCopy.COL_WORK_TANK_ID), LiquidTankTaskCopy.COL_WORK_TANK_ID, Func.toLong(map.get("workTankId")));
         // 待测成分/分析项目
-        qw.like(map.containsKey(LiquidTankTaskCopy.COL_TEST_ELEMENT), LiquidTankTaskCopy.COL_TEST_ELEMENT, Func.toStr(map.get("testElement")));
+//        qw.like(map.containsKey("testElement"), LiquidTankTaskCopy.COL_TEST_ELEMENT, Func.toStr(map.get("testElement")));
         // 范围日期
         if (null != crStart && null != crEnd) {
 //            Date crStart = RequestUtil.buildDateBeginOfDay(map, BaseRequest.CREATE_TIME_START);