Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
device-back
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
1
议题
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
Matrix
device-back
Commits
9354a744
提交
9354a744
authored
6月 10, 2021
作者:
zhoushaopan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[维修]修改了title
上级
09a8e92d
隐藏空白字符变更
内嵌
并排
正在显示
1 个修改的文件
包含
5 行增加
和
4 行删除
+5
-4
RepairController.java
...m/tykj/dev/device/repair/controller/RepairController.java
+5
-4
没有找到文件。
dev-repair/src/main/java/com/tykj/dev/device/repair/controller/RepairController.java
浏览文件 @
9354a744
...
@@ -419,12 +419,13 @@ public class RepairController {
...
@@ -419,12 +419,13 @@ 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
);
}
}
//从草稿发起的
//从草稿发起的
else
{
else
{
TaskBto
taskBto1
=
taskService
.
get
(
repairBillSaveVo
.
getTaskId
());
TaskBto
taskBto1
=
taskService
.
get
(
repairBillSaveVo
.
getTaskId
());
taskBto1
.
setTitle
(
repairBillSaveVo
.
getSendUnit
()+
"送修型号"
+
StringSplitUtil
.
stringListToString
(
repairBillSaveVo
.
getScriptSaveVos
().
stream
().
map
(
ScriptSaveVo:
:
getModel
).
distinct
().
collect
(
Collectors
.
toList
()))+
"共有"
+
repairBillSaveVo
.
getSendingCount
()+
"件至"
+
repairBillSaveVo
.
getReceiveUnit
());
taskBto1
.
setCustomInfo
(
"country"
);
taskBto1
.
setCustomInfo
(
"country"
);
saveEntity
=
taskService
.
moveToSpecial
(
taskBto1
,
StatusEnum
.
WAIT_UPLOAD_FILE
);
saveEntity
=
taskService
.
moveToSpecial
(
taskBto1
,
StatusEnum
.
WAIT_UPLOAD_FILE
);
}
}
...
@@ -432,7 +433,7 @@ public class RepairController {
...
@@ -432,7 +433,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
);
}
}
//从草稿发起的
//从草稿发起的
...
@@ -446,7 +447,7 @@ public class RepairController {
...
@@ -446,7 +447,7 @@ public class RepairController {
.
map
(
User:
:
getUserId
)
.
map
(
User:
:
getUserId
)
.
collect
(
Collectors
.
toList
()));
.
collect
(
Collectors
.
toList
()));
//生成子任务(发件方上传回执单)
//生成子任务(发件方上传回执单)
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
));
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
);
taskService
.
start
(
taskBto2
);
}
}
//获取装备id集合
//获取装备id集合
...
@@ -789,7 +790,7 @@ public class RepairController {
...
@@ -789,7 +790,7 @@ public class RepairController {
repairBackBill1
.
setDocNum
(
s1
);
repairBackBill1
.
setDocNum
(
s1
);
deviceRepairBackBillService
.
update
(
repairBackBill1
);
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
.
getScriptSaveVos
().
get
(
0
).
getModel
()+
"共有"
+
repairBackBillSaveVo
.
getSendingCount
()+
"件至"
+
repairBackBillSaveVo
.
getReceiveUnit
()
,
null
,
"."
,
repairBackBill1
.
getId
(),
BusinessEnum
.
REPAIR_BACK
.
id
,
userUtils
.
getCurrentUnitId
(),
0
,
null
,
userIds
);
TaskBto
taskBto1
=
taskService
.
start
(
taskBto
);
TaskBto
taskBto1
=
taskService
.
start
(
taskBto
);
Integer
id
=
taskBto1
.
getId
();
Integer
id
=
taskBto1
.
getId
();
myWebSocket
.
sendMessage1
();
myWebSocket
.
sendMessage1
();
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论