Skip to content

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

update

上级 e62dd1b2
隐藏空白字符变更
内嵌 并排
正在显示 包含 9 行增加 和 9 行删除
dev-repair/src/main/java/com/tykj/dev/device/repair/controller/RepairController.java
浏览文件 @ 11b8b148
......@@ -402,7 +402,7 @@ public class RepairController {
deviceRepairSendBillEntity.setRepairDeviceDetail(stringBuffer.toString());
deviceRepairSendBillEntity.setDeviceRepairBillId(repairBill1.getId());
deviceRepairSendBillEntity.setAgent(repairBillSaveVo.getAgent());
deviceRepairSendBillEntity.setTitle(repairBillSaveVo.getSendUnit()+"向"+repairBillSaveVo.getReceiveUnit()+"发起了维修业务");
deviceRepairSendBillEntity.setTitle(repairBillSaveVo.getSendUnit()+"向"+repairBillSaveVo.getReceiveUnit()+"发起了送修,型号为："+repairBillSaveVo.getScriptSaveVos().get(0).getModel()+"共有多少"+repairBillSaveVo.getSendingCount()+"件");
if (repairBillSaveVo.getSendFileList()!=null&&repairBillSaveVo.getSendFileList().size()>0) {
deviceRepairSendBillEntity.setSendFiles(FilesUtil.stringFileToList(repairBillSaveVo.getSendFileList()));
}
......@@ -418,7 +418,7 @@ public class RepairController {
ownUnit = userUtils.getCurrentUnitId();
//直接发起的
if (repairBillSaveVo.getTaskId()==null) {
TaskBto taskBto = new TaskBto(StatusEnum.WAIT_UPLOAD_FILE.id, repairBillSaveVo.getSendUnit()+"向"+repairBillSaveVo.getReceiveUnit()+"发起了维修业务", null, ".", repairBill1.getId(), 5, ownUnit, 1, "country", userIds);
TaskBto taskBto = new TaskBto(StatusEnum.WAIT_UPLOAD_FILE.id, repairBillSaveVo.getSendUnit()+"向"+repairBillSaveVo.getReceiveUnit()+"发起了送修,型号为："+repairBillSaveVo.getScriptSaveVos().get(0).getModel()+"共有多少"+repairBillSaveVo.getSendingCount()+"件", null, ".", repairBill1.getId(), 5, ownUnit, 1, "country", userIds);
saveEntity = taskService.start(taskBto);
}
//从草稿发起的
......@@ -431,7 +431,7 @@ public class RepairController {
ownUnit = userPublicService.findUnitIdByName(repairBill.getReceiveUnit());
//直接发起的
if (repairBillSaveVo.getTaskId()==null) {
TaskBto taskBto = new TaskBto(StatusEnum.WAIT_RECEIVE.id, repairBillSaveVo.getSendUnit()+"向"+repairBillSaveVo.getReceiveUnit()+"发起了维修业务", null, ".", repairBill1.getId(), 5, ownUnit, 1, null, userIds);
TaskBto taskBto = new TaskBto(StatusEnum.WAIT_RECEIVE.id, repairBillSaveVo.getSendUnit()+"向"+repairBillSaveVo.getReceiveUnit()+"发起了送修,型号为："+repairBillSaveVo.getScriptSaveVos().get(0).getModel()+"共有多少"+repairBillSaveVo.getSendingCount()+"件", null, ".", repairBill1.getId(), 5, ownUnit, 1, null, userIds);
saveEntity = taskService.start(taskBto);
}
//从草稿发起的
......@@ -445,7 +445,7 @@ public class RepairController {
.map(User::getUserId)
.collect(Collectors.toList()));
//生成子任务（发件方上传回执单）
TaskBto taskBto2 = new TaskBto(StatusEnum.WAIT_UPLOAD_SEND_FILE.id, repairBillSaveVo.getSendUnit()+"向"+repairBillSaveVo.getReceiveUnit()+"发起了维修业务", saveEntity.getId(), saveEntity.getNodeIdDetail() + saveEntity.getId() + ".", saveEntity.getBillId(), 5, userPublicService.findUnitIdByName(repairSendBill.getSendUnit()), 0, null, Collections.singletonList(0));
TaskBto taskBto2 = new TaskBto(StatusEnum.WAIT_UPLOAD_SEND_FILE.id, repairBillSaveVo.getSendUnit()+"向"+repairBillSaveVo.getReceiveUnit()+"发起了送修,型号为："+repairBillSaveVo.getScriptSaveVos().get(0).getModel()+"共有多少"+repairBillSaveVo.getSendingCount()+"件", saveEntity.getId(), saveEntity.getNodeIdDetail() + saveEntity.getId() + ".", saveEntity.getBillId(), 5, userPublicService.findUnitIdByName(repairSendBill.getSendUnit()), 0, null, Collections.singletonList(0));
taskService.start(taskBto2);
}
//获取装备id集合
......@@ -787,7 +787,7 @@ public class RepairController {
repairBackBill1.setDocNum(s1);
deviceRepairBackBillService.update(repairBackBill1);
//发起任务
TaskBto taskBto = new TaskBto(StatusEnum.REPAIR_BACK_DRAFT.id, repairBackBillSaveVo.getSendUnit()+"向"+repairBackBillSaveVo.getReceiveUnit()+"维修退回", null, ".", repairBackBill1.getId(), BusinessEnum.REPAIR_BACK.id,userUtils.getCurrentUnitId(), 0, null, userIds);
TaskBto taskBto = new TaskBto(StatusEnum.REPAIR_BACK_DRAFT.id, repairBackBillSaveVo.getSendUnit()+"向"+repairBackBillSaveVo.getReceiveUnit()+"发起了维修退回,型号为："+repairBackBillSaveVo.getScriptSaveVos().get(0).getModel()+"共有多少"+repairBackBillSaveVo.getSendingCount()+"件", null, ".", repairBackBill1.getId(), BusinessEnum.REPAIR_BACK.id,userUtils.getCurrentUnitId(), 0, null, userIds);
TaskBto taskBto1 = taskService.start(taskBto);
Integer id = taskBto1.getId();
myWebSocket.sendMessage1();
......@@ -862,7 +862,7 @@ public class RepairController {
TaskBto task;
//草稿发起
if (repairBackBillSaveVo.getTaskId()==null) {
TaskBto taskBto1 = new TaskBto(StatusEnum.WAIT_BACK_RECEIVE.id, "维修退回", null, ".", deviceRepairBackBillEntity1.getId(), BusinessEnum.REPAIR_BACK.id, userPublicService.findUnitIdByName(repairBackBill.getReceiveUnit()), 1, null, userIds);
TaskBto taskBto1 = new TaskBto(StatusEnum.WAIT_BACK_RECEIVE.id, repairBackBillSaveVo.getSendUnit()+"向"+repairBackBillSaveVo.getReceiveUnit()+"发起了维修退回,型号为："+repairBackBillSaveVo.getScriptSaveVos().get(0).getModel()+"共有多少"+repairBackBillSaveVo.getSendingCount()+"件", null, ".", deviceRepairBackBillEntity1.getId(), BusinessEnum.REPAIR_BACK.id, userPublicService.findUnitIdByName(repairBackBill.getReceiveUnit()), 1, null, userIds);
task = taskService.start(taskBto1);
}
else {
......@@ -870,7 +870,7 @@ public class RepairController {
taskBto1.setOwnUnit(userPublicService.findUnitIdByName(repairBackBill.getReceiveUnit()));
task = taskService.moveToSpecial(taskBto1,StatusEnum.WAIT_BACK_RECEIVE);
}
TaskBto taskBto2 = new TaskBto(StatusEnum.WAIT_UPLOAD_BACK_SEND_FILE.id, repairBackBillSaveVo.getSendUnit()+"向"+repairBackBillSaveVo.getReceiveUnit()+"维修退回", task.getId(), task.getNodeIdDetail() + task.getId() + ".", task.getBillId(), BusinessEnum.REPAIR_BACK.id, userPublicService.findUnitIdByName(repairBackBill.getSendUnit()), 0, null, Collections.singletonList(0));
TaskBto taskBto2 = new TaskBto(StatusEnum.WAIT_UPLOAD_BACK_SEND_FILE.id, repairBackBillSaveVo.getSendUnit()+"向"+repairBackBillSaveVo.getReceiveUnit()+"发起了维修退回,型号为："+repairBackBillSaveVo.getScriptSaveVos().get(0).getModel()+"共有多少"+repairBackBillSaveVo.getSendingCount()+"件", task.getId(), task.getNodeIdDetail() + task.getId() + ".", task.getBillId(), BusinessEnum.REPAIR_BACK.id, userPublicService.findUnitIdByName(repairBackBill.getSendUnit()), 0, null, Collections.singletonList(0));
taskService.start(taskBto2);
//添加业务日志
List<FileVo> fileVoList = new ArrayList<>();
......@@ -986,12 +986,12 @@ public class RepairController {
//不缺少单据直接办结
if (repairReceiveVo.getStatus()==0) {
userIds.add(userId);
TaskBto taskBto1 = new TaskBto(StatusEnum.END.id, "对"+repairReceiveVo.getReceiveUserbId()+"维修退回", null, ".", repairBackBill1.getId(), BusinessEnum.REPAIR_BACK.id, userUtils.getCurrentUnitId(), 0, "country", userIds);
TaskBto taskBto1 = new TaskBto(StatusEnum.END.id, repairBackBill.getSendUnit()+"向"+repairBackBill.getReceiveUnit()+"发起了维修退回,型号为："+repairReceiveVo.getScriptSaveVos().get(0).getModel()+"共有多少"+repairBackBill.getSendingCount()+"件", null, ".", repairBackBill1.getId(), BusinessEnum.REPAIR_BACK.id, userUtils.getCurrentUnitId(), 0, "country", userIds);
taskBto2 = taskService.start(taskBto1);
}
else {
userIds.add(0);
TaskBto taskBto1 = new TaskBto(StatusEnum.WAIT_UPLOAD_BACK_FILE.id, "对"+repairReceiveVo.getReceiveUserbId()+"维修退回", null, ".", repairBackBill1.getId(), BusinessEnum.REPAIR_BACK.id, userUtils.getCurrentUnitId(), 0, "country", userIds);
TaskBto taskBto1 = new TaskBto(StatusEnum.WAIT_UPLOAD_BACK_FILE.id, repairBackBill.getSendUnit()+"向"+repairBackBill.getReceiveUnit()+"发起了维修退回,型号为："+repairReceiveVo.getScriptSaveVos().get(0).getModel()+"共有多少"+repairBackBill.getSendingCount()+"件", null, ".", repairBackBill1.getId(), BusinessEnum.REPAIR_BACK.id, userUtils.getCurrentUnitId(), 0, "country", userIds);
taskBto2 = taskService.start(taskBto1);
}
//遍历改变维修详情
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论