fix(装备模块): 修复了bug

dev-library/src/main/java/com/tykj/dev/device/library/service/impl/DeviceLibraryServiceImpl.java

@@ -1293,7 +1293,8 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
         PredicateBuilder<DeviceLibrary> predicateBuilder = getPredicateBuilder(deviceLibrarySelectVo);
         Specification<DeviceLibrary> or = null;
         if (deviceLibrarySelectVo.getNonStorageLocationId()!=null){
-          or = predicateBuilder.build().or(getPredicateBuilder2(deviceLibrarySelectVo.getNonStorageLocationId()).build());
+
+          or = predicateBuilder.build().or(getPredicateBuilder2(deviceLibrarySelectVo).build());
         }else {
             or = predicateBuilder.build();
         }
@@ -1532,11 +1533,8 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
             predicateBuilder.eq(deviceLibrarySelectVo.getStorageLocationId() != null,"storageLocationId",deviceLibrarySelectVo.getStorageLocationId());
             //新增装备的形态
             predicateBuilder.eq(deviceLibrarySelectVo.getType() != null,"type",deviceLibrarySelectVo.getType());
-            //新增库房集合查询
-//            if (deviceLibrarySelectVo.getStorageLocationIds() != null){
-//                predicateBuilder.notIn("storageLocationId",
-//                        deviceLibrarySelectVo.getStorageLocationIds().toArray(new Integer[]{}));
-//            }
+            predicateBuilder.eq(deviceLibrarySelectVo.getSeqNumber() != null,"seqNumber",deviceLibrarySelectVo.getSeqNumber());
+
             predicateBuilder.ne(deviceLibrarySelectVo.getNonStorageLocationId() != null,"storageLocationId",deviceLibrarySelectVo.getNonStorageLocationId());
         }
         return predicateBuilder;
@@ -1544,12 +1542,93 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
 
     /**
      * 查询库房id为null 取反
-     * @param nonStorageLocationId 库房id
+     * @param deviceLibrarySelectVo deviceLibrarySelectVo
      * @return PredicateBuilder
      */
