Merge remote-tracking branch 'origin/test' into test

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java

@@ -678,6 +678,28 @@ public class DdlPreparedPack {
     }
 
     /**
+     * 为空查询
+     *
+     * @param columnName
+     * @param packBean
+     */
+    public static void getIsNull(String columnName, DdlPackBean packBean) {
+        packBean.addColumnQuery(columnName, " and (model." + columnName + " is null or model." + columnName + " = '')", null);
+
+    }
+
+    /**
+     * 不为空查询
+     *
+     * @param columnName
+     * @param packBean
+     */
+    public static void getIsNotNull(String columnName, DdlPackBean packBean) {
+        packBean.addColumnQuery(columnName, " and (model." + columnName + " is not null and model." + columnName + " != '')", null);
+
+    }
+
+    /**
      * 转换排序列
      *
      * @param columnName 列名

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java

@@ -14,7 +14,6 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
-import java.util.List;
 
 /**
  * @Description :检测结果汇总表
@@ -85,7 +84,4 @@ public class WmsTestResultSummary extends BaseBean {
     @ApiParam("BH类型")
     private Integer bhType;
 
-    @Transient
-    @ApiParam("BH号")
-    private List<String> bhCodeLts;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -17,7 +17,6 @@ import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper;
 import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.base.Strings;
-import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
@@ -3182,16 +3181,8 @@ public class WmsHqlPack {
         if (wmsTestResultSummary.getIsQualified() != null) {
             DdlPreparedPack.getNumEqualPack(wmsTestResultSummary.getIsQualified(), "isQualified", result);
         }
-        List<String> qmsBH = wmsTestResultSummary.getBhCodeLts();
-        if (CollectionUtils.isEmpty(qmsBH)) {
-            qmsBH = new ArrayList<>();
-        }
-        if (!StringUtils.isNotBlank(wmsTestResultSummary.getBhCode())) {
-            qmsBH.add(wmsTestResultSummary.getBhCode());
-        }
-        if (CollectionUtils.isNotEmpty(qmsBH)) {
-            DdlPreparedPack.getInPackList(qmsBH, "bhCode", result);
-        }
+
+        DdlPreparedPack.getStringEqualPack(wmsTestResultSummary.getBhCode(), "bhCode", result);
         DdlPreparedPack.getNumEqualPack(wmsTestResultSummary.getPickStatus(), "pickStatus", result);
         if (StringUtils.isNotBlank(wmsTestResultSummary.getCreateDateTimeStart())) {
             DdlPreparedPack.timeBuilder(wmsTestResultSummary.getCreateDateTimeStart(),