fix(装备申请，配发模块，阅知模块): 修改阅知

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

@@ -690,8 +690,9 @@ public class AllotBillController {
         ids.addAll(userDao.findAllByUnitsId(userPublicService.findUnitIdByName(allotBill.getSendUnit())).stream()
                 .map(User::getUserId)
                 .collect(Collectors.toList()));
+        String content = "发起配发业务已办结";
         MessageBto messageBto = new MessageBto(taskBto.getId(), taskBto.getBusinessType(),
-                allotBill.getReceiveUnit()+"单位的配发业务已办结，", ids, 1);
+                content, ids, 1);
         messageService.add(messageBto);
         return ResponseEntity.ok("上传成功");
     }
@@ -770,7 +771,8 @@ public class AllotBillController {
         userIds.addAll(userDao.findAllByUnitsId(userPublicService.findUnitIdByName(allotBill.getReceiveUnit())).stream()
                 .map(User::getUserId)
                 .collect(Collectors.toList()));
-        String content = allotBill.getReceiveUnit()+"单位的配发业务已办结";
+//        String content = allotBill.getReceiveUnit()+"单位的配发业务已办结";
+        String content = "发起配发业务已办结";
 //        MessageBto messageBto = new MessageBto(taskBto.getParentTaskId(), taskBto.getBusinessType(), "业务办结", userIds, 1);
         MessageBto messageBto = new MessageBto(taskBto.getParentTaskId(), taskBto.getBusinessType(), content, userIds, 1);
         messageService.add(messageBto);

dev-apply/src/main/java/com/tykj/dev/device/apply/controller/DeviceApplyController.java

@@ -710,7 +710,7 @@ public class DeviceApplyController {
         deviceApplyBillService.update(deviceApplyBill);
         //发送阅知信息
         MessageBto messageBto = new MessageBto();
-        messageBto.setContent("申请任务已办结");
+        messageBto.setContent("发起的申请任务已办结");
         messageBto.setTaskId(taskBto.getId());
         messageBto.setIsHighLight(0);
         messageBto.setInvolveUserIdList(userPublicService.findOtherUser(userUtils.getCurrentUserId()));

dev-matching/src/main/java/com/tykj/dev/device/matching/controller/MatchingDeviceController.java

@@ -235,7 +235,7 @@ public class MatchingDeviceController {
         matchingDeviceBillService.update(updateMatchingDeviceBill);
         //发送阅知信息
         List<Integer> ids = userPublicService.findOtherUser(userId);
-        MessageBto messageBto = new MessageBto(taskBto1.getId(),taskBto1.getBusinessType(),"配套设备入库完成",ids,1);
+        MessageBto messageBto = new MessageBto(taskBto1.getId(),taskBto1.getBusinessType(),"发起配套设备入库",ids,1);
         messageService.add(messageBto);
         myWebSocket.sendMessage1();
         return ResponseEntity.ok("ok");