feat(配发模块，标签管理): 修改了配发撤回的阅知，标签管理中根据表面号查询

dev-allot/src/main/java/com/tykj/dev/device/allot/controller/AllotBillController.java

@@ -984,9 +984,11 @@ public class AllotBillController {
             allotBillService.delete(allotBill.getId());
 
         }
-
-        messageBto1.setContent("撤回对" + allotBill.getReceiveUnit()+"的型号为"+deviceLibraryList.stream().map(DeviceLibrary::getModel)
-                .collect(Collectors.toList())+"的任务");
+//        配发撤回：操作人 撤回 配发：【发送单位】至【发往单位】【型号数量】
+//        例：市A 撤回 配发：【杭州市机要局】至【萧山机要局】【型号：A001，A002共3件】
+        messageBto1.setContent(MessageFormatUtil.spellTwoWicket(allotBill.getSendUnit(),allotBill.getReceiveUnit())+
+                MessageFormatUtil.spellModelSetAndCount(deviceLibraryList.stream().map(DeviceLibrary::getModel)
+                        .collect(Collectors.toSet()),allotBill.getAllotCount()));
         MessageBto messageBto = new MessageBto(-1, taskBto.getBusinessType(), messageBto1.getContent(), idList, 1);
         BeanUtils.copyProperties(messageBto1,messageBto);
         messageBto.setTaskId(-1);

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

@@ -1401,6 +1401,8 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
             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());
             //新增装备的形态

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

@@ -395,6 +395,8 @@ public class MatchingDeviceLibraryServiceImpl implements MatchingDeviceLibrarySe
                 predicateBuilder.in("rfidCardId", "");
             }
         }
+        predicateBuilder.like(matchingDeviceSelectVo.getRfidCardId() != null,"rfidCardId",
+                "%"+matchingDeviceSelectVo.getRfidCardId()+"%");
         predicateBuilder.eq(matchingDeviceSelectVo.getMatchingDeviceStorageLocationId() != null,
                 "matchingDeviceStorageLocationId",matchingDeviceSelectVo.getMatchingDeviceStorageLocationId());
         return predicateBuilder;

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

@@ -36,6 +36,9 @@ public class MatchingDeviceSelectVo extends CustomPage {
     @ApiModelProperty(value = "存放位置id")
     private Integer matchingDeviceStorageLocationId;
 
+    @ApiModelProperty(value = "rfidCardId")
+    private Integer rfidCardId;
+
     private String typeDim;
 
     private String modelDim;