Skip to content

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

fix(维修模块，配发模块，退回模块): 单据缺少发件方的签名

单据缺少发件方的签名
上级 d60c070d
隐藏空白字符变更
内嵌 并排
正在显示 包含 27 行增加 和 27 行删除
dev-allot/src/main/java/com/tykj/dev/device/allot/controller/AllotBillController.java
浏览文件 @ 1fc5d19c
......@@ -716,11 +716,11 @@ public class AllotBillController {
allotBill.setReceiveUserbIdSignature(fileUploadVo.getReceiveUserbIdSignature());
}
//是否上传接收方B岗
// if (fileUploadVo.getReceiveUserbId()!=null){
// allotBill.setReceiveUserbId(fileUploadVo.getReceiveUserbId());
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) {
......@@ -810,14 +810,14 @@ public class AllotBillController {
allotBill.setSendUserbIdSignature(fileVo.getSendUserbIdSignature());
}
//签发人阅知
// if (fileVo.getSendUserbId() != null) {
// allotBill.setSendUserbId(fileVo.getSendUserbId());
// allotBill.setAgent(userPublicService.getOne(fileVo.getSendUserbId()).getName());
if (fileVo.getSendUserbId() != null) {
allotBill.setSendUserbId(fileVo.getSendUserbId());
allotBill.setAgent(userPublicService.getOne(fileVo.getSendUserbId()).getName());
// List<Integer> idList1 = new ArrayList<>();
// idList1.add(fileVo.getSendUserbId());
// MessageBto messageBto = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "被选为签发人", idList1, 1);
// messageService.add(messageBto);
// }
}
//保存账单
//回执单
allotBill.setSendFiles(FilesUtil.stringFileToList(fileVo.getAllotFiles()));
......
dev-allot/src/main/java/com/tykj/dev/device/allot/controller/BackController.java
浏览文件 @ 1fc5d19c
......@@ -465,14 +465,14 @@ public class BackController {
idList.add(fileVo.getReceiveUserbId());
}
//签发人阅知
// if (fileVo.getSendUserbId()!=null){
// allotBackBill.setSendUserbId(fileVo.getSendUserbId());
// allotBackBill.setAgent(userPublicService.getOne(fileVo.getSendUserbId()).getName());
if (fileVo.getSendUserbId()!=null){
allotBackBill.setSendUserbId(fileVo.getSendUserbId());
allotBackBill.setAgent(userPublicService.getOne(fileVo.getSendUserbId()).getName());
// List<Integer> idList1 = new ArrayList<>();
// idList1.add(fileVo.getSendUserbId());
// MessageBto messageBto = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "被选为签发人", idList1, 1);
// messageService.add(messageBto);
// }
}
//保存账单
//回执单
allotBackBill.setSendFiles(FilesUtil.stringFileToList(fileVo.getAllotFiles()));
......
dev-repair/src/main/java/com/tykj/dev/device/repair/controller/RepairController.java
浏览文件 @ 1fc5d19c
......@@ -1137,12 +1137,12 @@ public class RepairController {
ids.addAll(userDao.findAllByUnitsId(repairBackBill.getReceiveUnitId()).stream()
.map(User::getUserId)
.collect(Collectors.toList()));
if (repairBackBillSaveVo.getStartUserbId() != null) {
List<Integer> idList1 = new ArrayList<>();
idList1.add(repairBackBillSaveVo.getStartUserbId());
// if (repairBackBillSaveVo.getStartUserbId() != null) {
// List<Integer> idList1 = new ArrayList<>();
// idList1.add(repairBackBillSaveVo.getStartUserbId());
// MessageBto messageBto = new MessageBto(task.getId(), task.getBusinessType(), "被选为签发人", idList1, 1);
// messageService.add(messageBto);
}
// }
// MessageBto messageBto = new MessageBto(task.getId(), task.getBusinessType(), "向" + userPublicService.getAreaNameByUnitName(repairBackBill.getReceiveUnit()) + "退回维修装备", ids, 1);
//获取型号
List<String> models = repairBackBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList());
......@@ -1383,12 +1383,12 @@ public class RepairController {
// 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());
// if (repairReceiveVo.getStartUserbId() != null) {
// List<Integer> idList1 = new ArrayList<>();
// idList1.add(repairReceiveVo.getStartUserbId());
// MessageBto messageBto = new MessageBto(taskBto2.getId(), taskBto2.getBusinessType(), "被选为签发人", idList1, 1);
// messageService.add(messageBto);
}
// }
// String message = repairReceiveVo.getStatus() == 0 ? "业务办结" : "接收维修领取装备";
//获取型号
List<String> models = repairReceiveVo.getModels();
......@@ -3055,12 +3055,12 @@ public class RepairController {
//添加出库白名单
inputOutputDeviceService.addWhiteDevices(idList, userUtils.getCurrentUnitId(), 1);
//发送阅知信息
if (repairBillSaveVo.getStartUserbId() != null) {
List<Integer> idList1 = new ArrayList<>();
idList1.add(repairBillSaveVo.getStartUserbId());
// if (repairBillSaveVo.getStartUserbId() != null) {
// List<Integer> idList1 = new ArrayList<>();
// idList1.add(repairBillSaveVo.getStartUserbId());
// MessageBto messageBto = new MessageBto(saveEntity.getId(), saveEntity.getBusinessType(), "被选为签发人", idList1, 1);
// messageService.add(messageBto);
}
// }
List<String> models = repairBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList());
// MessageBto messageBto = new MessageBto(saveEntity.getId(), saveEntity.getBusinessType(), "向" + userPublicService.getAreaNameByUnitName(repairBill.getReceiveUnit()) + "发起装备维修", ids, 1);
MessageBto messageBto = new MessageBto(saveEntity.getId(), saveEntity.getBusinessType(),
......@@ -3176,12 +3176,12 @@ public class RepairController {
ids.addAll(userDao.findAllByUnitsId(repairBackBill.getReceiveUnitId()).stream()
.map(User::getUserId)
.collect(Collectors.toList()));
if (repairBackBillSaveVo.getStartUserbId() != null) {
List<Integer> idList1 = new ArrayList<>();
idList1.add(repairBackBillSaveVo.getStartUserbId());
// if (repairBackBillSaveVo.getStartUserbId() != null) {
// List<Integer> idList1 = new ArrayList<>();
// idList1.add(repairBackBillSaveVo.getStartUserbId());
// MessageBto messageBto = new MessageBto(task.getId(), task.getBusinessType(), "被选为签发人", idList1, 1);
// messageService.add(messageBto);
}
// }
// MessageBto messageBto = new MessageBto(task.getId(), task.getBusinessType(), "向" + userPublicService.getAreaNameByUnitName(repairBackBill.getReceiveUnit()) + "退回维修装备", ids, 1);
List<String> models = repairBackBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList());
MessageBto messageBto = new MessageBto(task.getId(), task.getBusinessType(),
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论