提交 6647bff5 authored 作者: 邓砥奕's avatar 邓砥奕

[配发] 修改了名称

上级 5779b1c4
...@@ -207,13 +207,13 @@ public class AllotBillController { ...@@ -207,13 +207,13 @@ public class AllotBillController {
if (allotBillSaveVo.getAllotType()==1) { if (allotBillSaveVo.getAllotType()==1) {
//直接发起 //直接发起
if (allotBillSaveVo.getTaskId() == null) { if (allotBillSaveVo.getTaskId() == null) {
TaskBto taskBto = new TaskBto(StatusEnum.ALLOTING.id, allotBillSaveVo.getSendUnit()+"给"+allotBillSaveVo.getReceiveUnit()+"发起了配发", null, ".", billId, 3, userPublicService.findUnitIdByName(allotBillSaveVo.getReceiveUnit()), 1, null, userIds); TaskBto taskBto = new TaskBto(StatusEnum.ALLOTING.id, "发起了配发:对方单位:("+allotBillSaveVo.getReceiveUnit()+")", null, ".", billId, 3, userPublicService.findUnitIdByName(allotBillSaveVo.getReceiveUnit()), 1, null, userIds);
saveEntity = taskService.start(taskBto); saveEntity = taskService.start(taskBto);
} }
//从草稿发起 //从草稿发起
else { else {
TaskBto taskBto = taskService.get(allotBillSaveVo.getTaskId()); TaskBto taskBto = taskService.get(allotBillSaveVo.getTaskId());
taskBto.setTitle(allotBillSaveVo.getSendUnit()+"给"+allotBillSaveVo.getReceiveUnit()+"发起了配发"); taskBto.setTitle("发起了配发:对方单位:("+allotBillSaveVo.getReceiveUnit()+")");
//添加当前操作人为涉及人员 //添加当前操作人为涉及人员
TaskBto taskBto1 = taskService.addInvolveUser(taskBto,userId); TaskBto taskBto1 = taskService.addInvolveUser(taskBto,userId);
//任务所属单位改为收件单位 //任务所属单位改为收件单位
...@@ -222,12 +222,12 @@ public class AllotBillController { ...@@ -222,12 +222,12 @@ public class AllotBillController {
saveEntity = taskService.moveToSpecial(taskBto1, StatusEnum.ALLOTING, 0); saveEntity = taskService.moveToSpecial(taskBto1, StatusEnum.ALLOTING, 0);
} }
//生成发件方上传配发单的子任务 //生成发件方上传配发单的子任务
TaskBto taskBto2 = new TaskBto(StatusEnum.WAIT_UPLOAD_ALLOT_FILE.id, allotBillSaveVo.getSendUnit()+"给"+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.getReceiveUnit()+")", saveEntity.getId(), saveEntity.getNodeIdDetail() + saveEntity.getId() + ".", saveEntity.getBillId(), 3, userPublicService.findUnitIdByName(allotBillEntity.getSendUnit()), 0, null, Collections.singletonList(0));
taskService.start(taskBto2); taskService.start(taskBto2);
} }
//横向配发 //横向配发
else { else {
TaskBto taskBto2 = new TaskBto(StatusEnum.WAIT_UPLOAD_CROSS_FILE.id, allotBillSaveVo.getSendUnit()+"给"+allotBillSaveVo.getReceiveUnit()+"发起了配发", null, ".", billId, 3, userPublicService.findUnitIdByName(allotBillEntity.getSendUnit()), 1, "country", userIds); TaskBto taskBto2 = new TaskBto(StatusEnum.WAIT_UPLOAD_CROSS_FILE.id, "发起了配发:对方单位:("+allotBillSaveVo.getReceiveUnit()+")", null, ".", billId, 3, userPublicService.findUnitIdByName(allotBillEntity.getSendUnit()), 1, "country", userIds);
saveEntity = taskService.start(taskBto2); saveEntity = taskService.start(taskBto2);
} }
List<FileVo> fileVoList = new ArrayList<>(); List<FileVo> fileVoList = new ArrayList<>();
...@@ -498,7 +498,7 @@ public class AllotBillController { ...@@ -498,7 +498,7 @@ public class AllotBillController {
allotBill1.setSendUseraId(userId); allotBill1.setSendUseraId(userId);
AllotBill allotBill = allotBillService.addEntity(allotBill1); AllotBill allotBill = allotBillService.addEntity(allotBill1);
//发起草稿任务 //发起草稿任务
TaskBto taskBto = new TaskBto(StatusEnum.ALLOT_DRAFT.id, "配发业务", null, ".", allotBill.getId(), 3, userUtils.getCurrentUnitId(), 0, null, userIds); TaskBto taskBto = new TaskBto(StatusEnum.ALLOT_DRAFT.id, "发起了配发:对方单位:("+allotBillSaveVo.getReceiveUnit()+")", null, ".", allotBill.getId(), 3, userUtils.getCurrentUnitId(), 0, null, userIds);
TaskBto taskBto1 = taskService.start(taskBto); TaskBto taskBto1 = taskService.start(taskBto);
//返回保存成功的id //返回保存成功的id
Integer id = taskBto1.getId(); Integer id = taskBto1.getId();
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论