-    private PredicateBuilder<DeviceLibrary> getPredicateBuilder2(Integer nonStorageLocationId) {
+    private PredicateBuilder<DeviceLibrary> getPredicateBuilder2(DeviceLibrarySelectVo deviceLibrarySelectVo) {
         PredicateBuilder<DeviceLibrary> predicateBuilder = Specifications.and();
-        predicateBuilder.eq(nonStorageLocationId != null, "storageLocationId",null);
+        if (deviceLibrarySelectVo != null) {
+            List<Integer> lifeStatus = deviceLibrarySelectVo.getLifeStatus();
+            if (deviceLibrarySelectVo.getModel() != null) {
+                predicateBuilder.eq("model", deviceLibrarySelectVo.getModel());
+            }
+            if (deviceLibrarySelectVo.getName() != null) {
+                predicateBuilder.eq("name", deviceLibrarySelectVo.getName());
+            }
+            if (deviceLibrarySelectVo.getSecretLevel() != null) {
+                predicateBuilder.eq("secretLevel", deviceLibrarySelectVo.getSecretLevel());
+            }
+            if (deviceLibrarySelectVo.getMatchingRange() != null) {
+                predicateBuilder.eq("matchingRange", deviceLibrarySelectVo.getMatchingRange());
+            }
+            if (deviceLibrarySelectVo.getStorageType() != null) {
+                predicateBuilder.eq("storageType", deviceLibrarySelectVo.getStorageType());
+            }
+            if (deviceLibrarySelectVo.getManageStatus() != null) {
+                predicateBuilder.eq("manageStatus", deviceLibrarySelectVo.getManageStatus());
+            }
+            if (lifeStatus != null && lifeStatus.size()>0) {
+                predicateBuilder.in("lifeStatus", lifeStatus.toArray(new Integer[]{}));
+            }
+            if (deviceLibrarySelectVo.getType() != null) {
+                predicateBuilder.eq("type", deviceLibrarySelectVo.getType());
+            }
+            if (deviceLibrarySelectVo.getInvisibleRange() != null) {
+                predicateBuilder.eq("invisibleRange", deviceLibrarySelectVo.getInvisibleRange());
+            }
+            if (deviceLibrarySelectVo.getLocationUnit() != null) {
+                predicateBuilder.eq("locationUnit", deviceLibrarySelectVo.getLocationUnit());
+            }
+            if (deviceLibrarySelectVo.getOwnUnit() != null) {
+                predicateBuilder.eq("ownUnit", deviceLibrarySelectVo.getOwnUnit());
+            }
+            if (deviceLibrarySelectVo.getRfidCardId() != null) {
+                predicateBuilder.like("rfidCardId", deviceLibrarySelectVo.getRfidCardId());
+            }
+            if (deviceLibrarySelectVo.getPackingId() != null) {
+                predicateBuilder.eq("packingId", deviceLibrarySelectVo.getPackingId());
+            }
+            if (deviceLibrarySelectVo.getIsPart() != null) {
+                predicateBuilder.eq("isPart", deviceLibrarySelectVo.getIsPart());
+            }
+            if (deviceLibrarySelectVo.getIsPrint()!=null){
+                if (deviceLibrarySelectVo.getIsPrint()==1){
+                    predicateBuilder.notIn("rfidCardId", "");
+                }
+                else if (deviceLibrarySelectVo.getIsPrint()==0){
+                    predicateBuilder.in("rfidCardId", null,"");
+                }
+            }
+            if (deviceLibrarySelectVo.getContent() != null) {
+                Class<DeviceLibrary> deviceLibraryEntity = DeviceLibrary.class;
+                Field[] declaredFields = deviceLibraryEntity.getDeclaredFields();
+                PredicateBuilder<DeviceLibrary> p = Specifications.or();
+                for (Field field : declaredFields) {
+                    if (field.getType().equals(String.class) && field.getAnnotation(Transient.class) == null) {
+                        p.like(field.getName(), "%" + deviceLibrarySelectVo.getContent() + "%");
+                    }
+                }
+                predicateBuilder.predicate(p.build());
+            }
+            if (deviceLibrarySelectVo.getStartTime() != null) {
+                predicateBuilder.gt("createTime", deviceLibrarySelectVo.getStartTime());
+            }
+            if (deviceLibrarySelectVo.getEndTime() != null) {
+                predicateBuilder.lt("updateTime", deviceLibrarySelectVo.getEndTime());
+            }
+            if (deviceLibrarySelectVo.getSeqInterval()!=null&&DeviceSeqUtil.selectDeviceSeqs(deviceLibrarySelectVo.getSeqInterval()).size()>0){
+                predicateBuilder.in("seqNumber", DeviceSeqUtil.selectDeviceSeqs(deviceLibrarySelectVo.getSeqInterval()));
+            }
+            predicateBuilder.like(deviceLibrarySelectVo.getRfidCardId() != null,"rfidCardId",
+                    "%"+deviceLibrarySelectVo.getRfidCardId()+"%");
+            //新增库房位置
+            predicateBuilder.eq(deviceLibrarySelectVo.getStorageLocationId() != null,"storageLocationId",deviceLibrarySelectVo.getStorageLocationId());
+            predicateBuilder.eq(deviceLibrarySelectVo.getSeqNumber() != null,"seqNumber",deviceLibrarySelectVo.getSeqNumber());
+
+            //新增装备的形态
+            predicateBuilder.eq(deviceLibrarySelectVo.getType() != null,"type",deviceLibrarySelectVo.getType());
+            predicateBuilder.eq(deviceLibrarySelectVo.getNonStorageLocationId() != null, "storageLocationId",null);
+        }
         return predicateBuilder;
     }
 

dev-library/src/main/java/com/tykj/dev/device/library/subject/vo/DeviceLibrarySelectVo.java

@@ -143,4 +143,7 @@ public class DeviceLibrarySelectVo extends CustomPage {
 
     @ApiModelProperty(value = "库房id")
     private Integer nonStorageLocationId;
+
+    @ApiModelProperty(value = "装备序列号", example = "123-1")
+    public String seqNumber;
 }