Skip to content

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

[配发，退回] 修改了名称

上级 6647bff5
隐藏空白字符变更
内嵌 并排
正在显示 包含 8 行增加 和 9 行删除
dev-allot/src/main/java/com/tykj/dev/device/allot/controller/AllotBillController.java
浏览文件 @ 7e34d428
......@@ -207,13 +207,12 @@ public class AllotBillController {
if (allotBillSaveVo.getAllotType()==1) {
//直接发起
if (allotBillSaveVo.getTaskId() == null) {
TaskBto taskBto = new TaskBto(StatusEnum.ALLOTING.id, "发起了配发:对方单位：（"+allotBillSaveVo.getReceiveUnit()+"）", null, ".", billId, 3, userPublicService.findUnitIdByName(allotBillSaveVo.getReceiveUnit()), 1, null, userIds);
TaskBto taskBto = new TaskBto(StatusEnum.ALLOTING.id, "配发型号为："+allotBillSaveVo.getScriptSaveVos().get(0).getModel()+"的装备给"+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.getReceiveUnit()+"）");
TaskBto taskBto = taskService.get(allotBillSaveVo.getTaskId());"配发型号为："+allotBillSaveVo.getScriptSaveVos().get(0).getModel()+"的装备给"+allotBillSaveVo.getReceiveUnit()"发起了配发:对方单位：（"+allotBillSaveVo.getReceiveUnit()+"）");
//添加当前操作人为涉及人员
TaskBto taskBto1 = taskService.addInvolveUser(taskBto,userId);
//任务所属单位改为收件单位
......@@ -222,12 +221,12 @@ public class AllotBillController {
saveEntity = taskService.moveToSpecial(taskBto1, StatusEnum.ALLOTING, 0);
}
//生成发件方上传配发单的子任务
TaskBto taskBto2 = new TaskBto(StatusEnum.WAIT_UPLOAD_ALLOT_FILE.id, "发起了配发:对方单位：（"+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.getScriptSaveVos().get(0).getModel()+"的装备给"+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.getReceiveUnit()+"）", null, ".", billId, 3, userPublicService.findUnitIdByName(allotBillEntity.getSendUnit()), 1, "country", userIds);
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);
saveEntity = taskService.start(taskBto2);
}
List<FileVo> fileVoList = new ArrayList<>();
......@@ -498,7 +497,7 @@ public class AllotBillController {
allotBill1.setSendUseraId(userId);
AllotBill allotBill = allotBillService.addEntity(allotBill1);
//发起草稿任务
TaskBto taskBto = new TaskBto(StatusEnum.ALLOT_DRAFT.id, "发起了配发:对方单位：（"+allotBillSaveVo.getReceiveUnit()+"）", null, ".", allotBill.getId(), 3, userUtils.getCurrentUnitId(), 0, null, userIds);
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 taskBto1 = taskService.start(taskBto);
//返回保存成功的id
Integer id = taskBto1.getId();
......
dev-allot/src/main/java/com/tykj/dev/device/allot/controller/BackController.java
浏览文件 @ 7e34d428
......@@ -141,7 +141,7 @@ public class BackController {
TaskBto saveEntity;
//直接发起
if (allotBillSaveVo.getTaskId()==null) {
TaskBto taskBto = new TaskBto(StatusEnum.ALLOT_BACKING.id, "退回业务(对方单位)："+allotBillSaveVo.getReceiveUnit(), null, ".", billId, 22, userPublicService.findUnitIdByName(allotBillSaveVo.getReceiveUnit()), 1, null, userIds);
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);
saveEntity = taskService.start(taskBto);
}
//从草稿发起
......@@ -155,7 +155,7 @@ public class BackController {
saveEntity = taskService.moveToSpecial(taskBto1,StatusEnum.ALLOT_BACKING,0);
}
//生成发件方上传退回单的子任务
TaskBto taskBto2 = new TaskBto(StatusEnum.WAIT_UPLOAD_BACK_FILE_2.id, "退回业务(对方单位)："+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.getScriptSaveVos().get(0).getModel()+"的装备给"+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 +484,7 @@ public class BackController {
allotBackBill.setSendUseraId(userId);
AllotBackBill allotBackBill1 = allotBackBillService.addEntity(allotBackBill);
//发起草稿任务
TaskBto taskBto = new TaskBto(StatusEnum.BACK_DRAFT.id, "退回业务(草稿)", null, ".", allotBackBill1.getId(), 22, userUtils.getCurrentUnitId(), 0, null, userIds);
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 taskBto1 = taskService.start(taskBto);
//返回保存成功的id
Integer id = taskBto1.getId();
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论