Skip to content

D
device-back
提交 6d75360b authored 作者: zhoushaopan's avatar zhoushaopan
浏览文件
操作

feat(维修模块,配发模块,退回模块): 判断离线代办省内还是省外代办

判断离线代办省内还是省外代办
上级 7d98d301
隐藏空白字符变更
内嵌 并排
正在显示 包含 26 行增加 和 10 行删除
dev-allot/src/main/java/com/tykj/dev/device/allot/controller/AllotBillController.java
浏览文件 @ 6d75360b
......@@ -264,7 +264,7 @@ public class AllotBillController {
StringSplitUtil.stringListToString(allotBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel)
.distinct().collect(Collectors.toList())) + "的装备共" + allotBillSaveVo.getAllotCount() + "件",
null, ".", billId, 3,
allotBillSaveVo.getSendUnitId(), 1, "country", userIds);
allotBillSaveVo.getSendUnitId(), 1, "country1", userIds);
saveEntity = taskService.start(taskBto2);
}
//从草稿发起
......@@ -272,7 +272,7 @@ public class AllotBillController {
TaskBto taskBto = taskService.get(allotBillSaveVo.getTaskId());
// taskBto.setTitle("["+allotBillSaveVo.getReceiveUnit().substring(0,3) + "]型号" + StringSplitUtil.stringListToString(allotBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList())) + "的装备共" + allotBillSaveVo.getAllotCount() + "件");
taskBto.setTitle("["+DeviceModelSort.unitNameToDisName(allotBillSaveVo.getReceiveUnit()) + "]型号" + StringSplitUtil.stringListToString(allotBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList())) + "的装备共" + allotBillSaveVo.getAllotCount() + "件");
taskBto.setCustomInfo("country");
taskBto.setCustomInfo("country1");
//添加当前操作人为涉及人员
TaskBto taskBto1 = taskService.addInvolveUser(taskBto, userId);
//推动任务到配发中状态
......
dev-allot/src/main/java/com/tykj/dev/device/allot/controller/BackController.java
浏览文件 @ 6d75360b
......@@ -807,7 +807,7 @@ public class BackController {
+StringSplitUtil.stringListToString(allotBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel)
.distinct().collect(Collectors.toList()))+"的装备共有"+allotBillSaveVo.getAllotCount()+"件",
null, ".", billId, 22,
allotBillSaveVo.getReceiveUnitId(), 1, "country", userIds);
allotBillSaveVo.getReceiveUnitId(), 1, "country1", userIds);
taskService.moveToEnd(taskBto);
}
//从草稿发起
......@@ -815,7 +815,7 @@ public class BackController {
TaskBto taskBto = taskService.get(allotBillSaveVo.getTaskId());
//添加当前操作人为涉及人员
TaskBto taskBto1 = taskService.addInvolveUser(taskBto,userId);
taskBto1.setCustomInfo("country");
taskBto1.setCustomInfo("country1");
//任务所属单位改为收件单位
// taskBto1.setOwnUnit(userPublicService.findUnitIdByName(allotBillSaveVo.getReceiveUnit()));
taskBto1.setOwnUnit(allotBillSaveVo.getReceiveUnitId());
......@@ -907,7 +907,13 @@ public class BackController {
AllotBackBill allotBackBill1 = allotBackBillService.addEntity(allotBackBill);
//发起草稿任务
// TaskBto taskBto = new TaskBto(StatusEnum.BACK_UNDER_DRAFT.id, "["+allotBillSaveVo.getReceiveUnit().substring(0,3)+"]型号"+StringSplitUtil.stringListToString(allotBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList()))+"的装备共有"+allotBillSaveVo.getAllotCount()+"件", null, ".", allotBackBill1.getId(), 22, userUtils.getCurrentUnitId(), 0, "country", userIds);
TaskBto taskBto = new TaskBto(StatusEnum.BACK_UNDER_DRAFT.id, "["+DeviceModelSort.unitNameToDisName(allotBillSaveVo.getReceiveUnit())+"]型号"+StringSplitUtil.stringListToString(allotBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList()))+"的装备共有"+allotBillSaveVo.getAllotCount()+"件", null, ".", allotBackBill1.getId(), 22, userUtils.getCurrentUnitId(), 0, "country", userIds);
TaskBto taskBto = new TaskBto(StatusEnum.BACK_UNDER_DRAFT.id,
"["+DeviceModelSort.unitNameToDisName(allotBillSaveVo.getReceiveUnit())+"]型号"+
StringSplitUtil.stringListToString(allotBillSaveVo.getScriptSaveVos().stream()
.map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList()))+
"的装备共有"+allotBillSaveVo.getAllotCount()+"件", null, ".",
allotBackBill1.getId(), 22, userUtils.getCurrentUnitId(), 0,
"country1", userIds);
TaskBto taskBto1 = taskService.start(taskBto);
//返回保存成功的id
Integer id = taskBto1.getId();
......
dev-repair/src/main/java/com/tykj/dev/device/repair/controller/RepairController.java
浏览文件 @ 6d75360b
......@@ -2888,7 +2888,11 @@ public class RepairController {
//直接发起的
if (repairBillSaveVo.getTaskId() == null) {
// TaskBto taskBto = new TaskBto(StatusEnum.WAIT_UPLOAD_FILE.id, "["+repairBillSaveVo.getReceiveUnit() + "]型号" + StringSplitUtil.stringListToString(repairBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList())) + "共有" + repairBillSaveVo.getSendingCount() + "件", null, ".", repairBill1.getId(), 5, ownUnit, 1, "country", userIds);
TaskBto taskBto = new TaskBto(StatusEnum.WAIT_UPLOAD_FILE.id, "["+DeviceModelSort.unitNameToDisName(repairBillSaveVo.getReceiveUnit()) + "]型号" + StringSplitUtil.stringListToString(repairBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList())) + "共有" + repairBillSaveVo.getSendingCount() + "件", null, ".", repairBill1.getId(), 5, ownUnit, 1, "country", userIds);
TaskBto taskBto = new TaskBto(StatusEnum.WAIT_UPLOAD_FILE.id, "["+DeviceModelSort.unitNameToDisName(repairBillSaveVo.getReceiveUnit()) + "]型号"
+ StringSplitUtil.stringListToString(repairBillSaveVo.getScriptSaveVos().stream()
.map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList())) +
"共有" + repairBillSaveVo.getSendingCount() + "件", null, ".",
repairBill1.getId(), 5, ownUnit, 1, "country1", userIds);
taskService.moveToEnd(taskBto);
}
//从草稿发起的
......@@ -2896,7 +2900,7 @@ public class RepairController {
TaskBto taskBto1 = taskService.get(repairBillSaveVo.getTaskId());
// taskBto1.setTitle("["+repairBillSaveVo.getReceiveUnit() + "]型号" + StringSplitUtil.stringListToString(repairBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList())) + "共有" + repairBillSaveVo.getSendingCount() + "件");
taskBto1.setTitle("["+DeviceModelSort.unitNameToDisName(repairBillSaveVo.getReceiveUnit()) + "]型号" + StringSplitUtil.stringListToString(repairBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList())) + "共有" + repairBillSaveVo.getSendingCount() + "件");
taskBto1.setCustomInfo("country");
taskBto1.setCustomInfo("country1");
taskService.moveToEnd(taskBto1);
}
}
......@@ -3059,12 +3063,13 @@ public class RepairController {
.map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList())) + "共有" +
repairBackBillSaveVo.getSendingCount() + "件", null, ".",
deviceRepairBackBillEntity1.getId(), BusinessEnum.REPAIR_BACK.id,
repairBackBill.getReceiveUnitId(), 1, "country", userIds);
repairBackBill.getReceiveUnitId(), 1, "country1", userIds);
} else {
task = taskService.get(repairBackBillSaveVo.getTaskId());
// task.setOwnUnit(userPublicService.findUnitIdByName(repairBackBill.getReceiveUnit()));
task.setOwnUnit(repairBackBill.getReceiveUnitId());
task.setCustomInfo("country1");
}
taskService.moveToEnd(task);
//添加业务日志
......@@ -3165,10 +3170,15 @@ public class RepairController {
deviceRepairSendBillService.addEntity(deviceRepairSendBillEntity);
//发起任务
// TaskBto taskBto = new TaskBto(StatusEnum.REPAIR_SEND_UNDER_DRAFT.id, "["+repairBillSaveVo.getReceiveUnit().substring(0,3) + "]型号" + StringSplitUtil.stringListToString(repairBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList())) + "共有" + repairBillSaveVo.getSendingCount() + "件",null, ".", repairBill1.getId(), 5, userUtils.getCurrentUnitId(), 0, null, userIds);
TaskBto taskBto = new TaskBto(StatusEnum.REPAIR_SEND_UNDER_DRAFT.id, "["+DeviceModelSort.unitNameToDisName(repairBillSaveVo.getReceiveUnit())+ "]型号" + StringSplitUtil.stringListToString(repairBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList())) + "共有" + repairBillSaveVo.getSendingCount() + "件",null, ".", repairBill1.getId(), 5, userUtils.getCurrentUnitId(), 0, null, userIds);
TaskBto taskBto = new TaskBto(StatusEnum.REPAIR_SEND_UNDER_DRAFT.id,
"["+DeviceModelSort.unitNameToDisName(repairBillSaveVo.getReceiveUnit())+ "]型号" +
StringSplitUtil.stringListToString(repairBillSaveVo.getScriptSaveVos().stream()
.map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList()))
+ "共有" + repairBillSaveVo.getSendingCount() + "件",null, ".",
repairBill1.getId(), 5, userUtils.getCurrentUnitId(), 0, null, userIds);
//如果是省发起的维修
if (currentUnitLevel == 1){
taskBto.setCustomInfo("country");
taskBto.setCustomInfo("country1");
}
TaskBto taskBto1 = taskService.start(taskBto);
Integer id = taskBto1.getId();
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论