提交 09a8e92d authored 作者: 邓砥奕's avatar 邓砥奕

update

上级 3270c82b
...@@ -403,7 +403,7 @@ public class RepairController { ...@@ -403,7 +403,7 @@ public class RepairController {
deviceRepairSendBillEntity.setDeviceRepairBillId(repairBill1.getId()); deviceRepairSendBillEntity.setDeviceRepairBillId(repairBill1.getId());
deviceRepairSendBillEntity.setAgent(repairBillSaveVo.getAgent()); deviceRepairSendBillEntity.setAgent(repairBillSaveVo.getAgent());
deviceRepairSendBillEntity.setTitle(repairBillSaveVo.getSendUnit()+"送修,型号为:"+StringSplitUtil.stringListToString(repairBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList()))+"共有"+repairBillSaveVo.getSendingCount()+"件至"+repairBillSaveVo.getReceiveUnit()); 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) { if (repairBillSaveVo.getSendFileList()!=null&&repairBillSaveVo.getSendFileList().size()>0) {
deviceRepairSendBillEntity.setSendFiles(FilesUtil.stringFileToList(repairBillSaveVo.getSendFileList())); deviceRepairSendBillEntity.setSendFiles(FilesUtil.stringFileToList(repairBillSaveVo.getSendFileList()));
} }
...@@ -419,7 +419,7 @@ public class RepairController { ...@@ -419,7 +419,7 @@ public class RepairController {
ownUnit = userUtils.getCurrentUnitId(); ownUnit = userUtils.getCurrentUnitId();
//直接发起的 //直接发起的
if (repairBillSaveVo.getTaskId()==null) { if (repairBillSaveVo.getTaskId()==null) {
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); 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); saveEntity = taskService.start(taskBto);
} }
//从草稿发起的 //从草稿发起的
...@@ -432,7 +432,7 @@ public class RepairController { ...@@ -432,7 +432,7 @@ public class RepairController {
ownUnit = userPublicService.findUnitIdByName(repairBill.getReceiveUnit()); ownUnit = userPublicService.findUnitIdByName(repairBill.getReceiveUnit());
//直接发起的 //直接发起的
if (repairBillSaveVo.getTaskId()==null) { if (repairBillSaveVo.getTaskId()==null) {
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); 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); saveEntity = taskService.start(taskBto);
} }
//从草稿发起的 //从草稿发起的
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论