Skip to content

D
device-back
提交 cd516725 authored 作者: 邓砥奕's avatar 邓砥奕
浏览文件
操作

更新

上级 3eb2060b
隐藏空白字符变更
内嵌 并排
正在显示 包含 74 行增加 和 68 行删除
dev-allot/src/main/java/com/tykj/dev/device/allot/controller/AllotBillController.java
浏览文件 @ cd516725
......@@ -453,12 +453,12 @@ public class AllotBillController {
.map(User::getUserId)
.collect(Collectors.toList()));
//经办人阅知
if (allotReceiveVo.getReceiveUserbId()!=null) {
List<Integer> idList1 = new ArrayList<>();
idList1.add(allotReceiveVo.getReceiveUserbId());
MessageBto messageBto = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "被选为经办人", idList1, 1);
messageService.add(messageBto);
}
// if (allotReceiveVo.getReceiveUserbId()!=null) {
// List<Integer> idList1 = new ArrayList<>();
// idList1.add(allotReceiveVo.getReceiveUserbId());
// MessageBto messageBto = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "被选为经办人", idList1, 1);
// messageService.add(messageBto);
// }
//签发人阅知
if (allotReceiveVo.getSendUserbId()!=null&&sendbIsExist) {
List<Integer> idList1 = new ArrayList<>();
......@@ -642,11 +642,11 @@ public class AllotBillController {
allotBill.setAgent(userPublicService.getOne(fileUploadVo.getSendUserbId()).getName());
}
//是否上传接收方B岗
if (fileUploadVo.getReceiveUserbId()!=null){
allotBill.setReceiveUserbId(fileUploadVo.getReceiveUserbId());
MessageBto messageBto = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "被选为经办人", Collections.singletonList(fileUploadVo.getReceiveUserbId()), 1);
messageService.add(messageBto);
}
// if (fileUploadVo.getReceiveUserbId()!=null){
// allotBill.setReceiveUserbId(fileUploadVo.getReceiveUserbId());
// MessageBto messageBto = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "被选为经办人", Collections.singletonList(fileUploadVo.getReceiveUserbId()), 1);
// messageService.add(messageBto);
// }
//文件列表
List<FileVo> fileVoList = new ArrayList<>();
if (fileUploadVo.getReceiveFileList()!=null&&fileUploadVo.getReceiveFileList().size()>0){
......@@ -743,10 +743,10 @@ public class AllotBillController {
deviceLibraryService.update(deviceLibrary);
});
//经办人阅知
if (idList.size()>0) {
MessageBto messageBto = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "被选为经办人", idList, 1);
messageService.add(messageBto);
}
// if (idList.size()>0) {
// MessageBto messageBto = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "被选为经办人", idList, 1);
// messageService.add(messageBto);
// }
//发送阅知信息
List<Integer> userIds = userPublicService.findOtherUser(userUtils.getCurrentUserId());
userIds.addAll(userDao.findAllByUnitsId(userPublicService.findUnitIdByName(allotBill.getReceiveUnit())).stream()
......
dev-allot/src/main/java/com/tykj/dev/device/allot/controller/BackController.java
浏览文件 @ cd516725
......@@ -290,12 +290,12 @@ public class BackController {
.map(User::getUserId)
.collect(Collectors.toList()));
//经办人阅知
if (allotBackReceiveVo.getReceiveUserbId()!=null) {
List<Integer> idList1 = new ArrayList<>();
idList1.add(allotBackReceiveVo.getReceiveUserbId());
MessageBto messageBto = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "被选为经办人", idList1, 1);
messageService.add(messageBto);
}
// if (allotBackReceiveVo.getReceiveUserbId()!=null) {
// List<Integer> idList1 = new ArrayList<>();
// idList1.add(allotBackReceiveVo.getReceiveUserbId());
// MessageBto messageBto = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "被选为经办人", idList1, 1);
// messageService.add(messageBto);
// }
//签发人阅知
if (allotBackReceiveVo.getSendUserbId()!=null) {
List<Integer> idList1 = new ArrayList<>();
......@@ -333,11 +333,11 @@ public class BackController {
allotBackBill.setAgent(userPublicService.getOne(fileUploadVo.getSendUserbId()).getName());
}
//是否上传接收方B岗
if (fileUploadVo.getReceiveUserbId()!=null){
allotBackBill.setReceiveUserbId(fileUploadVo.getReceiveUserbId());
MessageBto messageBto = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "被选为经办人", Collections.singletonList(fileUploadVo.getReceiveUserbId()), 1);
messageService.add(messageBto);
}
// if (fileUploadVo.getReceiveUserbId()!=null){
// allotBackBill.setReceiveUserbId(fileUploadVo.getReceiveUserbId());
// MessageBto messageBto = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "被选为经办人", Collections.singletonList(fileUploadVo.getReceiveUserbId()), 1);
// messageService.add(messageBto);
// }
//文件列表
List<FileVo> fileVoList = new ArrayList<>();
if (fileUploadVo.getReceiveFileList()!=null&&fileUploadVo.getReceiveFileList().size()>0){
......@@ -431,10 +431,10 @@ public class BackController {
deviceLibraryService.update(deviceLibrary);
});
//经办人阅知
if (idList.size()>0) {
MessageBto messageBto = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "被选为经办人", idList, 1);
messageService.add(messageBto);
}
// if (idList.size()>0) {
// MessageBto messageBto = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "被选为经办人", idList, 1);
// messageService.add(messageBto);
// }
//发送阅知信息
List<Integer> userIds = userPublicService.findOtherUser(userUtils.getCurrentUserId());
userIds.addAll(userDao.findAllByUnitsId(userPublicService.findUnitIdByName(allotBackBill.getReceiveUnit())).stream()
......
dev-packing/src/main/java/com/tykj/dev/device/packing/controller/PackingController.java
浏览文件 @ cd516725
......@@ -181,7 +181,7 @@ public class PackingController {
// TaskBto saveEntity = taskService.start(taskBto);
if (packingLibrary1.getIsRoot()==1){
packingLibrary.setIsPart(0);
String message = "添加列装装备:"+addPack.getName();
String message = "添加列装型号"+addPack.getModel()+"下的装备:"+addPack.getName();
// //添加业务日志
// TaskLogBto taskLogBto2 = new TaskLogBto(saveEntity.getId(), message, null);
// taskLogService.addLog(taskLogBto2);
......@@ -198,7 +198,7 @@ public class PackingController {
}
else {
packingLibrary.setIsPart(1);
String message = "添加列装装备附件:"+addPack.getName();
String message = "添加列装型号"+addPack.getModel()+"下的装备附件:"+addPack.getName();
// //添加业务日志
// TaskLogBto taskLogBto2 = new TaskLogBto(saveEntity.getId(), message, null);
// taskLogService.addLog(taskLogBto2);
......@@ -259,7 +259,13 @@ public class PackingController {
Page<PackingLibrary> packingLibraries = PageUtil.getPerPage(selectPack.getPage(), selectPack.getSize(), resultList, selectPack.getPageable());
Map<String,Object> map = new HashMap<>();
map.put("pages",packingLibraries);
map.put("models",resultList.stream().map(PackingLibrary::getModel).collect(Collectors.toSet()));
List<String> models = new ArrayList<>();
for (PackingLibrary p : resultList){
if (p.getIsRoot()==1){
models.add(p.getModel());
}
}
map.put("models",models);
map.put("names",resultList.stream().map(PackingLibrary::getName).collect(Collectors.toSet()));
return ResultUtil.success(map);
}
......
dev-packing/src/main/java/com/tykj/dev/device/packing/service/impl/PackingLibraryServiceImpl.java
浏览文件 @ cd516725
......@@ -134,7 +134,7 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
PackingLibrary::getId,
packingLibraryEntity -> Optional.ofNullable(nodeCollect.get(packingLibraryEntity.getPartParentId())),
PackingLibrary::addChildNode
);
).stream().sorted(Comparator.comparing(PackingLibrary::getModel)).collect(Collectors.toList());
}
@Override
......@@ -149,12 +149,12 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
@Override
public List<String> getModelList() {
List<PackingLibrary> list = packingLibraryDao.findAllByIsRootAndPackingStatus(1,2);
Set<String> s = new HashSet<>();
List<PackingLibrary> list = packingLibraryDao.findAllByIsRootAndPackingStatus(1,2).stream().sorted(Comparator.comparing(PackingLibrary::getShowOrder)).collect(Collectors.toList());
List<String> s = new ArrayList<>();
for (PackingLibrary d : list) {
s.add(d.getModel());
}
return new ArrayList<>(s);
return s;
}
@Override
......
dev-repair/src/main/java/com/tykj/dev/device/repair/controller/RepairController.java
浏览文件 @ cd516725
......@@ -615,12 +615,12 @@ public class RepairController {
}
});
//发送阅知信息
if (repairReceiveVo.getReceiveUserbId()!=null) {
List<Integer> idList1 = new ArrayList<>();
idList1.add(repairReceiveVo.getReceiveUserbId());
MessageBto messageBto = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "被选为经办人", idList1, 1);
messageService.add(messageBto);
}
// if (repairReceiveVo.getReceiveUserbId()!=null) {
// List<Integer> idList1 = new ArrayList<>();
// idList1.add(repairReceiveVo.getReceiveUserbId());
// MessageBto messageBto = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "被选为经办人", idList1, 1);
// messageService.add(messageBto);
// }
if (repairReceiveVo.getStartUserbId()!=null) {
List<Integer> idList1 = new ArrayList<>();
idList1.add(repairReceiveVo.getStartUserbId());
......@@ -743,12 +743,12 @@ public class RepairController {
messageService.add(messageBto1);
}
//收件方经办人
if (fileUploadVo.getRepairUserbId()!=null){
repairSendBill.setRepairUserbId(fileUploadVo.getRepairUserbId());
repairBill.setRepairUserB(userPublicService.getOne(fileUploadVo.getRepairUserbId()).getName());
MessageBto messageBto2 = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "被选为经办人", Collections.singletonList(fileUploadVo.getRepairUserbId()), 1);
messageService.add(messageBto2);
}
// if (fileUploadVo.getRepairUserbId()!=null){
// repairSendBill.setRepairUserbId(fileUploadVo.getRepairUserbId());
// repairBill.setRepairUserB(userPublicService.getOne(fileUploadVo.getRepairUserbId()).getName());
// MessageBto messageBto2 = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "被选为经办人", Collections.singletonList(fileUploadVo.getRepairUserbId()), 1);
// messageService.add(messageBto2);
// }
if (fileUploadVo.getRepairUseraId()!=null){
repairSendBill.setRepairUseraId(fileUploadVo.getRepairUseraId());
repairBill.setRepairUserA(userPublicService.getOne(fileUploadVo.getRepairUseraId()).getName());
......@@ -1106,12 +1106,12 @@ public class RepairController {
.map(User::getUserId)
.collect(Collectors.toList()));
}
if (repairReceiveVo.getReceiveUserbId()!=null) {
List<Integer> idList1 = new ArrayList<>();
idList1.add(repairReceiveVo.getReceiveUserbId());
MessageBto messageBto = new MessageBto(taskBto2.getId(), taskBto2.getBusinessType(), "被选为经办人", idList1, 1);
messageService.add(messageBto);
}
// if (repairReceiveVo.getReceiveUserbId()!=null) {
// List<Integer> idList1 = new ArrayList<>();
// idList1.add(repairReceiveVo.getReceiveUserbId());
// MessageBto messageBto = new MessageBto(taskBto2.getId(), taskBto2.getBusinessType(), "被选为经办人", idList1, 1);
// messageService.add(messageBto);
// }
if (repairReceiveVo.getStartUserbId()!=null) {
List<Integer> idList1 = new ArrayList<>();
idList1.add(repairReceiveVo.getStartUserbId());
......@@ -1228,11 +1228,11 @@ public class RepairController {
messageService.add(messageBto1);
}
//经办人阅知
if (fileUploadVo.getReceiveUserbId()!=null){
repairBackBill.setReceiveUserbId(fileUploadVo.getReceiveUserbId());
MessageBto messageBto2 = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "被选为经办人", Collections.singletonList(fileUploadVo.getReceiveUserbId()), 1);
messageService.add(messageBto2);
}
// if (fileUploadVo.getReceiveUserbId()!=null){
// repairBackBill.setReceiveUserbId(fileUploadVo.getReceiveUserbId());
// MessageBto messageBto2 = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "被选为经办人", Collections.singletonList(fileUploadVo.getReceiveUserbId()), 1);
// messageService.add(messageBto2);
// }
List<FileVo> fileVoList = new ArrayList<>();
if (fileUploadVo.getReceiveFiles()!=null&&fileUploadVo.getReceiveFiles().size()>0){
fileUploadVo.getReceiveFiles().forEach(fileRet -> {
......@@ -1852,10 +1852,10 @@ public class RepairController {
deviceRepairDetailService.update(repairDetail);
});
//经办人阅知
if (idList.size()>0) {
MessageBto messageBto = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "被选为经办人", idList, 1);
messageService.add(messageBto);
}
// if (idList.size()>0) {
// MessageBto messageBto = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "被选为经办人", idList, 1);
// messageService.add(messageBto);
// }
//按map中各个单位发送阅知
messageMap.keySet().forEach(integer -> {
List<Integer> integerList = new ArrayList<>();
......@@ -1948,10 +1948,10 @@ public class RepairController {
}
});
//经办人阅知
if (idList.size()>0) {
MessageBto messageBto = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "被选为经办人", idList, 1);
messageService.add(messageBto);
}
// if (idList.size()>0) {
// MessageBto messageBto = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "被选为经办人", idList, 1);
// messageService.add(messageBto);
// }
return ResponseEntity.ok("OK");
}
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论