Skip to content

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

update

上级 11b8b148
隐藏空白字符变更
内嵌 并排
正在显示 包含 19 行增加 和 17 行删除
dev-allot/src/main/java/com/tykj/dev/device/allot/controller/AllotBillController.java
浏览文件 @ ba162fff
......@@ -207,13 +207,13 @@ public class AllotBillController {
if (allotBillSaveVo.getAllotType()==1) {
//直接发起
if (allotBillSaveVo.getTaskId() == null) {
TaskBto taskBto = new TaskBto(StatusEnum.ALLOTING.id, "配发型号为："+allotBillSaveVo.getScriptSaveVos().get(0).getModel()+"的装备给"+allotBillSaveVo.getReceiveUnit(), null, ".", billId, 3, userPublicService.findUnitIdByName(allotBillSaveVo.getReceiveUnit()), 1, null, userIds);
TaskBto taskBto = new TaskBto(StatusEnum.ALLOTING.id, allotBillSaveVo.getSendUnit()+"配发型号为："+StringSplitUtil.stringListToString(allotBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList())) +"的装备,共"+allotBillSaveVo.getAllotCount()+"件，至"+allotBillSaveVo.getReceiveUnit(), null, ".", billId, 3, userPublicService.findUnitIdByName(allotBillSaveVo.getReceiveUnit()), 1, null, userIds);
saveEntity = taskService.start(taskBto);
}
//从草稿发起
else {
TaskBto taskBto = taskService.get(allotBillSaveVo.getTaskId());
taskBto.setTitle("配发型号为："+allotBillSaveVo.getScriptSaveVos().get(0).getModel()+"的装备给"+allotBillSaveVo.getReceiveUnit());
taskBto.setTitle(allotBillSaveVo.getSendUnit()+"配发型号为："+StringSplitUtil.stringListToString(allotBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList())) +"的装备,共"+allotBillSaveVo.getAllotCount()+"件，至"+allotBillSaveVo.getReceiveUnit());
//添加当前操作人为涉及人员
TaskBto taskBto1 = taskService.addInvolveUser(taskBto,userId);
//任务所属单位改为收件单位
......@@ -222,12 +222,12 @@ public class AllotBillController {
saveEntity = taskService.moveToSpecial(taskBto1, StatusEnum.ALLOTING, 0);
}
//生成发件方上传配发单的子任务
TaskBto taskBto2 = new TaskBto(StatusEnum.WAIT_UPLOAD_ALLOT_FILE.id, "配发型号为："+allotBillSaveVo.getScriptSaveVos().get(0).getModel()+"的装备给"+allotBillSaveVo.getReceiveUnit(), saveEntity.getId(), saveEntity.getNodeIdDetail() + saveEntity.getId() + ".", saveEntity.getBillId(), 3, userPublicService.findUnitIdByName(allotBillEntity.getSendUnit()), 0, null, Collections.singletonList(0));
TaskBto taskBto2 = new TaskBto(StatusEnum.WAIT_UPLOAD_ALLOT_FILE.id, allotBillSaveVo.getSendUnit()+"配发型号为："+StringSplitUtil.stringListToString(allotBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList())) +"的装备,共"+allotBillSaveVo.getAllotCount()+"件，至"+allotBillSaveVo.getReceiveUnit(), saveEntity.getId(), saveEntity.getNodeIdDetail() + saveEntity.getId() + ".", saveEntity.getBillId(), 3, userPublicService.findUnitIdByName(allotBillEntity.getSendUnit()), 0, null, Collections.singletonList(0));
taskService.start(taskBto2);
}
//横向配发
else {
TaskBto taskBto2 = new TaskBto(StatusEnum.WAIT_UPLOAD_CROSS_FILE.id, "配发型号为："+allotBillSaveVo.getScriptSaveVos().get(0).getModel()+"的装备给"+allotBillSaveVo.getReceiveUnit(), null, ".", billId, 3, userPublicService.findUnitIdByName(allotBillEntity.getSendUnit()), 1, "country", userIds);
TaskBto taskBto2 = new TaskBto(StatusEnum.WAIT_UPLOAD_CROSS_FILE.id, allotBillSaveVo.getSendUnit()+"配发型号为："+StringSplitUtil.stringListToString(allotBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList())) +"的装备,共"+allotBillSaveVo.getAllotCount()+"件，至"+allotBillSaveVo.getReceiveUnit(), null, ".", billId, 3, userPublicService.findUnitIdByName(allotBillEntity.getSendUnit()), 1, "country", userIds);
saveEntity = taskService.start(taskBto2);
}
List<FileVo> fileVoList = new ArrayList<>();
......@@ -498,7 +498,7 @@ public class AllotBillController {
allotBill1.setSendUseraId(userId);
AllotBill allotBill = allotBillService.addEntity(allotBill1);
//发起草稿任务
TaskBto taskBto = new TaskBto(StatusEnum.ALLOT_DRAFT.id, "配发型号为："+allotBillSaveVo.getScriptSaveVos().get(0).getModel()+"的装备给"+allotBillSaveVo.getReceiveUnit(), null, ".", allotBill.getId(), 3, userUtils.getCurrentUnitId(), 0, null, userIds);
TaskBto taskBto = new TaskBto(StatusEnum.ALLOT_DRAFT.id, allotBillSaveVo.getSendUnit()+"配发型号为："+StringSplitUtil.stringListToString(allotBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList())) +"的装备,共"+allotBillSaveVo.getAllotCount()+"件，至"+allotBillSaveVo.getReceiveUnit(), null, ".", allotBill.getId(), 3, userUtils.getCurrentUnitId(), 0, null, userIds);
TaskBto taskBto1 = taskService.start(taskBto);
//返回保存成功的id
Integer id = taskBto1.getId();
......
dev-allot/src/main/java/com/tykj/dev/device/allot/controller/BackController.java
浏览文件 @ ba162fff
......@@ -141,7 +141,8 @@ public class BackController {
TaskBto saveEntity;
//直接发起
if (allotBillSaveVo.getTaskId()==null) {
TaskBto taskBto = new TaskBto(StatusEnum.ALLOT_BACKING.id, "退回型号为："+allotBillSaveVo.getScriptSaveVos().get(0).getModel()+"的装备给"+allotBillSaveVo.getReceiveUnit(), null, ".", billId, 22, userPublicService.findUnitIdByName(allotBillSaveVo.getReceiveUnit()), 1, null, userIds);
TaskBto taskBto = new TaskBto(StatusEnum.ALLOT_BACKING.id, allotBillSaveVo.getSendUnit()+"退回型号为："+StringSplitUtil.stringListToString(allotBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList()))+"的装备,共有"+allotBillSaveVo.getAllotCount()+"件至"+allotBillSaveVo.getReceiveUnit(), null, ".", billId, 22, userPublicService.findUnitIdByName(allotBillSaveVo.getReceiveUnit()), 1, null, userIds);
saveEntity = taskService.start(taskBto);
}
//从草稿发起
......@@ -155,7 +156,7 @@ public class BackController {
saveEntity = taskService.moveToSpecial(taskBto1,StatusEnum.ALLOT_BACKING,0);
}
//生成发件方上传退回单的子任务
TaskBto taskBto2 = new TaskBto(StatusEnum.WAIT_UPLOAD_BACK_FILE_2.id, "退回型号为："+allotBillSaveVo.getScriptSaveVos().get(0).getModel()+"的装备给"+allotBillSaveVo.getReceiveUnit(), saveEntity.getId(), saveEntity.getNodeIdDetail() + saveEntity.getId() + ".", saveEntity.getBillId(), 22, userPublicService.findUnitIdByName(allotBackBill1.getSendUnit()), 0, null, Collections.singletonList(0));
TaskBto taskBto2 = new TaskBto(StatusEnum.WAIT_UPLOAD_BACK_FILE_2.id, allotBillSaveVo.getSendUnit()+"退回型号为："+StringSplitUtil.stringListToString(allotBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList()))+"的装备,共有"+allotBillSaveVo.getAllotCount()+"件至"+allotBillSaveVo.getReceiveUnit(), saveEntity.getId(), saveEntity.getNodeIdDetail() + saveEntity.getId() + ".", saveEntity.getBillId(), 22, userPublicService.findUnitIdByName(allotBackBill1.getSendUnit()), 0, null, Collections.singletonList(0));
taskService.start(taskBto2);
List<FileVo> fileVoList = new ArrayList<>();
//存装备日志
......@@ -484,7 +485,7 @@ public class BackController {
allotBackBill.setSendUseraId(userId);
AllotBackBill allotBackBill1 = allotBackBillService.addEntity(allotBackBill);
//发起草稿任务
TaskBto taskBto = new TaskBto(StatusEnum.BACK_DRAFT.id, "退回型号为："+allotBillSaveVo.getScriptSaveVos().get(0).getModel()+"的装备给"+allotBillSaveVo.getReceiveUnit(), null, ".", allotBackBill1.getId(), 22, userUtils.getCurrentUnitId(), 0, null, userIds);
TaskBto taskBto = new TaskBto(StatusEnum.BACK_DRAFT.id, allotBillSaveVo.getSendUnit()+"退回型号为："+StringSplitUtil.stringListToString(allotBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList()))+"的装备,共有"+allotBillSaveVo.getAllotCount()+"件，至"+allotBillSaveVo.getReceiveUnit(), null, ".", allotBackBill1.getId(), 22, userUtils.getCurrentUnitId(), 0, null, userIds);
TaskBto taskBto1 = taskService.start(taskBto);
//返回保存成功的id
Integer id = taskBto1.getId();
......
dev-repair/src/main/java/com/tykj/dev/device/repair/controller/RepairController.java
浏览文件 @ ba162fff
......@@ -402,7 +402,8 @@ public class RepairController {
deviceRepairSendBillEntity.setRepairDeviceDetail(stringBuffer.toString());
deviceRepairSendBillEntity.setDeviceRepairBillId(repairBill1.getId());
deviceRepairSendBillEntity.setAgent(repairBillSaveVo.getAgent());
deviceRepairSendBillEntity.setTitle(repairBillSaveVo.getSendUnit()+"向"+repairBillSaveVo.getReceiveUnit()+"发起了送修,型号为："+repairBillSaveVo.getScriptSaveVos().get(0).getModel()+"共有多少"+repairBillSaveVo.getSendingCount()+"件");
deviceRepairSendBillEntity.setTitle(repairBillSaveVo.getSendUnit()+"送修,型号为："+StringSplitUtil.stringListToString(repairBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList()))+"共有"+repairBillSaveVo.getSendingCount()+"件至"+repairBillSaveVo.getReceiveUnit());
if (repairBillSaveVo.getSendFileList()!=null&&repairBillSaveVo.getSendFileList().size()>0) {
deviceRepairSendBillEntity.setSendFiles(FilesUtil.stringFileToList(repairBillSaveVo.getSendFileList()));
}
......@@ -418,7 +419,7 @@ public class RepairController {
ownUnit = userUtils.getCurrentUnitId();
//直接发起的
if (repairBillSaveVo.getTaskId()==null) {
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);
TaskBto taskBto = new TaskBto(StatusEnum.WAIT_UPLOAD_FILE.id, repairBillSaveVo.getSendUnit()+"送修,型号为："+StringSplitUtil.stringListToString(repairBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList()))+"共有"+repairBillSaveVo.getSendingCount()+"件至"+repairBillSaveVo.getReceiveUnit(), null, ".", repairBill1.getId(), 5, ownUnit, 1, "country", userIds);
saveEntity = taskService.start(taskBto);
}
//从草稿发起的
......@@ -431,7 +432,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()+"发起了送修,型号为："+repairBillSaveVo.getScriptSaveVos().get(0).getModel()+"共有多少"+repairBillSaveVo.getSendingCount()+"件", null, ".", repairBill1.getId(), 5, ownUnit, 1, null, userIds);
TaskBto taskBto = new TaskBto(StatusEnum.WAIT_RECEIVE.id, repairBillSaveVo.getSendUnit()+"送修,型号为："+StringSplitUtil.stringListToString(repairBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList()))+"共有"+repairBillSaveVo.getSendingCount()+"件至"+repairBillSaveVo.getReceiveUnit(), null, ".", repairBill1.getId(), 5, ownUnit, 1, null, userIds);
saveEntity = taskService.start(taskBto);
}
//从草稿发起的
......@@ -445,7 +446,7 @@ public class RepairController {
.map(User::getUserId)
.collect(Collectors.toList()));
//生成子任务（发件方上传回执单）
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));
TaskBto taskBto2 = new TaskBto(StatusEnum.WAIT_UPLOAD_SEND_FILE.id, repairBillSaveVo.getSendUnit()+"送修,型号为："+StringSplitUtil.stringListToString(repairBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList()))+"共有"+repairBillSaveVo.getSendingCount()+"件至"+repairBillSaveVo.getReceiveUnit(), saveEntity.getId(), saveEntity.getNodeIdDetail() + saveEntity.getId() + ".", saveEntity.getBillId(), 5, userPublicService.findUnitIdByName(repairSendBill.getSendUnit()), 0, null, Collections.singletonList(0));
taskService.start(taskBto2);
}
//获取装备id集合
......@@ -787,7 +788,7 @@ public class RepairController {
repairBackBill1.setDocNum(s1);
deviceRepairBackBillService.update(repairBackBill1);
//发起任务
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 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 +863,7 @@ public class RepairController {
TaskBto task;
//草稿发起
if (repairBackBillSaveVo.getTaskId()==null) {
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);
TaskBto taskBto1 = new TaskBto(StatusEnum.WAIT_BACK_RECEIVE.id, repairBackBillSaveVo.getSendUnit()+"维修退回,型号为："+StringSplitUtil.stringListToString(repairBackBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList()))+"共有"+repairBackBillSaveVo.getSendingCount()+"件，至"+repairBackBillSaveVo.getReceiveUnit(), null, ".", deviceRepairBackBillEntity1.getId(), BusinessEnum.REPAIR_BACK.id, userPublicService.findUnitIdByName(repairBackBill.getReceiveUnit()), 1, null, userIds);
task = taskService.start(taskBto1);
}
else {
......@@ -870,7 +871,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()+"发起了维修退回,型号为："+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));
TaskBto taskBto2 = new TaskBto(StatusEnum.WAIT_UPLOAD_BACK_SEND_FILE.id, repairBackBillSaveVo.getSendUnit()+"维修退回,型号为："+StringSplitUtil.stringListToString(repairBackBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList()))+"共有"+repairBackBillSaveVo.getSendingCount()+"件，至"+repairBackBillSaveVo.getReceiveUnit(), 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 +987,12 @@ public class RepairController {
//不缺少单据直接办结
if (repairReceiveVo.getStatus()==0) {
userIds.add(userId);
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);
TaskBto taskBto1 = new TaskBto(StatusEnum.END.id, repairBackBill.getSendUnit()+"维修退回,型号为："+StringSplitUtil.stringListToString(repairReceiveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList()))+"共有"+repairBackBill.getSendingCount()+"件，至"+repairBackBill.getReceiveUnit(), 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, repairBackBill.getSendUnit()+"向"+repairBackBill.getReceiveUnit()+"发起了维修退回,型号为："+repairReceiveVo.getScriptSaveVos().get(0).getModel()+"共有多少"+repairBackBill.getSendingCount()+"件", null, ".", repairBackBill1.getId(), BusinessEnum.REPAIR_BACK.id, userUtils.getCurrentUnitId(), 0, "country", userIds);
TaskBto taskBto1 = new TaskBto(StatusEnum.WAIT_UPLOAD_BACK_FILE.id, repairBackBill.getSendUnit()+"维修退回,型号为："+StringSplitUtil.stringListToString(repairReceiveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList()))+"共有"+repairBackBill.getSendingCount()+"件，至"+repairBackBill.getReceiveUnit(), null, ".", repairBackBill1.getId(), BusinessEnum.REPAIR_BACK.id, userUtils.getCurrentUnitId(), 0, "country", userIds);
taskBto2 = taskService.start(taskBto1);
}
//遍历改变维修详情
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论