1.登记证下的设备增加筛选条件已认领且已纳管

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

@@ -19,6 +19,7 @@ import com.yeejoin.amos.boot.module.ymt.api.common.StringUtil;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgMaintenanceRecordInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
+import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentCategoryEnum;
 import org.apache.commons.io.IOUtils;
 import org.apache.lucene.queryparser.classic.QueryParser;
 import org.elasticsearch.action.search.SearchRequest;
@@ -393,9 +394,15 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
         SearchSourceBuilder builder = new SearchSourceBuilder();
         builder.trackTotalHits(true);
 
+
         BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();
+        // 且登记证筛选
         TermsQueryBuilder termsQuery = QueryBuilders.termsQuery("USE_ORG_CODE", useOrgCodes);
         boolQuery.must(termsQuery);
+        // 且已认领状态
+        boolQuery.must(QueryBuilders.termQuery("STATUS", EquipmentCategoryEnum.YRL.getName()));
+        // 且已纳管状态
+        boolQuery.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true));
 
         // 设备状态 对应枚举EquimentEnum
         if (!ObjectUtils.isEmpty(enableType)) {