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

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java

@@ -1271,7 +1271,20 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             pBuilder.must(QueryBuilders.termQuery("WHETHER_VEHICLE_CYLINDER",test));
             boolMust.must(pBuilder);
         }
-
+        // 设备代码模糊查询
+        if (!ObjectUtils.isEmpty(map.getString("EQU_CODE"))) {
+            BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
+            String test = QueryParser.escape(map.getString("EQU_CODE"));
+            pBuilder.must(QueryBuilders.wildcardQuery("EQU_CODE", "*" + test.toLowerCase() + "*"));
+            boolMust.must(meBuilder);
+        }
+        // 单位内部编号模糊查询
+        if (!ObjectUtils.isEmpty(map.getString("USE_INNER_CODE"))) {
+            BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
+            String test = QueryParser.escape(map.getString("USE_INNER_CODE"));
+            pBuilder.must(QueryBuilders.wildcardQuery("USE_INNER_CODE", "*" + test.toLowerCase() + "*"));
+            boolMust.must(meBuilder);
+        }
 
         builder.query(boolMust);
         builder.sort("REC_DATE", SortOrder.DESC);