优化：添加设备详情方法

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/IdxBizJqEquipmentRegisterController.java

@@ -66,8 +66,8 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
 
     /**
      * 查询设备注册信息详情
-     * @param sequenceNbr
-     * @return
+     * @param record
+     * @return 返回由页签的key包裹详情对象
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping (value = "/{record}")
@@ -76,6 +76,19 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
         return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.getEquipmentRegisterByRecord(record));
     }
 
+
+    /**
+     * 查询设备注册信息详情
+     * @param record
+     * @return 只返回详情对象
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping (value = "/detail")
+    @ApiOperation(httpMethod = "GET", value = "根据record查询设备注册信息详情", notes = "根据record查询设备注册信息详情")
+    public ResponseModel<Map<String, Object>> getDetail(@RequestParam String record) {
+        return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.getDetailByRecord(record));
+    }
+
     /**
      * 查询设备注册列表
      * @param map

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

@@ -24,4 +24,6 @@ public interface IIdxBizJgRegisterInfoService {
     Map<String, Map<String, Object>> getEquipmentRegisterByRecord(String record);
 
     Page<JSONObject> queryForEquipmentRegisterPage(JSONObject jsonObject);
+
+    Map<String, Object> getDetailByRecord(String record);
 }

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

@@ -397,6 +397,12 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         return resultMap;
     }
 
+    @Override
+    public Map<String, Object> getDetailByRecord(String record) {
+        return null;
+    }
+
+
     /**
      * 设备注册信息分页查询
      *
@@ -475,13 +481,13 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             boolMust.must(azBuilder);
         }
         //查询 维保备案【可绑定设备列表】【(EQU_STATE=== null） && (INSPECT_REPORT！==""  && !null)】
-        if (!ObjectUtils.isEmpty(queryType) && ValidationUtil.equals(queryType, "WB")) {
-            BoolQueryBuilder wbBuilder = QueryBuilders.boolQuery();
-            wbBuilder.mustNot(QueryBuilders.existsQuery("EQU_STATE"));
-            wbBuilder.must(QueryBuilders.existsQuery("INSPECT_REPORT"));
-            wbBuilder.mustNot(QueryBuilders.matchPhraseQuery("INSPECT_REPORT", ""));
-            boolMust.must(wbBuilder);
-        }
+        // if (!ObjectUtils.isEmpty(queryType) && ValidationUtil.equals(queryType, "WB")) {
+        //     BoolQueryBuilder wbBuilder = QueryBuilders.boolQuery();
+        //     wbBuilder.mustNot(QueryBuilders.existsQuery("EQU_STATE"));
+        //     wbBuilder.must(QueryBuilders.existsQuery("INSPECT_REPORT"));
+        //     wbBuilder.mustNot(QueryBuilders.matchPhraseQuery("INSPECT_REPORT", ""));
+        //     boolMust.must(wbBuilder);
+        // }
         //查询 使用登记【可选设备列表】【EQU_STATUS=== null && (INSPECT_REPORT！=="" && !null) && (USE_ORG_CODE!=="" && !null)】
         if (!ObjectUtils.isEmpty(queryType) && ValidationUtil.equals(queryType, "SY")) {
             BoolQueryBuilder syBuilder = QueryBuilders.boolQuery();
@@ -494,6 +500,16 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         }
 
         //通用匹配规则，其他条件构建
+        if(!ObjectUtils.isEmpty(map.getString("SEQUENCE_NBR"))){
+            BoolQueryBuilder seqBuilder = QueryBuilders.boolQuery();
+            String param = map.getString("SEQUENCE_NBR");
+            String[] split = param.split(",");
+            for (String seq : split) {
+                seqBuilder.should(QueryBuilders.termQuery("SEQUENCE_NBR", seq));
+            }
+            seqBuilder.minimumShouldMatch(1);
+            boolMust.must(seqBuilder);
+        }
         if (!ObjectUtils.isEmpty(map.getString("EQU_CATEGORY"))) {
             BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
             String param = QueryParser.escape(map.getString("EQU_CATEGORY"));
@@ -586,7 +602,6 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         return result;
     }
 
-
     /**
      * 获取当前登录人单位类型
      *