add:增加手持出库

nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/QueryTEnum.java

@@ -3,34 +3,80 @@ package org.nl.common.enums;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.Getter;
 import org.apache.commons.lang3.StringUtils;
-import org.nl.common.domain.query.LConsumer;
+import org.apache.poi.ss.formula.functions.T;
+import org.nl.common.domain.interfaces.LConsumer;
 
 import java.util.Collection;
 
 /**
  * s
+ *
  * @author ZZQ
  * @Date 2022/12/14 8:26 下午
  */
 @Getter
 public enum QueryTEnum {
     //
-    EQ((q, k, v) -> { q.eq(k[0],v); }),
-    IN((q, key, o) -> { if (o instanceof Collection){ q.in(key[0],(Collection) o); } }),
-    LK((q, keys, o) -> { for (String key : keys) { q.like(key,o); } }),
-    LE((q, k, v) -> { q.le(k[0],v); }),
-    BY((q, k, v) -> { q.orderByDesc(k[0],v); }),
-    NO((q, k, v) -> { q.isNull(k[0]); }),
-    LT((q, k, v) -> { q.lt(k[0],v); }),
-    OREQ((q, k, v) -> { if (StringUtils.isBlank((String)v)){ q.isNull(k[0]); }else { q.eq(k[0],v); } });
+    EQ((q, k, v) -> {
+        q.eq(k[0], v);
+    }),
+    IN((q, key, o) -> {
+        if (o instanceof Collection) {
+            q.in(key[0], (Collection) o);
+        }
+    }),
+    LK((q, keys, o) -> {
+        for (String key : keys) {
+            q.like(key, o);
+        }
+    }),
+    ORLK((q, k, o) -> {
+        q.and(query -> {
+            QueryWrapper queryWrapper = (QueryWrapper) query;
+            for (int i = 0; i < k.length; i++) {
+                queryWrapper.like(k[i], o);
+                if (i != (k.length - 1)) {
+                    queryWrapper.or();
+                }
+            }
+        });
+    }),
+    LE((q, k, v) -> {
+        q.le(k[0], v);
+    }),
+    GE((q, k, v) -> {
+        q.ge(k[0], v);
+    }),
+    BY((q, k, v) -> {
+        q.orderByDesc(k[0], String.valueOf(v));
+    }),
+    NO((q, k, v) -> {
+        q.isNull(k[0]);
+    }),
+    NULL_OR_EMPTY((queryWrapper, k, v) -> {
+        queryWrapper.nested(a -> a.isNull(k[0]).or().eq(k[0], ""));
+    }),
+    LT((q, k, v) -> {
+        q.lt(k[0], v);
+    }),
+    GT((q, k, v) -> {
+        q.gt(k[0], v);
+    }),
+    OREQ((q, k, v) -> {
+        if (StringUtils.isBlank((String) v)) {
+            q.isNull(k[0]);
+        } else {
+            q.eq(k[0], v);
+        }
+    });
 
-    private LConsumer<QueryWrapper,String[], Object> doP;
+    private org.nl.common.domain.interfaces.LConsumer<QueryWrapper<T>, String[], Object> doP;
 
-    QueryTEnum(LConsumer<QueryWrapper,String[], Object> doP) {
+    QueryTEnum(LConsumer<QueryWrapper<T>, String[], Object> doP) {
         this.doP = doP;
     }
 
-    public static void build(QueryTEnum type, QueryWrapper q, String[] k , Object v){
-        type.getDoP().accept(q,k,v);
+    public static void build(QueryTEnum type, QueryWrapper q, String[] k, Object v) {
+        type.getDoP().accept(q, k, v);
     }
-}
+}