feat(jg):新增设备查询条件

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/CommonServiceImpl.java

@@ -614,6 +614,9 @@ public class CommonServiceImpl implements ICommonService {
             case "inspection":
                 type = "检验检测机构";
                 break;
+            case "manufacture":
+                type = "制造单位";
+                break;
             case "all":
                 type = "all";
                 break;

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

@@ -1320,6 +1320,20 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             pBuilder.must(QueryBuilders.wildcardQuery("USE_INNER_CODE", "*" + test.toLowerCase() + "*"));
             boolMust.must(pBuilder);
         }
+        // 出厂编号/产品编码模糊查询
+        if (!ObjectUtils.isEmpty(map.getString("FACTORY_NUM"))) {
+            BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
+            String test = QueryParser.escape(map.getString("FACTORY_NUM"));
+            pBuilder.must(QueryBuilders.wildcardQuery("FACTORY_NUM", "*" + test.toLowerCase() + "*"));
+            boolMust.must(pBuilder);
+        }
+        // 制造单位（生产单位）名称模糊查询
+        if (!ObjectUtils.isEmpty(map.getString("PRODUCE_UNIT_NAME"))) {
+            BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
+            String test = QueryParser.escape(map.getString("PRODUCE_UNIT_NAME"));
+            pBuilder.must(QueryBuilders.wildcardQuery("PRODUCE_UNIT_NAME", "*" + test.toLowerCase() + "*"));
+            boolMust.must(pBuilder);
+        }
         System.err.println(boolMust);
         builder.query(boolMust);
         builder.sort("REC_DATE", SortOrder.DESC);