槽液报告查询修改

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);