Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
device-back
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
1
议题
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
Matrix
device-back
Commits
6630ca99
提交
6630ca99
authored
6月 10, 2021
作者:
邓砥奕
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
update
上级
089fd3fd
隐藏空白字符变更
内嵌
并排
正在显示
1 个修改的文件
包含
4 行增加
和
4 行删除
+4
-4
RepairController.java
...m/tykj/dev/device/repair/controller/RepairController.java
+4
-4
没有找到文件。
dev-repair/src/main/java/com/tykj/dev/device/repair/controller/RepairController.java
浏览文件 @
6630ca99
...
...
@@ -788,7 +788,7 @@ public class RepairController {
repairBackBill1
.
setDocNum
(
s1
);
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
.
getReceiveUnit
()+
"维修退回型号"
+
repairBackBillSaveVo
.
getScriptSaveVos
().
get
(
0
).
getModel
()+
"共有"
+
repairBackBillSaveVo
.
getSendingCount
()+
"件"
,
null
,
"."
,
repairBackBill1
.
getId
(),
BusinessEnum
.
REPAIR_BACK
.
id
,
userUtils
.
getCurrentUnitId
(),
0
,
null
,
userIds
);
TaskBto
taskBto1
=
taskService
.
start
(
taskBto
);
Integer
id
=
taskBto1
.
getId
();
myWebSocket
.
sendMessage1
();
...
...
@@ -840,7 +840,7 @@ public class RepairController {
}
repairBackBill
.
setBackStatus
(
2
);
repairBackBill
.
setSendTime
(
new
Date
());
repairBackBill
.
setTitle
(
repairBackBillSaveVo
.
getSendUnit
()+
"维修退回型号
:
"
+
StringSplitUtil
.
stringListToString
(
repairBackBillSaveVo
.
getScriptSaveVos
().
stream
().
map
(
ScriptSaveVo:
:
getModel
).
distinct
().
collect
(
Collectors
.
toList
()))+
"共有"
+
repairBackBillSaveVo
.
getSendingCount
()+
"件至"
+
repairBackBillSaveVo
.
getReceiveUnit
());
repairBackBill
.
setTitle
(
repairBackBillSaveVo
.
getSendUnit
()+
"维修退回型号"
+
StringSplitUtil
.
stringListToString
(
repairBackBillSaveVo
.
getScriptSaveVos
().
stream
().
map
(
ScriptSaveVo:
:
getModel
).
distinct
().
collect
(
Collectors
.
toList
()))+
"共有"
+
repairBackBillSaveVo
.
getSendingCount
()+
"件至"
+
repairBackBillSaveVo
.
getReceiveUnit
());
repairBackBill
.
setAgent
(
repairBackBillSaveVo
.
getAgent
());
//生成单位签章id
Long
signId2
=
snowflake
.
creatNextId
();
...
...
@@ -987,12 +987,12 @@ public class RepairController {
//不缺少单据直接办结
if
(
repairReceiveVo
.
getStatus
()==
0
)
{
userIds
.
add
(
userId
);
TaskBto
taskBto1
=
new
TaskBto
(
StatusEnum
.
END
.
id
,
repairBackBill
.
getSendUnit
()+
"维修退回型号
为
"
+
StringSplitUtil
.
stringListToString
(
repairReceiveVo
.
getScriptSaveVos
().
stream
().
map
(
ScriptSaveVo:
:
getModel
).
distinct
().
collect
(
Collectors
.
toList
()))+
"共有"
+
repairBackBill
.
getSendingCount
()+
"件至"
+
repairBackBill
.
getReceiveUnit
(),
null
,
"."
,
repairBackBill1
.
getId
(),
BusinessEnum
.
REPAIR_BACK
.
id
,
userUtils
.
getCurrentUnitId
(),
0
,
"country"
,
userIds
);
TaskBto
taskBto1
=
new
TaskBto
(
StatusEnum
.
END
.
id
,
repairBackBill
.
getSendUnit
()+
"维修退回型号"
+
StringSplitUtil
.
stringListToString
(
repairReceiveVo
.
getScriptSaveVos
().
stream
().
map
(
ScriptSaveVo:
:
getModel
).
distinct
().
collect
(
Collectors
.
toList
()))+
"共有"
+
repairBackBill
.
getSendingCount
()+
"件至"
+
repairBackBill
.
getReceiveUnit
(),
null
,
"."
,
repairBackBill1
.
getId
(),
BusinessEnum
.
REPAIR_BACK
.
id
,
userUtils
.
getCurrentUnitId
(),
0
,
"country"
,
userIds
);
taskBto2
=
taskService
.
start
(
taskBto1
);
}
else
{
userIds
.
add
(
0
);
TaskBto
taskBto1
=
new
TaskBto
(
StatusEnum
.
WAIT_UPLOAD_BACK_FILE
.
id
,
repairBackBill
.
getSendUnit
()+
"维修退回型号
为
:"
+
StringSplitUtil
.
stringListToString
(
repairReceiveVo
.
getScriptSaveVos
().
stream
().
map
(
ScriptSaveVo:
:
getModel
).
distinct
().
collect
(
Collectors
.
toList
()))+
"共有"
+
repairBackBill
.
getSendingCount
()+
"件至"
+
repairBackBill
.
getReceiveUnit
(),
null
,
"."
,
repairBackBill1
.
getId
(),
BusinessEnum
.
REPAIR_BACK
.
id
,
userUtils
.
getCurrentUnitId
(),
0
,
"country"
,
userIds
);
TaskBto
taskBto1
=
new
TaskBto
(
StatusEnum
.
WAIT_UPLOAD_BACK_FILE
.
id
,
repairBackBill
.
getSendUnit
()+
"维修退回型号:"
+
StringSplitUtil
.
stringListToString
(
repairReceiveVo
.
getScriptSaveVos
().
stream
().
map
(
ScriptSaveVo:
:
getModel
).
distinct
().
collect
(
Collectors
.
toList
()))+
"共有"
+
repairBackBill
.
getSendingCount
()+
"件至"
+
repairBackBill
.
getReceiveUnit
(),
null
,
"."
,
repairBackBill1
.
getId
(),
BusinessEnum
.
REPAIR_BACK
.
id
,
userUtils
.
getCurrentUnitId
(),
0
,
"country"
,
userIds
);
taskBto2
=
taskService
.
start
(
taskBto1
);
}
//遍历改变维修详情
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论