Skip to content

D
device-back
提交 15377184 authored 作者: zhoushaopan's avatar zhoushaopan
浏览文件
操作

feat(维修模块): 修改维修阅知

修维修改阅知
上级 ae0f90ce
隐藏空白字符变更
内嵌 并排
正在显示 包含 63 行增加 和 29 行删除
dev-repair/src/main/java/com/tykj/dev/device/repair/controller/RepairController.java
浏览文件 @ 15377184
...@@ -278,7 +278,7 @@ public class RepairController { ...@@ -278,7 +278,7 @@ public class RepairController {
List<Integer> userIds = userPublicService.findOtherUser(userUtils.getCurrentUserId()); List<Integer> userIds = userPublicService.findOtherUser(userUtils.getCurrentUserId());
List<String> models = deviceLibraryService.findAllByIds(ids).stream().map(DeviceLibrary::getModel) List<String> models = deviceLibraryService.findAllByIds(ids).stream().map(DeviceLibrary::getModel)
.collect(Collectors.toList()); .collect(Collectors.toList());
MessageBto messageBto = new MessageBto(0, 5, "添加维修装备:型号为"+models, userIds, 1); MessageBto messageBto = new MessageBto(0, 5, "添加维修业务:型号为"+models, userIds, 1);
//阅知记录存放detailIds //阅知记录存放detailIds
messageBto.setRecord(StringSplitUtil.idListToString(detailIds)); messageBto.setRecord(StringSplitUtil.idListToString(detailIds));
messageService.add(messageBto); messageService.add(messageBto);
...@@ -585,8 +585,10 @@ public class RepairController { ...@@ -585,8 +585,10 @@ public class RepairController {
MessageBto messageBto = new MessageBto(saveEntity.getId(), saveEntity.getBusinessType(), "被选为签发人", idList1, 1); MessageBto messageBto = new MessageBto(saveEntity.getId(), saveEntity.getBusinessType(), "被选为签发人", idList1, 1);
messageService.add(messageBto); messageService.add(messageBto);
} }
String content = "待领取送修装备,型号为"+deviceLibraryService.findAllByIds(idList) // String content = "待领取送修装备,型号为"+deviceLibraryService.findAllByIds(idList)
.stream().map(DeviceLibrary::getModel).collect(Collectors.toList()); // .stream().map(DeviceLibrary::getModel).collect(Collectors.toList());
String content = "发起维修业务"+MessageFormatUtil.spellTwoWicket(repairBill2.getSendUnit(),
repairBill2.getReceiveUnit());
// MessageBto messageBto = new MessageBto(saveEntity.getId(), saveEntity.getBusinessType(), "向" + userPublicService.getAreaNameByUnitName(repairBill.getReceiveUnit()) + "发起装备维修", ids, 1); // MessageBto messageBto = new MessageBto(saveEntity.getId(), saveEntity.getBusinessType(), "向" + userPublicService.getAreaNameByUnitName(repairBill.getReceiveUnit()) + "发起装备维修", ids, 1);
MessageBto messageBto = new MessageBto(saveEntity.getId(), saveEntity.getBusinessType(), content, ids, 1); MessageBto messageBto = new MessageBto(saveEntity.getId(), saveEntity.getBusinessType(), content, ids, 1);
messageService.add(messageBto); messageService.add(messageBto);
...@@ -674,9 +676,13 @@ public class RepairController { ...@@ -674,9 +676,13 @@ public class RepairController {
taskService.moveAllSonNodeToEnd(taskBto.getId()); taskService.moveAllSonNodeToEnd(taskBto.getId());
//阅知 //阅知
// MessageBto messageBto = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "业务办结", ids, 1); // MessageBto messageBto = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "业务办结", ids, 1);
// MessageBto messageBto = new MessageBto(taskBto.getId(), taskBto.getBusinessType(),
// "接收维修装备型号为"+repairDetailEntities.stream()
// .map(RepairDetail::getModel).collect(Collectors.toList()), ids, 1);
MessageBto messageBto = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), MessageBto messageBto = new MessageBto(taskBto.getId(), taskBto.getBusinessType(),
"接收维修装备型号为"+repairDetailEntities.stream() "接收维修业务"+MessageFormatUtil.spellTwoWicket(repairBill.getSendUnit(),
.map(RepairDetail::getModel).collect(Collectors.toList()), ids, 1); repairBill.getReceiveUnit()), ids, 1);
messageService.add(messageBto); messageService.add(messageBto);
} else { } else {
//推到待上传签收单状态 //推到待上传签收单状态
...@@ -743,7 +749,8 @@ public class RepairController { ...@@ -743,7 +749,8 @@ public class RepairController {
MessageBto messageBto = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "被选为签发人", idList1, 1); MessageBto messageBto = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "被选为签发人", idList1, 1);
messageService.add(messageBto); messageService.add(messageBto);
} }
MessageBto messageBto = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "接收维修装备", ids, 1); MessageBto messageBto = new MessageBto(taskBto.getId(), taskBto.getBusinessType(),
"接收维修业务"+MessageFormatUtil.spellTwoWicket(repairBill.getSendUnit(),repairBill.getReceiveUnit()), ids, 1);
messageService.add(messageBto); messageService.add(messageBto);
myWebSocket.sendMessage1(); myWebSocket.sendMessage1();
return ResultUtil.success("维修装备接收入库"); return ResultUtil.success("维修装备接收入库");
...@@ -838,10 +845,11 @@ public class RepairController { ...@@ -838,10 +845,11 @@ public class RepairController {
taskService.moveAllSonNodeToEnd(taskBto.getId()); taskService.moveAllSonNodeToEnd(taskBto.getId());
//阅知 //阅知
// MessageBto messageBto = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "业务办结", ids, 1); // MessageBto messageBto = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "业务办结", ids, 1);
List<RepairDetail> repairDetails = deviceRepairDetailService.findByBillId(repairBill.getId()); // List<RepairDetail> repairDetails = deviceRepairDetailService.findByBillId(repairBill.getId());
List<String> models = repairDetails.stream().map(RepairDetail::getModel).collect(Collectors.toList()); // List<String> models = repairDetails.stream().map(RepairDetail::getModel).collect(Collectors.toList());
MessageBto messageBto = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), MessageBto messageBto = new MessageBto(taskBto.getId(), taskBto.getBusinessType(),
"接收维修装备型号为:"+models, ids, 1); "接收维修业务"+MessageFormatUtil.spellTwoWicket(repairBill.getSendUnit(),
repairBill.getReceiveUnit()), ids, 1);
messageService.add(messageBto); messageService.add(messageBto);
repairSendBill.setBillFileName(fileUploadVo.getBillFileName()); repairSendBill.setBillFileName(fileUploadVo.getBillFileName());
repairSendBill.setBillFileUrl(fileUploadVo.getBillFileUrl()); repairSendBill.setBillFileUrl(fileUploadVo.getBillFileUrl());
...@@ -1027,7 +1035,10 @@ public class RepairController { ...@@ -1027,7 +1035,10 @@ public class RepairController {
MessageBto messageBto = new MessageBto(task.getId(), task.getBusinessType(), "被选为签发人", idList1, 1); MessageBto messageBto = new MessageBto(task.getId(), task.getBusinessType(), "被选为签发人", idList1, 1);
messageService.add(messageBto); messageService.add(messageBto);
} }
MessageBto messageBto = new MessageBto(task.getId(), task.getBusinessType(), "向" + userPublicService.getAreaNameByUnitName(repairBackBill.getReceiveUnit()) + "退回维修装备", ids, 1); // MessageBto messageBto = new MessageBto(task.getId(), task.getBusinessType(), "向" + userPublicService.getAreaNameByUnitName(repairBackBill.getReceiveUnit()) + "退回维修装备", ids, 1);
MessageBto messageBto = new MessageBto(task.getId(), task.getBusinessType(),
"退回维修业务"+MessageFormatUtil.spellTwoWicket(repairBackBill1.getSendUnit(),
repairBackBill1.getReceiveUnit()), ids, 1);
messageService.add(messageBto); messageService.add(messageBto);
myWebSocket.sendMessage1(); myWebSocket.sendMessage1();
//添加taskId //添加taskId
...@@ -1252,7 +1263,9 @@ public class RepairController { ...@@ -1252,7 +1263,9 @@ public class RepairController {
messageService.add(messageBto); messageService.add(messageBto);
} }
// String message = repairReceiveVo.getStatus() == 0 ? "业务办结" : "接收维修领取装备"; // String message = repairReceiveVo.getStatus() == 0 ? "业务办结" : "接收维修领取装备";
String message = repairReceiveVo.getStatus() == 0 ? "送修任务已完结，装备型号为:" : "接收维修领取装备,型号为："; String message = repairReceiveVo.getStatus() == 0 ? "接收维修业务"+MessageFormatUtil.spellTwoWicket(
repairBackBill1.getSendUnit(),repairBackBill1.getReceiveUnit()) : "发起退回维修任务"+
MessageFormatUtil.spellTwoWicket(repairBackBill1.getSendUnit(),repairBackBill1.getReceiveUnit());
MessageBto messageBto = new MessageBto(taskBto2.getId(), taskBto2.getBusinessType(), MessageBto messageBto = new MessageBto(taskBto2.getId(), taskBto2.getBusinessType(),
message+deviceLibraries.stream().map(DeviceLibrary::getModel).collect(Collectors.toList()), ids, 1,1); message+deviceLibraries.stream().map(DeviceLibrary::getModel).collect(Collectors.toList()), ids, 1,1);
messageService.add(messageBto); messageService.add(messageBto);
...@@ -1263,8 +1276,8 @@ public class RepairController { ...@@ -1263,8 +1276,8 @@ public class RepairController {
.map(User::getUserId) .map(User::getUserId)
.collect(Collectors.toList())); .collect(Collectors.toList()));
// MessageBto messageBto2 = new MessageBto(0, 5, "待领取送修装备", integerList); // MessageBto messageBto2 = new MessageBto(0, 5, "待领取送修装备", integerList);
MessageBto messageBto2 = new MessageBto(0, 5, "待领取送修装备,型号为"+ MessageBto messageBto2 = new MessageBto(0, 5, "发起退回维修任务"+
deviceLibraries.stream().map(DeviceLibrary::getModel).collect(Collectors.toList()), MessageFormatUtil.spellTwoWicket(repairBackBill1.getSendUnit(),repairBackBill1.getReceiveUnit()),
integerList,1,1); integerList,1,1);
//存放详情id集合 //存放详情id集合
messageBto2.setRecord(StringSplitUtil.idListToString(messageMap.get(integer))); messageBto2.setRecord(StringSplitUtil.idListToString(messageMap.get(integer)));
...@@ -1354,10 +1367,13 @@ public class RepairController { ...@@ -1354,10 +1367,13 @@ public class RepairController {
taskService.moveAllSonNodeToEnd(taskBto.getId()); taskService.moveAllSonNodeToEnd(taskBto.getId());
//阅知 //阅知
// MessageBto messageBto = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "业务办结", ids, 1); // MessageBto messageBto = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "业务办结", ids, 1);
List<String> models = deviceRepairDetailService.findByBackBillId(repairBackBill.getId()).stream().map(RepairDetail::getModel) // List<String> models = deviceRepairDetailService.findByBackBillId(repairBackBill.getId()).stream().map(RepairDetail::getModel)
.collect(Collectors.toList()); // .collect(Collectors.toList());
// MessageBto messageBto = new MessageBto(taskBto.getId(), taskBto.getBusinessType(),
// "维修业务已办结,装备型号为"+models, ids, 1);
MessageBto messageBto = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), MessageBto messageBto = new MessageBto(taskBto.getId(), taskBto.getBusinessType(),
"维修业务已办结,装备型号为"+models, ids, 1); "办结维修退回业务"+MessageFormatUtil.spellTwoWicket(repairBackBill.getSendUnit(),
repairBackBill.getReceiveUnit()), ids, 1);
messageService.add(messageBto); messageService.add(messageBto);
repairBackBill.setBillFileName(fileUploadVo.getBillFileName()); repairBackBill.setBillFileName(fileUploadVo.getBillFileName());
repairBackBill.setBillFileUrl(fileUploadVo.getBillFileUrl()); repairBackBill.setBillFileUrl(fileUploadVo.getBillFileUrl());
...@@ -1484,7 +1500,10 @@ public class RepairController { ...@@ -1484,7 +1500,10 @@ public class RepairController {
ids2.addAll(userDao.findAllByUnitsId(integer).stream() ids2.addAll(userDao.findAllByUnitsId(integer).stream()
.map(User::getUserId) .map(User::getUserId)
.collect(Collectors.toList())); .collect(Collectors.toList()));
MessageBto messageBto2 = new MessageBto(0, 5, "待领取送修装备，型号为"+ // MessageBto messageBto2 = new MessageBto(0, 5, "待领取送修装备，型号为"+
// deviceLibraries.stream().map(DeviceLibrary::getModel).collect(Collectors.toList()), ids2,1,1);
// messageBto2.setRecord(StringSplitUtil.idListToString(messageMap.get(integer)));
MessageBto messageBto2 = new MessageBto(0, 5, "接收维修业务，型号为"+
deviceLibraries.stream().map(DeviceLibrary::getModel).collect(Collectors.toList()), ids2,1,1); deviceLibraries.stream().map(DeviceLibrary::getModel).collect(Collectors.toList()), ids2,1,1);
messageBto2.setRecord(StringSplitUtil.idListToString(messageMap.get(integer))); messageBto2.setRecord(StringSplitUtil.idListToString(messageMap.get(integer)));
messageService.add(messageBto2); messageService.add(messageBto2);
...@@ -1989,8 +2008,11 @@ public class RepairController { ...@@ -1989,8 +2008,11 @@ public class RepairController {
integerList.addAll(userDao.findAllByUnitsId(unitId).stream() integerList.addAll(userDao.findAllByUnitsId(unitId).stream()
.map(User::getUserId) .map(User::getUserId)
.collect(Collectors.toList())); .collect(Collectors.toList()));
MessageBto messageBto2 = new MessageBto(0, 5, "待领取送修装备，型号为"+ // MessageBto messageBto2 = new MessageBto(0, 5, "待领取送修装备，型号为"+
deviceLibraries.stream().map(DeviceLibrary::getModel).collect(Collectors.toList()), integerList,1,1); // deviceLibraries.stream().map(DeviceLibrary::getModel).collect(Collectors.toList()), integerList,1,1);
// messageBto2.setRecord(String.valueOf(repairDetail1.getId()));
MessageBto messageBto2 = new MessageBto(0, 5, "退回维修业务"+
MessageFormatUtil.spellTwoWicket(repairDetail1.getLocationUnit(),repairDetail1.getOwnUnit()), integerList,1,1);
messageBto2.setRecord(String.valueOf(repairDetail1.getId())); messageBto2.setRecord(String.valueOf(repairDetail1.getId()));
messageService.add(messageBto2); messageService.add(messageBto2);
} }
...@@ -2109,10 +2131,11 @@ public class RepairController { ...@@ -2109,10 +2131,11 @@ public class RepairController {
.map(User::getUserId) .map(User::getUserId)
.collect(Collectors.toList())); .collect(Collectors.toList()));
//阅知 //阅知
List<String> models = deviceRepairDetailService.findByBackBillId(repairBackBill.getId()).stream().map(RepairDetail::getModel) // List<String> models = deviceRepairDetailService.findByBackBillId(repairBackBill.getId()).stream().map(RepairDetail::getModel)
.collect(Collectors.toList()); // .collect(Collectors.toList());
MessageBto messageBto1 = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), MessageBto messageBto1 = new MessageBto(taskBto.getId(), taskBto.getBusinessType(),
"维修业务已办结,装备型号为"+models, ids, 1); "办结维修退回业务"+MessageFormatUtil.spellTwoWicket(repairBackBill.getSendUnit(),
repairBackBill.getReceiveUnit()), ids, 1);
// MessageBto messageBto1 = new MessageBto(taskBto.getParentTaskId(), taskBto.getBusinessType(), "业务办结", userIds, 1); // MessageBto messageBto1 = new MessageBto(taskBto.getParentTaskId(), taskBto.getBusinessType(), "业务办结", userIds, 1);
messageService.add(messageBto1); messageService.add(messageBto1);
//装备日志 //装备日志
...@@ -2168,8 +2191,9 @@ public class RepairController { ...@@ -2168,8 +2191,9 @@ public class RepairController {
integerList.addAll(userDao.findAllByUnitsId(integer).stream() integerList.addAll(userDao.findAllByUnitsId(integer).stream()
.map(User::getUserId) .map(User::getUserId)
.collect(Collectors.toList())); .collect(Collectors.toList()));
MessageBto messageBto2 = new MessageBto(0, 5, "待领取送修装备，型号为"+ MessageBto messageBto2 = new MessageBto(0, 5, "接收维修业务"+
models, integerList,1,1); MessageFormatUtil.spellTwoWicket(repairBackBill.getSendUnit(),repairBackBill.getReceiveUnit()),
integerList,1,1);
//阅知记录id拼接 //阅知记录id拼接
messageBto2.setRecord(StringSplitUtil.idListToString(messageMap.get(integer))); messageBto2.setRecord(StringSplitUtil.idListToString(messageMap.get(integer)));
messageService.add(messageBto2); messageService.add(messageBto2);
...@@ -2233,7 +2257,8 @@ public class RepairController { ...@@ -2233,7 +2257,8 @@ public class RepairController {
// MessageBto messageBto1 = new MessageBto(taskBto.getParentTaskId(), taskBto.getBusinessType(), // MessageBto messageBto1 = new MessageBto(taskBto.getParentTaskId(), taskBto.getBusinessType(),
// "业务办结", userIds, 1); // "业务办结", userIds, 1);
MessageBto messageBto1 = new MessageBto(taskBto.getParentTaskId(), taskBto.getBusinessType(), MessageBto messageBto1 = new MessageBto(taskBto.getParentTaskId(), taskBto.getBusinessType(),
"送修业务已办结,装备型号为:"+models, userIds, 1); "接收维修业务:"+MessageFormatUtil.spellTwoWicket(repairBill.getSendUnit(),
repairBill.getReceiveUnit()), userIds, 1);
messageService.add(messageBto1); messageService.add(messageBto1);
//装备日志 //装备日志
List<FileVo> fileVoList = new ArrayList<>(); List<FileVo> fileVoList = new ArrayList<>();
...@@ -2334,7 +2359,8 @@ public class RepairController { ...@@ -2334,7 +2359,8 @@ public class RepairController {
.map(User::getUserId) .map(User::getUserId)
.collect(Collectors.toList())); .collect(Collectors.toList()));
//给同单位专管员和收件单位专管员推阅知 //给同单位专管员和收件单位专管员推阅知
messageBto1.setContent("送修任务撤回:" + title); // messageBto1.setContent("送修任务撤回:" + title);
messageBto1.setContent("撤回维修业务"+MessageFormatUtil.spellTwoWicket(repairBill.getSendUnit(),repairBill.getReceiveUnit()));
MessageBto messageBto = new MessageBto(-1, parentTask.getBusinessType(), messageBto1.getContent(), idList, 1); MessageBto messageBto = new MessageBto(-1, parentTask.getBusinessType(), messageBto1.getContent(), idList, 1);
BeanUtils.copyProperties(messageBto1,messageBto); BeanUtils.copyProperties(messageBto1,messageBto);
messageBto.setTaskId(-1); messageBto.setTaskId(-1);
...@@ -2432,7 +2458,9 @@ public class RepairController { ...@@ -2432,7 +2458,9 @@ public class RepairController {
.collect(Collectors.toList())); .collect(Collectors.toList()));
//给同单位专管员和收件单位专管员推阅知 //给同单位专管员和收件单位专管员推阅知
// messageBto1.setContent(title.substring(0,4)+"撤回"+title.substring(4)); // messageBto1.setContent(title.substring(0,4)+"撤回"+title.substring(4));
messageBto1.setContent("维修退回任务撤回:" + title); // messageBto1.setContent("维修退回任务撤回:" + title);
messageBto1.setContent("撤回退回维修业务:" + MessageFormatUtil.spellTwoWicket(repairBackBill.getSendUnit(),
repairBackBill.getReceiveUnit()));
MessageBto messageBto = new MessageBto(-1, parentTask.getBusinessType(), messageBto1.getContent(), idList, 1); MessageBto messageBto = new MessageBto(-1, parentTask.getBusinessType(), messageBto1.getContent(), idList, 1);
BeanUtils.copyProperties(messageBto1,messageBto); BeanUtils.copyProperties(messageBto1,messageBto);
messageBto.setTaskId(-1); messageBto.setTaskId(-1);
...@@ -2787,7 +2815,10 @@ public class RepairController { ...@@ -2787,7 +2815,10 @@ public class RepairController {
MessageBto messageBto = new MessageBto(saveEntity.getId(), saveEntity.getBusinessType(), "被选为签发人", idList1, 1); MessageBto messageBto = new MessageBto(saveEntity.getId(), saveEntity.getBusinessType(), "被选为签发人", idList1, 1);
messageService.add(messageBto); messageService.add(messageBto);
} }
MessageBto messageBto = new MessageBto(saveEntity.getId(), saveEntity.getBusinessType(), "向" + userPublicService.getAreaNameByUnitName(repairBill.getReceiveUnit()) + "发起装备维修", ids, 1); // MessageBto messageBto = new MessageBto(saveEntity.getId(), saveEntity.getBusinessType(), "向" + userPublicService.getAreaNameByUnitName(repairBill.getReceiveUnit()) + "发起装备维修", ids, 1);
MessageBto messageBto = new MessageBto(saveEntity.getId(), saveEntity.getBusinessType(),
"发起维修业务"+MessageFormatUtil.spellTwoWicket(repairBill1.getSendUnit(),
repairBill1.getReceiveUnit()), ids, 1);
messageService.add(messageBto); messageService.add(messageBto);
myWebSocket.sendMessage1(); myWebSocket.sendMessage1();
//添加taskId //添加taskId
...@@ -2886,7 +2917,10 @@ public class RepairController { ...@@ -2886,7 +2917,10 @@ public class RepairController {
MessageBto messageBto = new MessageBto(task.getId(), task.getBusinessType(), "被选为签发人", idList1, 1); MessageBto messageBto = new MessageBto(task.getId(), task.getBusinessType(), "被选为签发人", idList1, 1);
messageService.add(messageBto); messageService.add(messageBto);
} }
MessageBto messageBto = new MessageBto(task.getId(), task.getBusinessType(), "向" + userPublicService.getAreaNameByUnitName(repairBackBill.getReceiveUnit()) + "退回维修装备", ids, 1); // MessageBto messageBto = new MessageBto(task.getId(), task.getBusinessType(), "向" + userPublicService.getAreaNameByUnitName(repairBackBill.getReceiveUnit()) + "退回维修装备", ids, 1);
MessageBto messageBto = new MessageBto(task.getId(), task.getBusinessType(),
"退回维修业务"+MessageFormatUtil.spellTwoWicket(repairBackBill1.getSendUnit(),
repairBackBill1.getReceiveUnit()), ids, 1);
messageService.add(messageBto); messageService.add(messageBto);
myWebSocket.sendMessage1(); myWebSocket.sendMessage1();
//添加taskId字段 //添加taskId字段
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论