[退役 配套] 修改查询接口 添加%……

dev-matching/src/main/java/com/tykj/dev/device/matching/service/impl/MatchingDeviceLibraryServiceImpl.java

@@ -102,7 +102,7 @@ public class MatchingDeviceLibraryServiceImpl implements MatchingDeviceLibrarySe
         if (selectAreaId == null) {
             //如果areaId和unitId都传Null,返回当前单位的配套设备
             if (selectUnitId == null) {
-                predicateBuilder.eq("createUnit", userUtils.getCurrentUserUnitName());
+//                predicateBuilder.eq("createUnit", userUtils.getCurrentUserUnitName());
                 return matchingDeviceLibraryDao.findAll(predicateBuilder.build(), matchingDeviceSelectVo.getPageable());
             }
             //如果areaId为Null,unitId不为null,返回对应单位的配套设备
@@ -181,6 +181,20 @@ public class MatchingDeviceLibraryServiceImpl implements MatchingDeviceLibrarySe
             }
             predicateBuilder.predicate(p.build());
         }
+        if (matchingDeviceSelectVo.getModelDim()!=null){
+            predicateBuilder.like("model","%" +matchingDeviceSelectVo.getModelDim()+"%");
+        }
+        if (matchingDeviceSelectVo.getNameDim()!=null){
+            predicateBuilder.like("name","%" +matchingDeviceSelectVo.getNameDim()+"%");
+
+        }
+        if (matchingDeviceSelectVo.getSeqDim()!=null){
+            predicateBuilder.like("seqNumber","%" +matchingDeviceSelectVo.getSeqDim()+"%");
+
+        }
+        if (matchingDeviceSelectVo.getTypeDim()!=null){
+            predicateBuilder.like("type","%" +matchingDeviceSelectVo.getTypeDim()+"%");
+        }
         return predicateBuilder;
     }
 }

dev-matching/src/main/java/com/tykj/dev/device/matching/subject/vo/MatchingDeviceSelectVo.java

@@ -29,4 +29,12 @@ public class MatchingDeviceSelectVo extends CustomPage {
 
     @ApiModelProperty(value = "区域id")
     private Integer areaId;
+
+    private String typeDim;
+
+    private String modelDim;
+
+    private String nameDim;
+
+    private String seqDim;
 }

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/RepelQueryServiceImpl.java

@@ -632,13 +632,13 @@ public class RepelQueryServiceImpl implements RepelQueryService {
                 predicateBuilder.lt("updateTime",new Date(repelManagementVo.getEndTime()));
             }
             if (repelManagementVo.getModelDim()!=null){
-                predicateBuilder.like("model",repelManagementVo.getModelDim());
+                predicateBuilder.like("model","%"+repelManagementVo.getModelDim()+"%");
             }
             if (repelManagementVo.getNameDim()!=null){
-                predicateBuilder.like("name",repelManagementVo.getNameDim());
+                predicateBuilder.like("name","%"+repelManagementVo.getNameDim()+"%");
             }
             if (repelManagementVo.getSeqDim()!=null){
-                predicateBuilder.like("seqNumber",repelManagementVo.getSeqDim());
+                predicateBuilder.like("seqNumber","%"+repelManagementVo.getSeqDim()+"%");
             }
             if (repelManagementVo.getContent() != null) {
                 Class<DeviceLibrary> deviceLibraryEntity = DeviceLibrary.class;